react_on_rails 6.3.1 → 6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4356fb000ccf27666962248d09af71aa01af2ab9
-  data.tar.gz: e4c02df069b3b05dc09550d9000c7c67a1e96d7f
+  metadata.gz: a33778e55ee63b84756b91066276ae483042df19
+  data.tar.gz: 44db20d267ab1bfd34a8e9bff56b171d89376b77
 SHA512:
-  metadata.gz: 9b8fca5929a9c4d5584fc908ca20bf2a87978f01a24ab00aaaf01f939d726887f0520356887738446fee0359ff0cd090c9ad28abadb62636e6d3866ae0378a7a
-  data.tar.gz: 0ff01843b772a5caff20fa915647be727f76c9f8f19e030b631a0385396b2e444839f757be0058d596d435021bc4653c8649aad93c9ebd178b795e9e3e6db44d
+  metadata.gz: 3e165be5f9e36001de70e93d594998c9b8107a75cb1b2bdd2b99adbac49682c74581788dd4bdcfe9648597076ca848b5707b4e5b9ad73599c453df6aaa46f9dc
+  data.tar.gz: 0b2efd49a3fafe8876d75c16905c5784e0e0521668caf5d63c07cf3623b0c66ebfc19633eda9d76222d19d00dc42e4901f861644c0d1caf0c4baa916690495d9

data/CHANGELOG.md

