feat(ServerRendering) update readme, fix configs

Author: rmosolgo

README.md

@@ -154,18 +154,14 @@ You can configure your pool of JS virtual machines and specify where it should l
 # config/environments/application.rb
 # These are the defaults if you dont specify any yourself
 MyApp::Application.configure do
-  # renderer pool size:
-  config.react.max_renderers = 10
-  # prerender timeout, in seconds:
-  config.react.timeout = 20
-  # where to get React.js source:
-  config.react.react_js = lambda { File.read(::Rails.application.assets.resolve('react.js')) }
-  # array of filenames that will be requested from the asset pipeline
-  # and concatenated:
-  config.react.component_filenames = ['components.js']
-  # server-side console.log, console.warn, and console.error messages will be replayed on the client
-  # (you can set this to `true` in config/enviroments/development.rb to replay in development only)
-  config.react.replay_console = false
+  # Settings for the pool of renderers:
+  config.react.server_renderer_pool_size  ||= 10
+  config.react.server_renderer_timeout    ||= 20 # seconds
+  config.react.server_renderer = React::ServerRendering::SprocketsRenderer
+  config.react.server_renderer_options = {
+    files: ["react.js", "components.js"], # files to load for prerendering
+    replay_console: true,                 # if true, console.* will be replayed client-side
+  }
 end
 ```
 

lib/react/rails/railtie.rb

@@ -9,11 +9,11 @@ class Railtie < ::Rails::Railtie
       config.react.variant = (::Rails.env.production? ? :production : :development)
       config.react.addons = false
       config.react.jsx_transform_options = {}
-      # Server-side rendering
-      config.react.max_renderers = 10
-      config.react.timeout = 20 #seconds
-      config.react.react_js = lambda {File.read(::Rails.application.assets.resolve('react.js'))}
-      config.react.component_filenames = ['components.js']
+      # Server rendering:
+      config.react.server_renderer_pool_size  = 10
+      config.react.server_renderer_timeout    = 20 # seconds
+      config.react.server_renderer            = nil # defaults to SprocketsRenderer
+      config.react.server_renderer_options    = {}  # SprocketsRenderer provides defaults
 
       # Watch .jsx files for changes in dev, so we can reload the JS VMs with the new JS code.
       initializer "react_rails.add_watchable_files", group: :all do |app|
@@ -49,10 +49,14 @@ class Railtie < ::Rails::Railtie
           "react-#{variant}",
         ].compact.join('-')
 
-        app.config.react.server_renderer_options  ||= {}
-        app.config.react.server_renderer          ||= React::ServerRendering::SprocketsRenderer
-        React::ServerRendering.renderer_options   = app.config.react.server_renderer_options
-        React::ServerRendering.renderer           = app.config.react.server_renderer
+        # The class isn't accessible in the configure block, so assign it here if it wasn't overridden:
+        app.config.react.server_renderer ||= React::ServerRendering::SprocketsRenderer
+
+        React::ServerRendering.pool_size        = app.config.react.server_renderer_pool_size
+        React::ServerRendering.pool_timeout     = app.config.react.server_renderer_timeout
+        React::ServerRendering.renderer_options = app.config.react.server_renderer_options
+        React::ServerRendering.renderer         = app.config.react.server_renderer
+
         React::ServerRendering.reset_pool
         # Reload renderers in dev when files change
         ActionDispatch::Reloader.to_prepare { React::ServerRendering.reset_pool }

lib/react/server_rendering.rb

@@ -6,9 +6,6 @@ module ServerRendering
     mattr_accessor :renderer, :renderer_options,
       :pool_size, :pool_timeout
 
-    self.pool_size = 10
-    self.pool_timeout = 20
-
     def self.reset_pool
       options = {size: pool_size, timeout: pool_timeout}
       @@pool = ConnectionPool.new(options) { create_renderer }