react_on_rails 6.10.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b8e8a575ac81a5b58a9fdb4d28efd3e88c04fc7
-  data.tar.gz: 8dae777aa4200fa6c0c55a242d2162ce0f9175fa
+  metadata.gz: 4a64c923e951e8fba50908c5443db96a78ae0fe6
+  data.tar.gz: 36e02d24cbb41b280141e38987353c5ddf02c036
 SHA512:
-  metadata.gz: 143e5f35ed703170d068f6befe68df596219b8264195ee2e2b2a0b829d9f2cdcfff8452131a64c05cd2960a030c5114741b2dd5947264b42146f52d9b7ae7708
-  data.tar.gz: 68da88fa5969e6e497cfcf8ccfeb068a5bb162793cb55a8b978cb00a400f469e2a2c656e1aaa01d47d8809680e91a908fe7311536b9505cbb5622f7886eb76a9
+  metadata.gz: fe9914d3b089d3852aa5e4f25ddef695f68463b6b7af46027a554ce978c953580d8b034f15b083ee76230d3e115b3a5e22d07647c3996991ab26e568c93b77ba
+  data.tar.gz: 6a72dc2499c81435640a33ec33e2dfd7309e8204e8d51e0953e5f197cda891b50d228a04c03a6d6c67bd255e4d7cd529cf0f75b06cef91cdf0efd45237074f06

data/CHANGELOG.md

@@ -1,9 +1,16 @@
 # Change Log
-All notable changes to this project's source code will be documented in this file. Items under `Unreleased` is upcoming features that will be out in next version.
+All notable changes to this project's source code will be documented in this file. Items under `Unreleased` is upcoming features that will be out in next version. NOTE: major versions of the npm module and the gem must be kept in sync.
 
 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]
+## [7.0.0] - 2017-04-25
+### Changed
+- Any version differences in gem and node package for React on Rails throw an error [#821](https://github.com/shakacode/react_on_rails/pull/821) by [justin808](https://github.com/justin808)
+
+### Fixed
+- Fixes serious performance regression when using String props for rendering. [#821](https://github.com/shakacode/react_on_rails/pull/821) by [justin808](https://github.com/justin808)
+
 ## [6.10.1] - 2017-04-23
 ### Fixed
 - Improve json conversion with tests and support for older Rails 3.x. [#787](https://github.com/shakacode/react_on_rails/pull/787) by [cheremukhin23](https://github.com/cheremukhin23) and [Ynote](https://github.com/Ynote).
@@ -534,7 +541,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.10.1...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/7.0.0...master
+[7.0.0]: https://github.com/shakacode/react_on_rails/compare/6.10.1...7.0.0
 [6.10.1]: https://github.com/shakacode/react_on_rails/compare/6.10.0...6.10.1
 [6.10.0]: https://github.com/shakacode/react_on_rails/compare/6.9.3...6.10.0
 [6.9.3]: https://github.com/shakacode/react_on_rails/compare/6.9.1...6.9.3

data/app/helpers/react_on_rails_helper.rb

@@ -107,12 +107,17 @@ module ReactOnRailsHelper
     # Setup the page_loaded_js, which is the same regardless of prerendering or not!
     # The reason is that React is smart about not doing extra work if the server rendering did its job.
     component_specification_tag = content_tag(:script,
-                                              json_safe_and_pretty(options.data).html_safe,
+                                              json_safe_and_pretty(options.props).html_safe,
                                               type: "application/json",
-                                              class: "js-react-on-rails-component")
+                                              class: "js-react-on-rails-component",
+                                              "data-component-name" => options.name,
+                                              "data-trace" => options.trace,
+                                              "data-dom-id" => options.dom_id)
 
     # Create the HTML rendering part
-    result = server_rendered_react_component_html(options.props, options.name, options.dom_id,
+    result = server_rendered_react_component_html(options.props,
+                                                  options.name,
+                                                  options.dom_id,
                                                   prerender: options.prerender,
                                                   trace: options.trace,
                                                   raise_on_prerender_error: options.raise_on_prerender_error)

data/lib/react_on_rails/engine.rb

@@ -2,7 +2,7 @@ module ReactOnRails
   class Engine < ::Rails::Engine
     config.to_prepare do
       if File.exist?(VersionChecker::NodePackageVersion.package_json_path)
-        VersionChecker.build.warn_if_gem_and_node_package_versions_differ
+        VersionChecker.build.raise_if_gem_and_node_package_versions_differ
       end
       ReactOnRails::ServerRenderingPool.reset_pool
     end

data/lib/react_on_rails/react_component/options.rb

@@ -13,8 +13,7 @@ module ReactOnRails
       end
 
       def props
-        props = options.fetch(:props) { NO_PROPS }
-        props.is_a?(String) ? JSON.parse(ERB::Util.json_escape(props)) : props
+        options.fetch(:props) { NO_PROPS }
       end
 
       def name
@@ -45,15 +44,6 @@ module ReactOnRails
         retrieve_key(:raise_on_prerender_error)
       end
 
-      def data
-        {
-          component_name: name,
-          props: props,
-          trace: trace,
-          dom_id: dom_id
-        }
-      end
-
       private
 
       attr_reader :options

data/lib/react_on_rails/version.rb

@@ -1,3 +1,3 @@
 module ReactOnRails
-  VERSION = "6.10.1".freeze
+  VERSION = "7.0.0".freeze
 end

data/lib/react_on_rails/version_checker.rb

@@ -2,44 +2,49 @@ module ReactOnRails
   # Responsible for checking versions of rubygem versus yarn node package
   # against each otherat runtime.
   class VersionChecker
-    attr_reader :node_package_version, :logger
-    MAJOR_VERSION_REGEX = /(\d+)\.?/
+    attr_reader :node_package_version
+    MAJOR_MINOR_PATCH_VERSION_REGEX = /(\d+)\.(\d+)\.(\d+)/
 
     def self.build
-      new(NodePackageVersion.build, Rails.logger)
+      new(NodePackageVersion.build)
     end
 
-    def initialize(node_package_version, logger)
-      @logger = logger
+    def initialize(node_package_version)
       @node_package_version = node_package_version
     end
 
     # For compatibility, the gem and the node package versions should always match,
     # unless the user really knows what they're doing. So we will give a
     # warning if they do not.
-    def warn_if_gem_and_node_package_versions_differ
+    def raise_if_gem_and_node_package_versions_differ
       return if node_package_version.relative_path?
-      return if node_package_version.major == gem_major_version
-      log_differing_versions_warning
+      node_major_minor_patch = node_package_version.major_minor_patch
+      gem_major_minor_patch = gem_major_minor_patch_version
+      return if node_major_minor_patch[0] == gem_major_minor_patch[0] &&
+                node_major_minor_patch[1] == gem_major_minor_patch[1] &&
+                node_major_minor_patch[2] == gem_major_minor_patch[2]
+
+      raise_differing_versions_warning
     end
 
     private
 
-    def log_differing_versions_warning
-      msg = "**WARNING** ReactOnRails: ReactOnRails gem and node package MAJOR versions do not match\n" \
+    def raise_differing_versions_warning
+      msg = "**ERROR** ReactOnRails: ReactOnRails gem and node package versions do not match\n" \
             "                     gem: #{gem_version}\n" \
             "            node package: #{node_package_version.raw}\n" \
-            "Ensure the installed MAJOR version of the gem is the same as the MAJOR version of \n"\
+            "Ensure the installed version of the gem is the same as the version of \n"\
             "your installed node package."
-      logger.error(msg)
+      raise msg
     end
 
     def gem_version
       ReactOnRails::VERSION
     end
 
-    def gem_major_version
-      gem_version.match(MAJOR_VERSION_REGEX)[1]
+    def gem_major_minor_patch_version
+      match = gem_version.match(MAJOR_MINOR_PATCH_VERSION_REGEX)
+      [match[1], match[2], match[3]]
     end
 
     class NodePackageVersion
@@ -71,9 +76,10 @@ module ReactOnRails
         raw.match(%r{(\.\.|\Afile:///)}).present?
       end
 
-      def major
+      def major_minor_patch
         return if relative_path?
-        raw.match(MAJOR_VERSION_REGEX)[1]
+        match = raw.match(MAJOR_MINOR_PATCH_VERSION_REGEX)
+        [match[1], match[2], match[3]]
       end
 
       private

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "6.10.1",
+  "version": "7.0.0",
   "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.10.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-23 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool