react-rails 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1785903da4681e238fd6ece7f7ddc357b3c680fb
-  data.tar.gz: 10df40460f093699de10da330576134354b7513c
+  metadata.gz: 15df12f33d7eebb048c97c8cd0bb64e95ccce6aa
+  data.tar.gz: ed212e1fdfa9fd6aa5f401cf931e9d0d72a22d24
 SHA512:
-  metadata.gz: 0da59c7aad8e5ca06a1771ffb2bf1df7cb41da8c15bb4dd62669cdd007b35997cd9d8b6e8369d2ad0cded7096ee853507c7de2c2e17fb9d313871824d1432ca2
-  data.tar.gz: 4d07c2bc45a590aab49e9bf53410728bbedaa44157827fcced1973f267f79535414b6c73f4eea8a50deca5b9a933bc521cb583050f97681fa6e7207c76c427b2
+  metadata.gz: 426958555a561b2b3bd2ea3954919123b5f7cbc764892c426b3d461b43650384fc5f1d570a65eb8eec156aac9108f1917b98987cbeff71ce50ecce270220d10b
+  data.tar.gz: c2c7cd00745aa11c70c04295d6aeb8461777a1279dacafcc48df1ea2b4bffba025de5130953ba1c829f7c3e8350b26c79297f042d3cab42cf330b51eb3b01706

data/README.md

@@ -129,10 +129,9 @@ The __view helper__ puts a `div` on the page with the requested component class
 ```
 
 On page load, the __`react_ujs` driver__ will scan the page and mount components using `data-react-class` 
-and `data-react-props`. Before page unload, it will unmount components (if you want to disable this behavior, 
-remove `data-react-class` attribute in `componentDidMount`).
+and `data-react-props`.
 
-`react_ujs` uses Turbolinks events if they're available, otherwise, it uses native events.
+If Turbolinks is present components are mounted on the `page:change` event, and unmounted on `page:before-unload`.
  __Turbolinks >= 2.4.0__ is recommended because it exposes better events.
 
 The view helper's signature is:
@@ -151,8 +150,6 @@ react_component(component_class_name, props={}, html_options={})
 
 ### Server rendering
 
-(This documentation is for the __`master` branch__, please check the [__`1.0.0` README__](https://github.com/reactjs/react-rails/tree/v1.0.0#server-rendering) for that API!)
-
 To render components on the server, pass `prerender: true` to `react_component`:
 
 ```erb
@@ -205,7 +202,7 @@ end
 ### 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`. 
+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.
@@ -240,6 +237,18 @@ var Post = React.createClass({
 });
 ```
 
+#### Options
+
+**--es6** : Generate the same component but using cutting edge es6 class
+
+For example:
+
+```shell
+rails generate react:component Label label:string --es6
+```
+
+#### Arguments
+
 The generator can use the following arguments to create basic propTypes:
 
   * any

data/lib/assets/javascripts/react_ujs.js.erb

@@ -89,10 +89,8 @@
   function handleNativeEvents() {
     if ($) {
       $(function() {window.ReactRailsUJS.mountComponents()});
-      $(window).unload(function() {window.ReactRailsUJS.unmountComponents()});
     } else {
       document.addEventListener('DOMContentLoaded', function() {window.ReactRailsUJS.mountComponents()});
-      window.addEventListener('unload', function() {window.ReactRailsUJS.unmountComponents()});
     }
   }
 

data/lib/generators/react/component_generator.rb

@@ -50,6 +50,11 @@ module React
                :default => [],
                :banner => "field[:type] field[:type] ..."
 
+      class_option :es6,
+       type: :boolean,
+       default: false,
+       desc: 'Output es6 class based component'
+
       REACT_PROP_TYPES = {
         "node" =>        'React.PropTypes.node',
         "bool" =>        'React.PropTypes.bool',
@@ -80,7 +85,7 @@ module React
       }
 
       def create_component_file
-        extension = "js.jsx"
+        extension = options[:es6] ? "es6.jsx" : "js.jsx"
         file_path = File.join('app/assets/javascripts/components', "#{file_name}.#{extension}")
         template("component.#{extension}", file_path)
       end

data/lib/generators/templates/component.es6.jsx

@@ -0,0 +1,23 @@
+class <%= file_name.camelize %> extends React.Component {
+  render () {
+<% if attributes.size > 0 -%>
+    return (
+      <div>
+<% attributes.each do |attribute| -%>
+        <div><%= attribute[:name].titleize %>: {this.props.<%= attribute[:name].camelize(:lower) %>}</div>
+<% end -%>
+      </div>
+    );
+<% else -%>
+    return <div />;
+<% end -%>
+  }
+}
+
+<% if attributes.size > 0 -%>
+<%= file_name.camelize %>.propTypes = {
+<% attributes.each_with_index do |attribute, idx| -%>
+  <%= attribute[:name].camelize(:lower) %>: <%= attribute[:type] %><% if (idx < attributes.length-1) %>,<% end %>
+<% end -%>
+};
+<% end -%>

data/lib/react/rails.rb

@@ -1,4 +1,5 @@
 require 'react/rails/asset_variant'
 require 'react/rails/engine'
 require 'react/rails/railtie'
+require 'react/rails/version'
 require 'react/rails/view_helper'

data/lib/react/rails/engine.rb

@@ -2,7 +2,8 @@ module React
   module Rails
     class Engine < ::Rails::Engine
       initializer "react_rails.setup_engine", :group => :all do |app|
-        app.assets.register_engine '.jsx', React::JSX::Template
+        sprockets_env = app.assets || Sprockets # Sprockets 3.x expects this in a different place
+        sprockets_env.register_engine(".jsx", React::JSX::Template)
       end
     end
   end

data/lib/react/rails/railtie.rb

@@ -38,10 +38,9 @@ module React
           addons: app.config.react.addons,
         })
 
-        app.assets.version = [
-          app.assets.version,
-          "react-#{asset_variant.react_build}",
-        ].compact.join('-')
+        sprockets_env = app.assets || app.config.assets # sprockets-rails 3.x attaches this at a different config
+        sprockets_env.version = [sprockets_env.version, "react-#{asset_variant.react_build}",].compact.join('-')
+
       end
 
       config.before_initialize do |app|

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.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Paul O’Shannessy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -263,6 +263,7 @@ files:
 - lib/assets/react-source/production-with-addons/react.js
 - lib/generators/react/component_generator.rb
 - lib/generators/react/install_generator.rb
+- lib/generators/templates/component.es6.jsx
 - lib/generators/templates/component.js.jsx
 - lib/react/jsx/babel_transformer.rb
 - lib/react/jsx/jsx_transformer.rb