@@ -4,12 +4,19 @@ All notable changes to this project's source code will be documented in this fil
 Contributors: please follow the recommendations outlined at [keepachangelog.com](http://keepachangelog.com/). Please use the existing headings and styling as a guide, and add a link for the version diff at the bottom of the file. Also, please update the `Unreleased` link to compare to the latest release version.
 
 ## [Unreleased]
+*Please add entries here for your pull requests.*
 
-## [6.3.1]
+## [6.3.2] - 2016-12-5
+##### Fixed
+- The `react_component` method was raising a `NameError` when `ReactOnRailsHelper` was included in a plain object. [#636](https://github.com/shakacode/react_on_rails/pull/636) by [jtibbertsma](https://github.com/jtibbertsma).
+- "Node parse error" for node server rendering. [#641](https://github.com/shakacode/react_on_rails/pull/641) by [alleycat-at-git](https://github.com/alleycat-at-git) and [rocLv](https://github.com/rocLv)
+- Better error handling when the react-on-rails node package entry is missing.[#602](https://github.com/shakacode/react_on_rails/pull/602) by [benjiwheeler](https://github.com/benjiwheeler).
+
+## [6.3.1] - 2016-11-30
 ##### Changed
 - Improved generator post-install help messages. [#631](https://github.com/shakacode/react_on_rails/pull/631) by [justin808](https://github.com/justin808).
 
-## [6.3.0]
+## [6.3.0] - 2016-11-30
 ##### Changed
 - Modified register API to allow registration of renderers, allowing a user to manually render their app to the DOM. This allows for code splitting and deferred loading. [#581](https://github.com/shakacode/react_on_rails/pull/581) by [jtibbertsma](https://github.com/jtibbertsma).
 
@@ -397,7 +404,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.3.1...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.3.2...master
+[6.3.2]: https://github.com/shakacode/react_on_rails/compare/6.3.1...6.3.2
 [6.3.1]: https://github.com/shakacode/react_on_rails/compare/6.3.0...6.3.1
 [6.3.0]: https://github.com/shakacode/react_on_rails/compare/6.2.1...6.3.0
 [6.2.1]: https://github.com/shakacode/react_on_rails/compare/6.2.0...6.2.1

data/app/helpers/react_on_rails_helper.rb

@@ -350,7 +350,7 @@ ReactOnRails.setStore('#{store_name}', store);
         i18nLocale: I18n.locale,
         i18nDefaultLocale: I18n.default_locale
       }
-      if request.present?
+      if defined?(request) && request.present?
         # Check for encoding of the request's original_url and try to force-encoding the
         # URLs as UTF-8. This situation can occur in browsers that do not encode the
         # entire URL as UTF-8 already, mostly on the Windows platform (IE11 and lower).
@@ -402,7 +402,7 @@ ReactOnRails.setStore('#{store_name}', store);
   end
 
   def in_mailer?
-    return false unless controller.present?
+    return false unless defined?(controller)
     return false unless defined?(ActionMailer::Base)
 
     controller.is_a?(ActionMailer::Base)

data/docs/additional-reading/code-splitting.md

@@ -35,7 +35,7 @@ Here's an example of how you might use this in practice:
 import ReactOnRails from 'react-on-rails';
 import NavigationApp from './NavigationApp';
 
-// Note that we're importing a different RouterApp that in serverRegistration.js
+// Note that we're importing a different RouterApp than in serverRegistration.js
 // Renderer functions should not be used on the server, because there is no DOM.
 import RouterApp from './RouterAppRenderer';
 import applicationStore from '../store/applicationStore';
@@ -52,7 +52,7 @@ ReactOnRails.register({
 import ReactOnRails from 'react-on-rails';
 import NavigationApp from './NavigationApp';
 
-// Note that we're importing a different RouterApp that in clientRegistration.js
+// Note that we're importing a different RouterApp than in clientRegistration.js
 import RouterApp from './RouterAppServer';
 import applicationStore from '../store/applicationStore';
 

data/lib/generators/react_on_rails/templates/node/base/client/node/server.js

@@ -2,7 +2,7 @@ const net = require('net');
 const fs = require('fs');
 
 const bundlePath = '../../app/assets/webpack/';
-let bundleFileName = 'webpack-bundle.js';
+let bundleFileName = 'server-bundle.js';
 
 let currentArg;
 
@@ -13,13 +13,20 @@ function Handler() {
 
 Handler.prototype.handle = (connection) => {
   const callback = () => {
+    const terminator = '\r\n\0';
+    let request = '';
     connection.setEncoding('utf8');
     connection.on('data', (data) => {
-      console.log(`Processing request: ${data}`);
-
-      // eslint-disable-next-line no-eval
-      const result = eval(data);
-      connection.write(result);
+      console.log(`Processing chunk: ${data}`);
+      request += data;
+      if (data.slice(-terminator.length) === terminator) {
+        request = request.slice(0, -terminator.length);
+
+        // eslint-disable-next-line no-eval
+        const response = eval(request);
+        connection.write(`${response}${terminator}`);
+        request = '';
+      }
     });
   };
 
@@ -55,23 +62,32 @@ process.argv.forEach((val) => {
   }
 });
 
+function loadBundle() {
+  if (handler.initialized) {
+    console.log('Reloading server bundle must be implemented by restarting the node process!');
+    return;
+  }
+
+  /* eslint-disable */
+  require(bundlePath + bundleFileName);
+  /* eslint-enable */
+  console.log(`Loaded server bundle: ${bundlePath}${bundleFileName}`);
+  handler.initialize();
+}
+
 try {
   fs.mkdirSync(bundlePath);
 } catch (e) {
-  if (e.code !== 'EEXIST') throw e;
+  if (e.code !== 'EEXIST') {
+    throw e;
+  } else {
+    loadBundle();
+  }
 }
 
 fs.watchFile(bundlePath + bundleFileName, (curr) => {
   if (curr && curr.blocks && curr.blocks > 0) {
-    if (handler.initialized) {
-      console.log('Reloading server bundle must be implemented by restarting the node process!');
-      return;
-    }
-
-    // eslint-disable-next-line global-require, import/no-dynamic-require
-    require(bundlePath + bundleFileName);
-    console.log(`Loaded server bundle: ${bundlePath + bundleFileName}`);
-    handler.initialize();
+    loadBundle();
   }
 });
 

data/lib/react_on_rails/server_rendering_pool/node.rb

@@ -51,11 +51,15 @@ module ReactOnRails
         end
 
         def eval_js(js_code)
-          max_int = (2**(32 - 2) - 1)
+          eof_symbol = "\r\n\0".freeze
+          max_int = (2**30 - 1)
           @js_context_pool.with do |js_context|
-            js_context.send(js_code, 0)
-            result = js_context.recv(max_int)
-            result
+            js_context.send(js_code + eof_symbol, 0)
+            result = ""
+            while result[-eof_symbol.length..-1] != eof_symbol
+              result += js_context.recv(max_int)
+            end
+            result[0..-eof_symbol.length]
           end
         end
 
@@ -64,8 +68,8 @@ module ReactOnRails
             client = UNIXSocket.new("client/node/node.sock")
             client.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
           rescue StandardError => e
-            Rails.logger.error("Unable to connect to socket: client/node/node.sock.
-Make sure node server is up and running.")
+            Rails.logger.error("Unable to connect to socket: client/node/node.sock. \
+              Make sure node server is up and running.")
             Rails.logger.error(e)
             raise e
           end

data/lib/react_on_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ReactOnRails
-  VERSION = "6.3.1".freeze
+  VERSION = "6.3.2".freeze
 end

data/lib/react_on_rails/version_checker.rb

@@ -58,7 +58,13 @@ module ReactOnRails
       end
 
       def raw
-        JSON.parse(package_json_contents)["dependencies"]["react-on-rails"]
+        parsed_package_contents = JSON.parse(package_json_contents)
+        if parsed_package_contents.key?("dependencies") &&
+           parsed_package_contents["dependencies"].key?("react-on-rails")
+          parsed_package_contents["dependencies"]["react-on-rails"]
+        else
+          raise "no 'react-on-rails' entry in package.json dependencies"
+        end
       end
 
       def relative_path?

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "6.3.1",
+  "version": "6.3.2",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.3.2
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool