react-router-rails 0.13.3.1 → 0.13.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb0ce84079fef0b790477509c1ce1e5abb8ce5da
-  data.tar.gz: 1dec2b2b89c6881d297e744b72b92d8326049ce1
+  metadata.gz: 5660ef5812dc94aac9698b4bc6e616c0339ec98e
+  data.tar.gz: ec2c861bd65095af65ecbaa466bcfd6573ee83b3
 SHA512:
-  metadata.gz: e12e1d4995676747a9b855d3bea2db9828cd13b5daf80cd7388970f369b7942e85b4f317b6968b8ac83c26e076b44734c361c0099526fb1eaeaeb3d9fb5a9940
-  data.tar.gz: 975b8d56ce26efe6e27ff960b3c1ba1ebe304826c42d824ff4c41bb854246a9e737d77cc718c0caa4d174c0400286691d1b7bae9adef0fde54ab815d5741eb68
+  metadata.gz: fa5e348c9b41924b7c58cc87ef877d01603b0a3356ece751dac04ab0a676f4ccf10f1806a168cffcc24e7398e54312b5c172d7fd4843e095b1e008d3795d845b
+  data.tar.gz: 19e025dcf1faa57bcd0e3f86e81b54813877bf9430c34013a7008246e1cb07be5e24b3ae8bd7120a9b99f6d2ebe5b795386a6f26cf9a45c5e79a9769a78ce97f

data/README.md

@@ -41,7 +41,7 @@
   ```
 3. Using the view helper:
 
-  Define your routes 'MyRoutes' in any your react components folder like you would normally do:
+  Define your routes 'MyRoutes' in your react components folder, like you would normally do:
 
   ```js
   var Route = ReactRouter.Route;
@@ -76,7 +76,7 @@
 
   ```js
   ReactRouter.run(routes, function (Handler) {
-    React.render(<Handler/>, document.body);
+    ReactDOM.render(<Handler/>, document.body);
   });
   ```
 
@@ -84,7 +84,7 @@
 
   ```coffeescript
   ReactRouter.run(routes, (Handler) ->
-    React.render <Handler/>, document.body
+    ReactDOM.render <Handler/>, document.body
   )
   ```
 

data/lib/react/router/rails/railtie.rb

@@ -9,6 +9,7 @@ module React
         config.react_router.max_renderers = 10
         config.react_router.timeout = 20 # seconds
         config.react_router.react_js = lambda { File.read(::Rails.application.assets.resolve('react.js')) }
+        config.react_router.react_server_js = lambda { File.read(::Rails.application.assets.resolve('react-server.js')) }
         config.react_router.react_router_js = lambda { File.read(::Rails.application.assets.resolve('react_router.js')) }
         config.react_router.route_filenames = ['components.js']
 
@@ -28,7 +29,7 @@ module React
 
           do_setup = lambda do
             cfg = app.config.react_router
-            React::Router::Renderer.setup!(cfg.react_js, cfg.react_router_js, cfg.routes_js,
+            React::Router::Renderer.setup!(cfg.react_js, cfg.react_server_js, cfg.react_router_js, cfg.routes_js,
                                            {:size => cfg.max_renderers, :timeout => cfg.timeout})
           end
 

data/lib/react/router/rails/version.rb

@@ -1,7 +1,7 @@
 module React
   module Router
     module Rails
-      VERSION = "0.13.3.1"
+      VERSION = "0.13.3.2"
     end
   end
 end

data/lib/react/router/renderer.rb

@@ -12,8 +12,9 @@ module React
 
       cattr_accessor :pool
 
-      def self.setup!(react_js, react_router_js, routes_js, args={})
+      def self.setup!(react_js, react_server_js, react_router_js, routes_js, args={})
         @@react_js = react_js
+        @@react_server_js = react_server_js
         @@react_router_js = react_router_js
         @@routes_js = routes_js
         @@pool.shutdown {} if @@pool
@@ -46,7 +47,7 @@ module React
           function() {
             var str = '';
             ReactRouter.run(#{routes}, #{location.to_json}, function (Handler) {
-              str = React.renderToString(React.createElement(Handler, #{react_props}));
+              str = ReactDOMServer.renderToString(React.createElement(Handler, #{react_props}));
             });
             return str;
           }()
@@ -76,6 +77,8 @@ module React
 
           #{@@react_js.call};
           React = global.React;
+          #{@@react_server_js.call};
+          ReactDOMServer = global.ReactDOMServer;
           #{@@react_router_js.call}
           ReactRouter = global.ReactRouter;
           #{@@routes_js.call};

data/vendor/assets/javascripts/react_router_ujs.js

@@ -1,6 +1,6 @@
 // Unobtrusive scripting adapter for React Router based on react-rails gem.
 // https://github.com/reactjs/react-rails/blob/master/lib/assets/javascripts/react_ujs.js
-(function(document, window, React, ReactRouter) {
+(function(document, window, React, ReactDOM, ReactRouter) {
   var ROUTER_CLASS_NAME = 'data-react-router-class';
   var LOCATION_CLASS_NAME = 'data-react-router-location';
   var DATA_CLASS_NAME = 'data-react-router-data';
@@ -37,7 +37,7 @@
       var data = JSON.parse(dataJson);
 
       ReactRouter.run(routes, location, function (Handler) {
-        React.render(React.createElement(Handler, data), routerNode);
+        ReactDOM.render(React.createElement(Handler, data), routerNode);
       });
     }
   };
@@ -70,4 +70,4 @@
     handleNativeEvents();
   }
 
-})(document, window, React, ReactRouter);
+})(document, window, React, ReactDOM, ReactRouter);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react-router-rails
 version: !ruby/object:Gem::Version
-  version: 0.13.3.1
+  version: 0.13.3.2
 platform: ruby
 authors:
 - Mario Peixoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: react-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 1.4.0
 description: React-Router for Rails Asset Pipeline
 email:
 - mario.peixoto@gmail.com