Merge branch 'master' of https://github.com/reactjs/react-rails

Author: arBmind

README.md

@@ -84,9 +84,9 @@ To use `react_ujs`, simply `require` it after `react` (and after `turbolinks` if
 //= require react_ujs
 ```
 
-### Viewer helper
+### View helper
 
-There is a viewer helper method `react_component`. It is designed to work with `react_ujs` and takes a React class name, properties, and HTML options as arguments:
+There is a view helper method `react_component`. It is designed to work with `react_ujs` and takes a React class name, properties, and HTML options as arguments:
 
 ```ruby
 react_component('HelloMessage', :name => 'John')
@@ -125,7 +125,7 @@ In order for us to render your React components, we need to be able to find them
 //= require_tree ./components
 ```
 
-This will bring in all files located in the `app/assets/components` directory.  You can organize your code however you like, as long as a request for `/assets/components.js` brings in a concatenated file containing all of your React components, and each one has to be available in the global scope (either `window` or `global` can be used). For `.js.jsx` files this is not a problem, but if you are using `.js.jsx.coffee` files then the wrapper function needs to be taken into account:
+This will bring in all files located in the `app/assets/javascripts/components` directory.  You can organize your code however you like, as long as a request for `/assets/components.js` brings in a concatenated file containing all of your React components, and each one has to be available in the global scope (either `window` or `global` can be used). For `.js.jsx` files this is not a problem, but if you are using `.js.jsx.coffee` files then the wrapper function needs to be taken into account:
 
 ```coffee
 ###* @jsx React.DOM ###

lib/assets/javascripts/react_ujs.js

@@ -57,7 +57,7 @@
         document.addEventListener(eventName, callback);
       }
     }
-    handleEvent('page:load', mountReactComponents);
+    handleEvent('page:change', mountReactComponents);
     handleEvent('page:before-change', unmountReactComponents);
   }
 })(document, window, React);

lib/react/rails/railtie.rb

@@ -21,7 +21,7 @@ class Railtie < ::Rails::Railtie
 
       # run after all initializers to allow sprockets to pick up react.js and
       # jsxtransformer.js from end-user to override ours if needed
-      initializer "react_rails.setup_vendor", :after => "sprockets.environment" do |app|
+      initializer "react_rails.setup_vendor", :after => "sprockets.environment", group: :all do |app|
         # Mimic behavior of ember-rails...
         # We want to include different files in dev/prod. The unminified builds
         # contain console logging for invariants and logging to help catch

react-rails.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'execjs'
   s.add_dependency 'rails', '>= 3.1'
-  s.add_dependency 'react-source', '0.9.0'
+  s.add_dependency 'react-source', '0.10.0'
   s.add_dependency 'connection_pool'
 
   s.files = Dir[

test/jsxtransform_test.rb

@@ -14,8 +14,7 @@
 (function() {
   var Component;
 
-  Component = React.createClass({
-    displayName:'Component',
+  Component = React.createClass({displayName: 'Component',
     render: function() {
       return ExampleComponent( {videos:this.props.videos} );
     }

test/view_helper_test.rb

@@ -58,6 +58,10 @@ class ViewHelperTest < ActionDispatch::IntegrationTest
     page.click_link('Bob')
     assert page.has_content?('Hello Bob')
 
+    # Try going back.
+    page.execute_script('history.back();')
+    assert page.has_content?('Hello Alice')
+
     # Try Turbolinks javascript API.
     page.execute_script('Turbolinks.visit("/pages/2");')
     assert page.has_content?('Hello Alice')