react-rails 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcffb8326ddf9468f84991dc075b824339192aa6
-  data.tar.gz: 732958fbaa2b917816cc4febcd340e4d439ac397
+  metadata.gz: f334d2c029d0618856f87380e5f383c41dd1de3d
+  data.tar.gz: a99014219803125228a7c01f7b4fce09beab20a7
 SHA512:
-  metadata.gz: 03572f213be4ef8de3be2a513fe56b8fe825f456e704271a785e2f8f9afbe8c0f12670809e441b0da1d1968bce0676db5d993333879dd9b6b126c4f32cf67680
-  data.tar.gz: 33c018c9e2dc905b5c3e505f75882344345e00ecfd8fb9a6aa4a8ee85468bd74a30fa44ca1b6a75105df06ae98c28c050f3b5c82d15d5aacd34a14b4c9c62640
+  metadata.gz: 179cef5ad9262a265d2c985a54c4f54e064b87aa7078382080fd18dab01dd243dc63257eefdc41d945d71f2ab5fd896fecfd07c55d03ce66c71a376e51ab438a
+  data.tar.gz: deb80234836320e2cf829ea0b1de79a22473598054d4356af10c0255a36b275e73f247a4d115ec484ec462809ba51f722507d423ca39971ed83abcb8f921bcc1

data/README.md

@@ -34,7 +34,7 @@ rails g react:install
 ```
 
 This will:
-- create a `components.js` manifest file and a `app/assets/javascripts/components/` directory, 
+- create a `components.js` manifest file and a `app/assets/javascripts/components/` directory,
 where you will put your components
 - place the following in your `application.js`:
 
@@ -48,7 +48,7 @@ where you will put your components
 
 ### React.js builds
 
-You can pick which React.js build (development, production, with or without [add-ons]((http://facebook.github.io/react/docs/addons.html))) 
+You can pick which React.js build (development, production, with or without [add-ons]((http://facebook.github.io/react/docs/addons.html)))
 to serve in each environment by adding a config. Here are the defaults:
 
 ```ruby
@@ -71,10 +71,10 @@ MyApp::Application.configure do
 end
 ```
 
-After restarting your Rails server, `//= require react`  will provide the build of React.js which 
+After restarting your Rails server, `//= require react`  will provide the build of React.js which
 was specified by the configurations.
 
-`react-rails` offers a few other options for versions & builds of React.js. 
+`react-rails` offers a few other options for versions & builds of React.js.
 See [VERSIONS.md](https://github.com/reactjs/react-rails/blob/master/VERSIONS.md) for more info about
  using the `react-source` gem or dropping in your own copies of React.js.
 
@@ -121,7 +121,7 @@ config.react.jsx_transform_options = {
 
 ### Rendering & mounting
 
-`react-rails` includes a view helper (`react_component`) and an unobtrusive JavaScript driver (`react_ujs`) 
+`react-rails` includes a view helper (`react_component`) and an unobtrusive JavaScript driver (`react_ujs`)
 which work together to put React components on the page. You should require the UJS driver
  in your manifest after `react` (and after `turbolinks` if you use [Turbolinks](https://github.com/rails/turbolinks)).
 
@@ -133,7 +133,7 @@ The __view helper__ puts a `div` on the page with the requested component class
 <div data-react-class="HelloMessage" data-react-props="{&quot;name&quot;:&quot;John&quot;}"></div>
 ```
 
-On page load, the __`react_ujs` driver__ will scan the page and mount components using `data-react-class` 
+On page load, the __`react_ujs` driver__ will scan the page and mount components using `data-react-class`
 and `data-react-props`.
 
 If Turbolinks is present components are mounted on the `page:change` event, and unmounted on `page:before-unload`.
@@ -169,9 +169,9 @@ _(It will be also be mounted by the UJS on page load.)_
 
 There are some requirements for this to work:
 
-- `react-rails` must load your code. By convention it uses `components.js`, which was created 
+- `react-rails` must load your code. By convention it uses `components.js`, which was created
 by the install task. This file must include your components _and_ their dependencies (eg, Underscore.js).
-- Your components must be accessible in the global scope. 
+- Your components must be accessible in the global scope.
 If you are using `.js.jsx.coffee` files then the wrapper function needs to be taken into account:
 
   ```coffee
@@ -180,7 +180,7 @@ If you are using `.js.jsx.coffee` files then the wrapper function needs to be ta
     render: ->
       `<ExampleComponent videos={this.props.videos} />`
   ```
-- Your code can't reference `document`. Prerender processes don't have access to `document`, 
+- Your code can't reference `document`. Prerender processes don't have access to `document`,
 so jQuery and some other libs won't work in this environment :(
 
 You can configure your pool of JS virtual machines and specify where it should load code:
@@ -222,10 +222,10 @@ By default, your current layout will be used and the component, rather than a vi
 
 ### Component generator
 
-`react-rails` ships with a Rails generator to help you get started with a simple component scaffold. 
-You can run it using `rails generate react:component ComponentName (--es6)`. 
-The generator takes an optional list of arguments for default propTypes, 
-which follow the conventions set in the [Reusable Components](http://facebook.github.io/react/docs/reusable-components.html) 
+`react-rails` ships with a Rails generator to help you get started with a simple component scaffold.
+You can run it using `rails generate react:component ComponentName (--es6)`.
+The generator takes an optional list of arguments for default propTypes,
+which follow the conventions set in the [Reusable Components](http://facebook.github.io/react/docs/reusable-components.html)
 section of the React documentation.
 
 For example:
@@ -294,7 +294,7 @@ Note that the arguments for `oneOf` and `oneOfType` must be enclosed in single q
 
 ### Jbuilder & react-rails
 
-If you use Jbuilder to pass a JSON string to `react_component`, make sure your JSON is a stringified hash, 
+If you use Jbuilder to pass a JSON string to `react_component`, make sure your JSON is a stringified hash,
 not an array. This is not the Rails default -- you should add the root node yourself. For example:
 
 ```ruby
@@ -313,7 +313,7 @@ end
 
 ## CoffeeScript
 
-It is possible to use JSX with CoffeeScript. To use CoffeeScript, create files with an extension `.js.jsx.coffee`. 
+It is possible to use JSX with CoffeeScript. To use CoffeeScript, create files with an extension `.js.jsx.coffee`.
 We also need to embed JSX code inside backticks so that CoffeeScript ignores the syntax it doesn't understand.
 Here's an example:
 
@@ -348,8 +348,8 @@ Any subclass of `ExecJSRenderer` may use those hooks (for example, `SprocketsRen
 `react-rails` uses a "helper implementation" class to generate the output of the `react_component` helper. The helper is initialized once per request and used for each `react_component` call during that request. You can provide a custom helper class to `config.react.view_helper_implementation`. The class must implement:
 
 - `#react_component(name, props = {}, options = {}, &block)` to return a string to inject into the Rails view
-- `#setup(rack_env)`, called when the helper is initialized at the start of the request
-- `#teardown(rack_env)`, called at the end of the request
+- `#setup(controller_instance)`, called when the helper is initialized at the start of the request
+- `#teardown(controller_instance)`, called at the end of the request
 
 `react-rails` provides one implementation, `React::Rails::ComponentMount`.
 

data/lib/react/rails.rb

@@ -1,7 +1,7 @@
 require 'react/rails/asset_variant'
 require 'react/rails/engine'
 require 'react/rails/railtie'
-require 'react/rails/render_middleware'
+require 'react/rails/controller_lifecycle'
 require 'react/rails/version'
 require 'react/rails/component_mount'
 require 'react/rails/view_helper'

data/lib/react/rails/component_mount.rb

@@ -10,7 +10,7 @@ module React
       include ActionView::Helpers::TextHelper
       attr_accessor :output_buffer
 
-      # RenderMiddleware calls these hooks
+      # ControllerLifecycle calls these hooks
       # You can use them in custom helper implementations
       def setup(env)
       end

data/lib/react/rails/controller_lifecycle.rb

@@ -0,0 +1,24 @@
+module React
+  module Rails
+    module ControllerLifecycle
+      extend ActiveSupport::Concern
+
+      included do
+        # use old names to support Rails 3
+        before_filter :setup_react_component_helper
+        after_filter :teardown_react_component_helper
+        attr_reader :__react_component_helper
+      end
+
+      def setup_react_component_helper
+        new_helper = React::Rails::ViewHelper.helper_implementation_class.new
+        new_helper.setup(self)
+        @__react_component_helper = new_helper
+      end
+
+      def teardown_react_component_helper
+        @__react_component_helper.teardown(self)
+      end
+    end
+  end
+end

data/lib/react/rails/controller_renderer.rb

@@ -5,9 +5,9 @@ class React::Rails::ControllerRenderer
 
   attr_accessor :output_buffer
 
-  attr_reader :request
   def initialize(options={})
-    @request = options[:request]
+    controller = options[:controller]
+    @__react_component_helper = controller.__react_component_helper
   end
 
   def call(name, options, &block)

data/lib/react/rails/railtie.rb

@@ -24,13 +24,18 @@ module React
 
       # Include the react-rails view helper lazily
       initializer "react_rails.setup_view_helpers", group: :all do |app|
-        app.config.middleware.use(::React::Rails::RenderMiddleware)
+
         app.config.react.jsx_transformer_class ||= React::JSX::DEFAULT_TRANSFORMER
         React::JSX.transformer_class = app.config.react.jsx_transformer_class
         React::JSX.transform_options = app.config.react.jsx_transform_options
 
         app.config.react.view_helper_implementation ||= React::Rails::ComponentMount
         React::Rails::ViewHelper.helper_implementation_class = app.config.react.view_helper_implementation
+
+        ActiveSupport.on_load(:action_controller) do
+          include ::React::Rails::ControllerLifecycle
+        end
+
         ActiveSupport.on_load(:action_view) do
           include ::React::Rails::ViewHelper
         end
@@ -38,7 +43,7 @@ module React
 
       initializer "react_rails.add_component_renderer", group: :all do |app|
         ActionController::Renderers.add :component do |component_name, options|
-          renderer = ::React::Rails::ControllerRenderer.new(request: request)
+          renderer = ::React::Rails::ControllerRenderer.new(controller: self)
           html = renderer.call(component_name, options)
           render_options = options.merge(inline: html)
           render(render_options)

data/lib/react/rails/version.rb

@@ -1,6 +1,6 @@
 module React
   module Rails
     # If you change this, make sure to update VERSIONS.md
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

data/lib/react/rails/view_helper.rb

@@ -3,15 +3,14 @@ module React
     module ViewHelper
       # This class will be used for inserting tags into HTML.
       # It should implement:
-      #   - #setup(env)
-      #   - #teardown(env)
+      #   - #setup(controller_instance)
+      #   - #teardown(controller_instance)
       #   - #react_component(name, props, options &block)
       # The default is {React::Rails::ComponentMount}
       mattr_accessor :helper_implementation_class
 
       def react_component(*args, &block)
-        impl_key = React::Rails::RenderMiddleware::HELPER_IMPLEMENTATION_KEY
-        helper_obj = request.env[impl_key]
+        helper_obj = @__react_component_helper
         helper_obj.react_component(*args, &block)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Paul O’Shannessy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -271,10 +271,10 @@ files:
 - lib/react/jsx.rb
 - lib/react/rails/asset_variant.rb
 - lib/react/rails/component_mount.rb
+- lib/react/rails/controller_lifecycle.rb
 - lib/react/rails/controller_renderer.rb
 - lib/react/rails/engine.rb
 - lib/react/rails/railtie.rb
-- lib/react/rails/render_middleware.rb
 - lib/react/rails/version.rb
 - lib/react/rails/view_helper.rb
 - lib/react/rails.rb

data/lib/react/rails/render_middleware.rb

@@ -1,19 +0,0 @@
-module React
-  module Rails
-    class RenderMiddleware
-      HELPER_IMPLEMENTATION_KEY = "react_rails.view_helper_implementation"
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        new_helper = React::Rails::ViewHelper.helper_implementation_class.new
-        new_helper.setup(env)
-        env[HELPER_IMPLEMENTATION_KEY] = new_helper
-        response = @app.call(env)
-        new_helper.teardown(env)
-        response
-      end
-    end
-  end
-end