react_on_rails 6.9.1 → 6.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 343caca62c9b39ccb1f88d31b397f323d929f364
-  data.tar.gz: b650de1d04ac484dd7e2aca93afdfb9db7fc3f5b
+  metadata.gz: 1feb7e92a122d45ea39663ad12ce271559f06d3f
+  data.tar.gz: 5b2beacba9cbce3fb9aeb01cc98e2797c1b35fa6
 SHA512:
-  metadata.gz: bf91a8f1ecf4cc57d83ba24f5bbf3e4a16d09821822e2cc13da7fe1b405f32a153a198d156580440246a3dfbeac1624e434a6bf603bf0b4543b86c4ae9c45a31
-  data.tar.gz: 25a8fb2a01168686e0ced63770052a589915a0f42838d54052ba53ca7ac1756bcad4d84f19047b26c05cd2b6310ba9475fcfd0a55f225ee1bc0abe58272e6350
+  metadata.gz: c64f6d6237d5480f684d92031b9deb3ec66fdb053801b999cae543155b13f867d72d4bd186382933295cc6f0b1f4d331287ef359cd58c7b040b46c8cef5e8368
+  data.tar.gz: b24a8ebdadc44cc8859fa9e9d30496e39544bdda792e33c806f00a85ed112ca91732e9c21caab518c5906c4cf2b6110f99a96afa5a4cfe89a2fa4f4cf423a34a

data/CHANGELOG.md

@@ -5,6 +5,15 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 
 ## [Unreleased]
 
