react_on_rails 1.0.3 → 1.1.0

data/lib/generators/react_on_rails/templates/js_linters/client/.jscsrc

@@ -1,7 +1,18 @@
 {
   "preset": "airbnb",
-  "fileExtensions": [".js", ".jsx"],
-  "excludeFiles": ["build/**", "node_modules/**"],
-
-  "validateQuoteMarks": null                        // Issue with JSX quotemarks: https://github.com/jscs-dev/babel-jscs/issues/12
+  "fileExtensions": [
+    ".js",
+    ".jsx"
+  ],
+  "excludeFiles": [
+    "assets/**",
+    "build/**",
+    "node_modules/**"
+  ],
+  "esprima": "babel-jscs",
+  "validateQuoteMarks": {
+    "mark": "'",
+    "escape": true,
+    "ignoreJSX": true
+  }
 }

data/lib/generators/react_on_rails/templates/no_redux/base/client/app/bundles/HelloWorld/components/HelloWorldWidget.jsx

@@ -31,7 +31,7 @@ export default class HelloWorldWidget extends React.Component {
         </h3>
         <p>
           Say hello to:
-          <input type="text" ref="name" value={this.props.name} onChange={this._handleChange} />
+          <input type="text" value={this.props.name} onChange={this._handleChange} />
         </p>
       </div>
     );

data/lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/reducers/index.jsx

@@ -1,6 +1,6 @@
 // This file is our manifest of all reducers for the app.
 // See also /client/app/bundles/HelloWorld/store/helloWorldStore.jsx
-// A real world app will like have many reducers and it helps to organize them in one file.
+// A real world app will likely have many reducers and it helps to organize them in one file.
 // `https://github.com/shakacode/react_on_rails/tree/master/docs/additional_reading/generated_client_code.md`
 import helloWorldReducer from './helloWorldReducer';
 import { $$initialState as $$helloWorldState } from './helloWorldReducer';

data/lib/generators/react_on_rails/templates/redux/base/client/app/lib/middlewares/loggerMiddleware.js

@@ -1,5 +1,4 @@
 /* eslint no-console: 0 */
-import _ from 'lodash';
 
 // This logger should be configured not to run in a production environment.
 // See https://github.com/petehunt/webpack-howto#6-feature-flags for you might turn this off for production.

data/lib/react_on_rails/configuration.rb

@@ -10,6 +10,7 @@ module ReactOnRails
       replay_console: true,
       logging_on_server: true,
       generator_function: false,
+      raise_on_prerender_error: false,
       trace: Rails.env.development?,
       development_mode: Rails.env.development?,
       server_renderer_pool_size: 1,
@@ -20,12 +21,12 @@ module ReactOnRails
     attr_accessor :server_bundle_js_file, :prerender, :replay_console,
                   :generator_function, :trace, :development_mode,
                   :logging_on_server, :server_renderer_pool_size,
-                  :server_renderer_timeout
+                  :server_renderer_timeout, :raise_on_prerender_error
 
     def initialize(server_bundle_js_file: nil, prerender: nil, replay_console: nil,
                    generator_function: nil, trace: nil, development_mode: nil,
                    logging_on_server: nil, server_renderer_pool_size: nil,
-                   server_renderer_timeout: nil)
+                   server_renderer_timeout: nil, raise_on_prerender_error: nil)
       if File.exist?(server_bundle_js_file)
         self.server_bundle_js_file = server_bundle_js_file
       else
@@ -42,6 +43,7 @@ module ReactOnRails
         self.development_mode = development_mode
       end
       self.trace = trace.nil? ? Rails.env.development? : trace
+      self.raise_on_prerender_error = raise_on_prerender_error
 
       # Server rendering:
       self.server_renderer_pool_size = self.development_mode ? 1 : server_renderer_pool_size

data/lib/react_on_rails/prerender_error.rb

@@ -0,0 +1,31 @@
+module ReactOnRails
+  class PrerenderError < RuntimeError
+    # err might be nil if JS caught the error
+    def initialize(component_name: nil, err: nil, props: nil,
+                   js_code: nil, console_messages: nil)
+      message = "ERROR in SERVER PRERENDERING\n"
+      if err
+        message << <<-MSG
+Encountered error: \"#{err}\"
+        MSG
+        backtrace = err.backtrace.join("\n")
+      else
+        backtrace = nil
+      end
+      message << <<-MSG
+when prerendering #{component_name} with props: #{props}
+js_code was:
+#{js_code}
+      MSG
+
+      if console_messages
+        message << <<-MSG
+console messages:
+#{console_messages}
+        MSG
+      end
+
+      super([message, backtrace].compact.join("\n"))
+    end
+  end
+end

data/lib/react_on_rails/server_rendering_pool.rb

@@ -14,36 +14,27 @@ module ReactOnRails
     def self.reset_pool_if_server_bundle_was_modified
       return unless ReactOnRails.configuration.development_mode
       file_mtime = File.mtime(ReactOnRails.configuration.server_bundle_js_file)
-      first_time = @server_bundle_timestamp.nil?
-      return if first_time || @server_bundle_timestamp == file_mtime
+      @server_bundle_timestamp ||= file_mtime
+      return if @server_bundle_timestamp == file_mtime
       ReactOnRails::ServerRenderingPool.reset_pool
       @server_bundle_timestamp = file_mtime
     end
 
-    class PrerenderError < RuntimeError
-      def initialize(component_name, props, js_message)
-        message = ["Encountered error \"#{js_message}\" when prerendering #{component_name} with #{props}",
-                   js_message.backtrace.join("\n")].join("\n")
-        super(message)
-      end
-    end
-
     # js_code: JavaScript expression that returns a string.
-    # Returns an Array:
-    # [0]: string of HTML for direct insertion on the page by evaluating js_code
-    # [1]: console messages
-    #   Note, js_code does not have to be based on React.
-    # js_code MUST RETURN json stringify array of two elements
+    # Returns a Hash:
+    #   html: string of HTML for direct insertion on the page by evaluating js_code
+    #   consoleReplayScript: script for replaying console
+    #   hasErrors: true if server rendering errors
+    # Note, js_code does not have to be based on React.
+    # js_code MUST RETURN json stringify Object
     # Calling code will probably call 'html_safe' on return value before rendering to the view.
     def self.server_render_js_with_console_logging(js_code)
       trace_messsage(js_code)
-
       json_string = eval_js(js_code)
-      # element 0 is the html, element 1 is the script tag for the server console output
       result = JSON.parse(json_string)
 
       if ReactOnRails.configuration.logging_on_server
-        console_script = result[1]
+        console_script = result["consoleReplayScript"]
         console_script_lines = console_script.split("\n")
         console_script_lines = console_script_lines[2..-2]
         re = /console\.log\.apply\(console, \["\[SERVER\] (?<msg>.*)"\]\);/

data/lib/react_on_rails/version.rb

@@ -1,3 +1,3 @@
 module ReactOnRails
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,16 +149,21 @@ files:
 - app/helpers/react_on_rails_helper.rb
 - docker-compose.yml
 - docs/LICENSE
-- docs/additional_reading/generated_client_code.md
 - docs/additional_reading/heroku_deployment.md
 - docs/additional_reading/manual_installation.md
 - docs/additional_reading/node_dependencies_and_npm.md
 - docs/additional_reading/optional_configuration.md
+- docs/additional_reading/react-and-redux.md
+- docs/additional_reading/react_router.md
 - docs/additional_reading/server_rendering_tips.md
 - docs/additional_reading/tips.md
 - docs/code_of_conduct.md
+- docs/coding-style/linters.md
+- docs/coding-style/style.md
 - docs/contributing.md
 - docs/generator_testing_script.md
+- docs/install_and_releasing.md
+- docs/sample_generated_js/README.md
 - docs/sample_generated_js/client-generated.js
 - docs/sample_generated_js/server-generated.js
 - lib/generators/react_on_rails/base_generator.rb
@@ -224,6 +229,7 @@ files:
 - lib/react_on_rails.rb
 - lib/react_on_rails/configuration.rb
 - lib/react_on_rails/engine.rb
+- lib/react_on_rails/prerender_error.rb
 - lib/react_on_rails/server_rendering_pool.rb
 - lib/react_on_rails/version.rb
 - react_on_rails.gemspec