react-rails 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db774c83d43c1824e73e6876067cd60df03a7c34
-  data.tar.gz: f3686e6e0d19568cdc9d2e34e745365f0c60632a
+  metadata.gz: 37de0baf50c91ac20c61f03afd79b0538dce4588
+  data.tar.gz: c04e9318f7675006a78be2339cc1a38de92f3b2c
 SHA512:
-  metadata.gz: be8391ded86b4a07aa33bf8a52cfe8f8338852c296974efd4ba9db7f85dfc34dfeebf6c019eee4c2fc4f40eb35f2c7b246b31e2803d77a274ea72528073803ad
-  data.tar.gz: 896c1113547bf643e90113279a82852b0253905e5cdf92fe17a0490ec4806589ebddf67e95ebe42f5eb7e95c9398ad18f74313fd7c031d010bf232adfb5b4bb9
+  metadata.gz: 7f328fdff77009184e2b682ddab263faf7714e17fcac5b7dff9d56fa79ada9f1b8e7fb160b4fe5e8b279277962dad469257097948cdb0300c4eee147857c0428
+  data.tar.gz: 06ec30fbde19289622ecc7aa76ce7254e10f18e6c038746beb2efb7b50ad11d07fb9ea87ecca4ec9443f772a49404a891f44fe84f2b7cbb18f6a3301649ce7f8

data/CHANGELOG.md

@@ -8,7 +8,19 @@
 
 #### Bug Fixes
 
-## 2.0.2 (April 18, 2017)
+## 2.2.0
+
+#### New Features
+
+- Improve error handling when components aren't found #704
+
+#### Bug Fixes
+
+- Camelize filename when generating for webpack #703
+- Include node module boilerplate when generating for webpack #710
+- Don't look for non-existent `Turbolinks.EVENTS` #708
+
+## 2.1.0 (April 18, 2017)
 
 #### New Features
 

data/lib/assets/javascripts/react_ujs.js

@@ -119,7 +119,9 @@ var turbolinksClassicEvents = __webpack_require__(10)
 module.exports = function(ujs) {
   if (ujs.handleEvent) {
     // We're calling this a second time -- remove previous handlers
-    turbolinksClassicEvents.teardown(ujs)
+    if (typeof Turbolinks.EVENTS !== "undefined") {
+      turbolinksClassicEvents.teardown(ujs);
+    }
     turbolinksEvents.teardown(ujs);
     turbolinksClassicDeprecatedEvents.teardown(ujs);
     pjaxEvents.teardown(ujs);
@@ -185,9 +187,14 @@ module.exports = function(reqctx) {
     try {
       // `require` will raise an error if this className isn't found:
       component = fromCtx(className)
-    } catch (err) {
+    } catch (firstErr) {
       // fallback to global:
-      component = fromGlobal(className)
+      try {
+        component = fromGlobal(className)
+      } catch (secondErr) {
+        console.error(firstErr)
+        console.error(secondErr)
+      }
     }
     return component
   }

data/lib/generators/react/component_generator.rb

@@ -100,23 +100,49 @@ module React
         end
 
         # Prefer webpacker to sprockets:
-        if defined?(Webpacker)
+        if webpacker?
+          new_file_name = file_name.camelize
           extension = options[:coffee] ? "coffee" : "js"
           target_dir = Webpacker::Configuration.source_path
             .join("components")
             .relative_path_from(::Rails.root)
             .to_s
         else
+          new_file_name = file_name
           extension = template_extension
           target_dir = 'app/assets/javascripts/components'
         end
 
-        file_path = File.join(target_dir, "#{file_name}.#{extension}")
+        file_path = File.join(target_dir, "#{new_file_name}.#{extension}")
         template("component.#{template_extension}", file_path)
       end
 
       private
 
+      def component_name
+        file_name.camelize
+      end
+
+      def file_header
+        if webpacker?
+          %|var React = require("react")\n|
+        else
+          ""
+        end
+      end
+
+      def file_footer
+        if webpacker?
+          %|module.exports = #{component_name}|
+        else
+          ""
+        end
+      end
+
+      def webpacker?
+        defined?(Webpacker)
+      end
+
        def parse_attributes!
          self.attributes = (attributes || []).map do |attr|
            name, type, options = "", "", ""

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

@@ -1,4 +1,4 @@
-class <%= file_name.camelize %> extends React.Component {
+<%= file_header %>class <%= component_name %> extends React.Component {
   render () {
 <% if attributes.size > 0 -%>
     return (
@@ -21,3 +21,4 @@ class <%= file_name.camelize %> extends React.Component {
 <% end -%>
 };
 <% end -%>
+<%= file_footer %>

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

@@ -1,4 +1,4 @@
-var <%= file_name.camelize %> = React.createClass({
+<%= file_header %>var <%= component_name %> = React.createClass({
 <% if attributes.size > 0 -%>
   propTypes: {
 <% attributes.each_with_index do |attribute, idx| -%>
@@ -21,3 +21,4 @@ var <%= file_name.camelize %> = React.createClass({
 <% end -%>
   }
 });
+<%= file_footer %>

data/lib/generators/templates/component.js.jsx.coffee

@@ -1,4 +1,4 @@
-class @<%= file_name.camelize %> extends React.Component
+class @<%= component_name %> extends React.Component
 <% if attributes.size > 0 -%>
   @propTypes =
 <% attributes.each do |attribute| -%>
@@ -15,4 +15,4 @@ class @<%= file_name.camelize %> extends React.Component
     </div>`
 <% else -%>
     `<div />`
-<% end -%>
+<% end -%>

data/lib/react/rails/version.rb

@@ -2,6 +2,6 @@ module React
   module Rails
     # If you change this, make sure to update VERSIONS.md
     # and republish the UJS by updating package.json and `bundle exec rake ujs:publish`
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Paul O’Shannessy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: React integration for Ruby on Rails