+## [6.9.2] - 2017-04-02
+
+### Changed
+- Update version_checker.rb to `logger.error` rather than `logger.warn` for gem/npm version mismatch. [#788](https://github.com/shakacode/react_on_rails/issues/788) by [justin808](https://github.com/justin808).
+
+### Fixed
+- Remove pretty formatting of JSON in development. [#789](https://github.com/shakacode/react_on_rails/pull/789) by [justin808](https://github.com/justin808)
+- Clear hydrated stores with each server rendered block. [#785](https://github.com/shakacode/react_on_rails/pull/785) by [udovenko](https://github.com/udovenko)
+
 ## [6.9.1] - 2017-03-30
 
 ### Fixed
@@ -509,7 +518,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.9.1...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.9.2...master
+[6.9.2]: https://github.com/shakacode/react_on_rails/compare/6.9.1...6.9.2
 [6.9.1]: https://github.com/shakacode/react_on_rails/compare/6.8.2...6.9.1
 [6.9.0]: https://github.com/shakacode/react_on_rails/compare/6.8.2...6.9.0
 [6.8.2]: https://github.com/shakacode/react_on_rails/compare/6.8.1...6.8.2

data/CONTRIBUTING.md

@@ -103,7 +103,7 @@ yarn run build
 Install the local package by using a relative path in your test/client app's `package.json`, like this:
 ```sh
 cd test/client
-npm i --save 'react-on-rails@../path-to-react-on-rails'
+rm -rf node_modules/react-on-rails && npm i 'file:../path-to-react-on-rails-top-package.json'
 ```
 _Note: You must use npm here till yarn stops preferring cached packages over local. see [issue #2649](https://github.com/yarnpkg/yarn/issues/2649)_
 
@@ -111,10 +111,10 @@ When you use a relative path, be sure to run the above `yarn` command whenever y
 
 #### Example: Testing NPM changes with the dummy app
 1. Add `console.log('Hello!')` [here](https://github.com/shakacode/react_on_rails/blob/master/node_package/src/clientStartup.js#L181) in `react_on_rails/node_package/src/clientStartup.js` to confirm we're getting an update to the node package.
-2. Run the install script `npm run install-react-on-rails` in `react_on_rails/spec/dummy` to copy over our changes to the dummy app. Alternatively, you can run `npm i --save 'file:../../../'` in `react_on_rails/spec/dummy/client`. Our NPM changes are now available in the dummy app.
+2. Run the install script `npm run install-react-on-rails` in `react_on_rails/spec/dummy` to copy over our changes to the dummy app. Alternatively, you can run `rm -rf node_modules/react-on-rails && npm i 'file:../../../'` in `react_on_rails/spec/dummy/client`. Our NPM changes are now available in the dummy app.
 3. Refresh the browser if the server is already running or start the server using `foreman start` from `react_on_rails/spec/dummy` and navigate to `http://localhost:5000/`. You will now see the `Hello!` message printed in the browser's console.
 
-_Note: running `npm i` automatically builds the npm package before installing. However, when using yarn you will need to run `yarn run build` in the root directory before the install script. This will be updated when yarn issue #2649 (above) is resolved._
+_Note: running `npm i` automatically builds the npm package before installing. However, when using yarn you will need to run `yarn run build` in the root directory before the install script. This will be updated when [yarn issue #2649](https://github.com/yarnpkg/yarn/issues/2649) (above) is resolved._
 
 # Development Setup for Gem and Node Package Contributors
 

data/README.md

@@ -563,7 +563,8 @@ Node.js can be used as the backend for server-side rendering instead of [execJS]
 
 ## Dependencies
 + Ruby 2.1 or greater
-+ Rails 3.2 or greater
++ Rails 4.2 or greater
+  + Rails 3.2 will work and is tested up to 6.8.x. We are not testing it for new releases. If you find an issue, you will have to submit a PR to get it fixed.
 + Node 5.5 or greater
 
 ## Contributing

data/app/helpers/react_on_rails_helper.rb

@@ -223,16 +223,19 @@ module ReactOnRailsHelper
   private
 
   def json_safe_and_pretty(hash_or_string)
-    if Rails.env.development?
-      # TODO: for json_safe_and_pretty
-      # 1. Add test
-      # 2. Add error handler if cannot parse the string with nice message
-      # 3. Consider checking that if not a string then a Hash
-      hash_value = hash_or_string.is_a?(String) ? JSON.parse(hash_or_string) : hash_or_string
-      ERB::Util.json_escape(JSON.pretty_generate(hash_value))
-    else
-      ERB::Util.json_escape(hash_or_string.to_json)
-    end
+    # if Rails.env.development?
+    #   # TODO: for json_safe_and_pretty
+    #   # 1. Add test
+    #   # 2. Add error handler if cannot parse the string with nice message
+    #   # 3. Consider checking that if not a string then a Hash
+    #   hash_value = hash_or_string.is_a?(String) ? JSON.parse(hash_or_string) : hash_or_string
+    #   ERB::Util.json_escape(JSON.pretty_generate(hash_value))
+    # else
+    #
+    # Temp fix given that a hash may contain active record objects and that crashed with the new
+    # code to JSON.pretty_generate
+    ERB::Util.json_escape(hash_or_string.to_json)
+    # end
   end
 
   # prepend the rails_context if not yet applied
@@ -341,7 +344,11 @@ module ReactOnRailsHelper
 
     all_stores = (@registered_stores || []) + (@registered_stores_defer_render || [])
 
-    result = all_stores.each_with_object(declarations) do |redux_store_data, memo|
+    result = <<-JS
+      ReactOnRails.clearHydratedStores();
+    JS
+
+    result << all_stores.each_with_object(declarations) do |redux_store_data, memo|
       store_name = redux_store_data[:store_name]
       props = props_string(redux_store_data[:props])
       memo << <<-JS

data/docs/misc/rails3.md

@@ -1,6 +1,8 @@
 # Rails 3
 
-Please let us know if you find any issues with Rails 3. 
+* Please let us know if you find any issues with Rails 3. 
+* Rails 3 is confirmed to work up with versions up to 6.8.x.
+* We are not testing it for new releases. If you find an issue, you will have to submit a PR to get it fixed.
 
 ## Known Issues
 

data/lib/react_on_rails/version.rb

@@ -1,3 +1,3 @@
 module ReactOnRails
-  VERSION = "6.9.1".freeze
+  VERSION = "6.9.2".freeze
 end

data/lib/react_on_rails/version_checker.rb

@@ -31,7 +31,7 @@ module ReactOnRails
             "            node package: #{node_package_version.raw}\n" \
             "Ensure the installed MAJOR version of the gem is the same as the MAJOR version of \n"\
             "your installed node package."
-      logger.warn(msg)
+      logger.error(msg)
     end
 
     def gem_version

data/package.json

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

data/rakelib/dummy_apps.rake

@@ -2,16 +2,19 @@ require_relative "task_helpers"
 include ReactOnRails::TaskHelpers
 
 namespace :dummy_apps do
-  task :dummy_app do
+  task :yarn_install do
+    yarn_install_cmd = "yarn install --mutex network && yarn run install-react-on-rails"
+    sh_in_dir(dummy_app_dir, yarn_install_cmd)
+  end
+
+  task dummy_app: [:yarn_install] do
     dummy_app_dir = File.join(gem_root, "spec/dummy")
     bundle_install_in(dummy_app_dir)
-    sh_in_dir(dummy_app_dir, "yarn install --mutex network")
   end
 
-  task :dummy_app_with_turbolinks_2 do
+  task dummy_app_with_turbolinks_2: [:yarn_install] do
     dummy_app_dir = File.join(gem_root, "spec/dummy")
     bundle_install_with_turbolinks_2_in(dummy_app_dir)
-    sh_in_dir(dummy_app_dir, "yarn install --mutex network")
   end
 
   task dummy_apps: [:dummy_app, :node_package] do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 6.9.1
+  version: 6.9.2
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool