react_on_rails 6.3.2 → 6.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a33778e55ee63b84756b91066276ae483042df19
-  data.tar.gz: 44db20d267ab1bfd34a8e9bff56b171d89376b77
+  metadata.gz: d1147c015c743e085201d4ad3f0b78abce841901
+  data.tar.gz: 96e20221ddd6595e5de6cd0b159056a8ca5f5b19
 SHA512:
-  metadata.gz: 3e165be5f9e36001de70e93d594998c9b8107a75cb1b2bdd2b99adbac49682c74581788dd4bdcfe9648597076ca848b5707b4e5b9ad73599c453df6aaa46f9dc
-  data.tar.gz: 0b2efd49a3fafe8876d75c16905c5784e0e0521668caf5d63c07cf3623b0c66ebfc19633eda9d76222d19d00dc42e4901f861644c0d1caf0c4baa916690495d9
+  metadata.gz: a4b272797bcaac4c82ef4720acce5ab14b0198934291547766ee257e22dbd7737bc08e3b48559f32c1e7e031b6fa92f3fdc5789613991a2516dfdfe61bd8724e
+  data.tar.gz: 41b5b8240e0ed87f1f7273d812d8b023442e3b594beb42af25ab1a9ba8d1c3ae8b3de3266d3c9f7aaeb4ce203fad5ff77a946d2cacc71bd6257d09bdfd3467c7

data/.travis.yml

@@ -3,6 +3,9 @@ sudo: required
 language: ruby
 
 rvm:
+  - 2.0.0
+  - 2.1.10
+  - 2.2.6
   - 2.3.1
 
 services:
@@ -33,6 +36,7 @@ before_install:
 install:
   - nvm install node
   - node -v
+  - npm install -g npm@3.10.7
   - npm config set spin false
   - npm install
   - bundle install

data/CHANGELOG.md

@@ -6,6 +6,11 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 ## [Unreleased]
 *Please add entries here for your pull requests.*
 
+## [6.3.3] - 2016-12-25
+##### Changed
+- By using the hook on `turbolinks:before-visit` to unmount the components, we can ensure that components are unmounted even when Turbolinks cache is disabled. Previously, we used `turbolinks:before-cache` event hook. [#644](https://github.com/shakacode/react_on_rails/pull/644) by [volkanunsal](https://github.com/volkanunsal).
+- Added support for Ruby 2.0 [#651](https://github.com/shakacode/react_on_rails/pull/651) by [bbonamin](https://github.com/bbonamin).
+
 ## [6.3.2] - 2016-12-5
 ##### Fixed
 - The `react_component` method was raising a `NameError` when `ReactOnRailsHelper` was included in a plain object. [#636](https://github.com/shakacode/react_on_rails/pull/636) by [jtibbertsma](https://github.com/jtibbertsma).
@@ -404,7 +409,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.3.2...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.3.3...master
+[6.3.3]: https://github.com/shakacode/react_on_rails/compare/6.3.2...6.3.3
 [6.3.2]: https://github.com/shakacode/react_on_rails/compare/6.3.1...6.3.2
 [6.3.1]: https://github.com/shakacode/react_on_rails/compare/6.3.0...6.3.1
 [6.3.0]: https://github.com/shakacode/react_on_rails/compare/6.2.1...6.3.0

data/KUDOS.md

@@ -38,3 +38,9 @@ https://github.com/shakacode/react_on_rails/pull/591#issuecomment-258685925
 
 ### November 15, 2016
 ![2016-11-15_18-15-31](https://cloud.githubusercontent.com/assets/1118459/20334680/23eaab0c-ab60-11e6-8830-8528c2f829a3.png)
+
+### December 12, 2016
+![2016-12-17_13-23-21](https://cloud.githubusercontent.com/assets/1118459/21290377/1adacdf2-c45c-11e6-97c1-f726ab749b2d.png)
+
+### December 20, 2016
+![2016-12-25_10-02-17](https://cloud.githubusercontent.com/assets/1118459/21472700/70242a1e-ca89-11e6-9522-fb45f7835bbb.png)

data/NEWS.md

@@ -3,6 +3,12 @@
 *We'll keep a history of the news. A few bullets at the top will also show on the [README.md](./README.md).*
 
 * Always see the [CHANGELOG.md](./CHANGELOG.md) for the latest project changes.
+* 2016-12-20: New Video on Egghead.io: [Creating a component with React on Rails](https://egghead.io/lessons/react-creating-a-component-with-react-on-rails)
+* 2016-11-03: Spoke at [LA Ruby, 7pm, Thursday, November 10 in Venice, CA: "React on Rails: Why, What, and How?"](http://www.meetup.com/laruby/events/234825187/). [Video and pictures in this article](https://blog.shakacode.com/my-react-on-rails-talk-at-the-la-ruby-rails-meetup-november-10-2016-eaaa83aff800#.ej6h4eglp).
+* 2016-08-27: We now have a [Documentation Gitbook](https://shakacode.gitbooks.io/react-on-rails/content/) for improved readability & reference.
+* 2016-08-21: v6.1 ships with serveral new features and bug fixes. See the [Changelog](CHANGELOG.md).
+* 2016-07-28: If you're doing server rendering, be sure to use mini\_racer! See [issues/428](https://github.com/shakacode/react_on_rails/issues/428). It's supposedly much faster than `therubyracer`.
+
 * 2016-08-27: We now have a [Documentation Gitbook](https://shakacode.gitbooks.io/react-on-rails/content/) for improved readability & reference.
 * 2016-08-21: v6.1 ships with serveral new features and bug fixes. See the [Changelog](CHANGELOG.md).
 * 2016-06-13: 6.0.4 shipped with a critical fix regarding a missing polyfill for `clearTimeout`, used by babel-polyfill.

data/PROJECTS.md

@@ -13,8 +13,8 @@
 * **[Apprentus](https://www.apprentus.com/)**: A marketplace to find the best private teachers. Using react-on-rails from the homepage to infinity!
 * **[Confident Financial Solutions](https://www.mycfsapp.com/)**: Auto Repair Financing to help people get back on the road and back to life.
 * **[Flyhomes](https://www.flyhomes.com/)**: Real estate brokerage service that awards frequent flyer miles.
-* **[Undeveloped](https://undeveloped.com/)**: Buy and sell domain names.
-![image](https://cloud.githubusercontent.com/assets/1118459/19623703/7c6d63d0-9870-11e6-83f2-8b83ca49daa9.png)
+* **[Undeveloped](https://undeveloped.com/)**: Buy and sell domain names. ![image](https://cloud.githubusercontent.com/assets/1118459/19623703/7c6d63d0-9870-11e6-83f2-8b83ca49daa9.png)
+* **[Foxford.ru](http://foxford.ru/)**: Online School ![2016-12-17_13-23-21](https://cloud.githubusercontent.com/assets/1118459/21290377/1adacdf2-c45c-11e6-97c1-f726ab749b2d.png)
 
  
 ## Commercial Products in Development

data/README.md

@@ -17,23 +17,23 @@ Follow [@ShakaCode](https://twitter.com/shakacode) for notications of new releas
 # Articles, Videos, and Podcasts
 
 ### Articles
+
 * [React on Rails, 2000+ 🌟 Stars](https://medium.com/shakacode/react-on-rails-2000-stars-32ff5cfacfbf#.6gmfb2gpy)
 * [The React on Rails Doctrine](https://medium.com/@railsonmaui/the-react-on-rails-doctrine-3c59a778c724)
 
-### [React On Rails Tutorial Series](https://www.youtube.com/playlist?list=PL5VAKH-U1M6dj84BApfUtvBjvF-0-JfEU)
+### Videos 
 
-1. [History and Motivation](https://youtu.be/F4oymbUHvoY)
-2. [Basic Tutorial Walkthrough](https://youtu.be/_bjScw60FBk)
-3. [Code Walkthrough](https://youtu.be/McQ9UM-_ocQ)
+1. [egghead.io: Creating a component with React on Rails](https://egghead.io/lessons/react-creating-a-component-with-react-on-rails)
+1. [React On Rails Tutorial Series](https://www.youtube.com/playlist?list=PL5VAKH-U1M6dj84BApfUtvBjvF-0-JfEU)
+  1. [History and Motivation](https://youtu.be/F4oymbUHvoY)
+  1. [Basic Tutorial Walkthrough](https://youtu.be/_bjScw60FBk)
+  1. [Code Walkthrough](https://youtu.be/McQ9UM-_ocQ)
 
 ### Podcasts
 * [284 Ruby Rogues: React on Rails with Justin Gordon and Rob Wise](https://devchat.tv/ruby-rogues/284-rr-react-on-rails-with-justin-gordon-and-rob-wise)
 
 # NEWS
-* 2016-11-03: Speaking at [LA Ruby, 7pm, Thursday, November 10 in Venice, CA: "React on Rails: Why, What, and How?"](http://www.meetup.com/laruby/events/234825187/)
-* 2016-08-27: We now have a [Documentation Gitbook](https://shakacode.gitbooks.io/react-on-rails/content/) for improved readability & reference.
-* 2016-08-21: v6.1 ships with serveral new features and bug fixes. See the [Changelog](CHANGELOG.md).
-* 2016-07-28: If you're doing server rendering, be sure to use mini\_racer! See [issues/428](https://github.com/shakacode/react_on_rails/issues/428). It's supposedly much faster than `therubyracer`.
+* 2016-11-03: Spoke at [LA Ruby: "React on Rails: Why, What, and How?"](http://www.meetup.com/laruby/events/234825187/). [Video and pictures in this article](https://blog.shakacode.com/my-react-on-rails-talk-at-the-la-ruby-rails-meetup-november-10-2016-eaaa83aff800#.ej6h4eglp).
 * *See [NEWS.md](NEWS.md) for more notes over time.*
 
 # React on Rails

data/app/helpers/react_on_rails_helper.rb

@@ -5,8 +5,11 @@
 # 2. Keep all #{some_var} fully to the left so that all indentation is done evenly in that var
 require "react_on_rails/prerender_error"
 require "addressable/uri"
+require "react_on_rails/utils"
 
 module ReactOnRailsHelper
+  include ReactOnRails::Utils::Required
+
   # The env_javascript_include_tag and env_stylesheet_link_tag support the usage of a webpack
   # dev server for providing the JS and CSS assets during development mode. See
   # https://github.com/shakacode/react-webpack-rails-tutorial/ for a working example.
@@ -255,8 +258,12 @@ module ReactOnRailsHelper
 
   # Returns Array [0]: html, [1]: script to console log
   # NOTE, these are NOT html_safe!
-  def server_rendered_react_component_html(props, react_component_name, dom_id,
-                                           prerender:, trace:, raise_on_prerender_error:)
+  def server_rendered_react_component_html(
+    props, react_component_name, dom_id,
+    prerender: required("prerender"),
+    trace: required("trace"),
+    raise_on_prerender_error: required("raise_on_prerender_error")
+  )
     return { "html" => "", "consoleReplayScript" => "" } unless prerender
 
     # On server `location` option is added (`location = request.fullpath`)
@@ -342,7 +349,7 @@ ReactOnRails.setStore('#{store_name}', store);
   # This is the definitive list of the default values used for the rails_context, which is the
   # second parameter passed to both component and store generator functions.
   # rubocop:disable Metrics/AbcSize
-  def rails_context(server_side:)
+  def rails_context(server_side: required("server_side"))
     @rails_context ||= begin
       result = {
         inMailer: in_mailer?,

data/docs/contributor-info/linters.md

@@ -3,7 +3,7 @@ These linters support the [ShakaCode Style Guidelines](./style.md)
 
 ## Autofix!
 
-If you haven't tried the autofix options for `jscs` and `rubocop`, you're seriously missing out!
+If you haven't tried the autofix options for `eslint` and `rubocop`, you're seriously missing out!
 
 1. Be **SURE** you have a clean git status, as you'll want to review what the autofix does to your code!
 2. **Rubocop:**  Be sure to be in the right directory where you have Ruby files, probably the top level of your Rails project.
@@ -11,9 +11,15 @@ If you haven't tried the autofix options for `jscs` and `rubocop`, you're seriou
   rubocop -a
   ```
 
-3. **JSCS:**: Be sure to be in the right directory where you have JS files.
+3. **eslint:**: Be sure to be in the right directory where you have JS files.
   ```
-  jscs -x .
+  eslint --fix .
+  ```
+  
+  or 
+  
+  ```
+  npm run lint -- --fix
   ```
 
 Autofixing is a **HUGE** time saver!
@@ -60,5 +66,4 @@ You can disable all rules for a line or block, or only specific rules, as shown
 * [ESLint quick start](http://untilfalse.com/eslint-quick-start/)
 * [RuboCop](https://github.com/bbatsov/rubocop)
 * [ESLint](http://eslint.org/)
-* [JSCS](https://github.com/jscs-dev/node-jscs)
 

data/docs/misc/doctrine.md

@@ -44,7 +44,7 @@ Here's the chef's selection from the React on Rails community:
 
 ### JavaScript Tooling
 * [Babel](https://babeljs.io/): Transpiler for ES6 into ES5 and much more.
-* [EsLint](http://eslint.org/) and [Jsrc](http://jscs.info/): JavaScript linters.
+* [EsLint](http://eslint.org/)
 * [Webpack](http://webpack.github.io/): Generator of deployment assets and provider of hot module reloading.
 
 By having a common set of tools, we can discuss what we should or shouldn't be using. Thus, this takes out the "JavaScript Fatigue" from having too many unclear choices in the JavaScript world.

data/lib/react_on_rails/assets_precompile.rb

@@ -69,7 +69,8 @@ module ReactOnRails
       manifest_path = manifest_glob.first
       manifest_file = File.new(manifest_path)
       manifest_data = if File.extname(manifest_file) == ".json"
-                        JSON.load(manifest_file)["assets"]
+                        manifest_file_data = File.read(manifest_path)
+                        JSON.parse(manifest_file_data)["assets"]
                       else
                         YAML.load(manifest_file)
                       end

data/lib/react_on_rails/configuration.rb

@@ -7,35 +7,48 @@ module ReactOnRails
   DEFAULT_GENERATED_ASSETS_DIR = File.join(%w(app assets webpack)).freeze
 
   def self.setup_config_values
-    if @configuration.webpack_generated_files.empty?
-      files = ["webpack-bundle.js"]
-      if @configuration.server_bundle_js_file.present?
-        files << @configuration.server_bundle_js_file
-      end
-      @configuration.webpack_generated_files = files
-    end
+    ensure_webpack_generated_files_exists
+    configure_generated_assets_dirs_deprecation
+    ensure_generated_assets_dir_present
+    ensure_server_bundle_js_file_has_no_path
+  end
 
-    if @configuration.generated_assets_dirs.present?
-      puts "[DEPRECATION] ReactOnRails: Use config.generated_assets_dir rather than "\
+  def self.ensure_generated_assets_dir_present
+    return unless @configuration.generated_assets_dir.blank?
+
+    @configuration.generated_assets_dir = DEFAULT_GENERATED_ASSETS_DIR
+    puts "ReactOnRails: Set generated_assets_dir to default: #{DEFAULT_GENERATED_ASSETS_DIR}"
+  end
+
+  def self.configure_generated_assets_dirs_deprecation
+    return unless @configuration.generated_assets_dirs.present?
+
+    puts "[DEPRECATION] ReactOnRails: Use config.generated_assets_dir rather than "\
         "generated_assets_dirs"
-      if @configuration.generated_assets_dir.blank?
-        @configuration.generated_assets_dir = @configuration.generated_assets_dirs
-      else
-        puts "[DEPRECATION] ReactOnRails. You have both generated_assets_dirs and "\
+    if @configuration.generated_assets_dir.blank?
+      @configuration.generated_assets_dir = @configuration.generated_assets_dirs
+    else
+      puts "[DEPRECATION] ReactOnRails. You have both generated_assets_dirs and "\
           "generated_assets_dir defined. Define ONLY generated_assets_dir"
-      end
     end
+  end
 
-    if @configuration.generated_assets_dir.blank?
-      @configuration.generated_assets_dir = DEFAULT_GENERATED_ASSETS_DIR
-      puts "ReactOnRails: Set generated_assets_dir to default: #{DEFAULT_GENERATED_ASSETS_DIR}"
+  def self.ensure_webpack_generated_files_exists
+    return unless @configuration.webpack_generated_files.empty?
+
+    files = ["webpack-bundle.js"]
+    if @configuration.server_bundle_js_file.present?
+      files << @configuration.server_bundle_js_file
     end
+    @configuration.webpack_generated_files = files
+  end
+
+  def self.ensure_server_bundle_js_file_has_no_path
+    return unless @configuration.server_bundle_js_file.include?(File::SEPARATOR)
 
-    if @configuration.server_bundle_js_file.include?(File::SEPARATOR)
-      puts "[DEPRECATION] ReactOnRails: remove path from server_bundle_js_file in configuration. "\
+    puts "[DEPRECATION] ReactOnRails: remove path from server_bundle_js_file in configuration. "\
         "All generated files must go in #{@configuration.generated_assets_dir}"
-      @configuration.server_bundle_js_file = File.basename(@configuration.server_bundle_js_file)
-    end
+    @configuration.server_bundle_js_file = File.basename(@configuration.server_bundle_js_file)
   end
 
   def self.configuration

data/lib/react_on_rails/react_component/options.rb

@@ -1,10 +1,14 @@
+require "react_on_rails/utils"
+
 module ReactOnRails
   module ReactComponent
     class Options
+      include Utils::Required
+
       NO_PROPS = {}.freeze
       HIDDEN = "display:none".freeze
 
-      def initialize(name:, options:)
+      def initialize(name: required("name"), options: required("options"))
         @name = name
         @options = options
       end

data/lib/react_on_rails/test_helper/node_process_launcher.rb

@@ -1,12 +1,12 @@
 module ReactOnRails
   module TestHelper
     def self.launch_node
-      if ReactOnRails.configuration.server_render_method == "NodeJS"
-        path = "#{::Rails.root}/client/node"
-        puts "Launching NodeJS server at #{path}"
-        system("cd #{path} && npm start &")
-        sleep(1)
-      end
+      return unless ReactOnRails.configuration.server_render_method == "NodeJS"
+
+      path = "#{::Rails.root}/client/node"
+      puts "Launching NodeJS server at #{path}"
+      system("cd #{path} && npm start &")
+      sleep(1)
     end
   end
 end

data/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb

@@ -1,15 +1,21 @@
 require "rake"
 require "fileutils"
+require "react_on_rails/utils"
 
 # You can replace this implementation with your own for use by the
 # ReactOnRails::TestHelper.ensure_assets_compiled helper
 module ReactOnRails
   module TestHelper
     class WebpackAssetsStatusChecker
+      include Utils::Required
       # client_dir is typically /client, where all client files go
       attr_reader :client_dir, :generated_assets_dir
 
-      def initialize(generated_assets_dir:, client_dir:, webpack_generated_files:)
+      def initialize(
+        generated_assets_dir: required("generated_assets_dir"),
+        client_dir: required("client_dir"),
+        webpack_generated_files: required("webpack_generated_files")
+      )
         @generated_assets_dir = generated_assets_dir
         @client_dir = client_dir
         @webpack_generated_files = webpack_generated_files

data/lib/react_on_rails/utils.rb

@@ -19,5 +19,11 @@ module ReactOnRails
       File.join(ReactOnRails.configuration.generated_assets_dir,
                 ReactOnRails.configuration.server_bundle_js_file)
     end
+
+    module Required
+      def required(arg_name)
+        raise ArgumentError, "#{arg_name} is required"
+      end
+    end
   end
 end

data/lib/react_on_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ReactOnRails
-  VERSION = "6.3.2".freeze
+  VERSION = "6.3.3".freeze
 end

data/package.json

@@ -1,41 +1,41 @@
 {
   "name": "react-on-rails",
-  "version": "6.3.2",
+  "version": "6.3.3",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
     "doc": "docs"
   },
   "devDependencies": {
-    "babel-cli": "^6.16.0",
-    "babel-core": "^6.17.0",
-    "babel-loader": "^6.2.5",
+    "babel-cli": "^6.18.0",
+    "babel-core": "^6.21.0",
+    "babel-loader": "^6.2.10",
     "babel-plugin-react-transform": "^2.0.2",
-    "babel-plugin-transform-flow-strip-types": "^6.14.0",
+    "babel-plugin-transform-flow-strip-types": "^6.21.0",
     "babel-plugin-transform-runtime": "^6.15.0",
-    "babel-preset-es2015": "^6.16.0",
+    "babel-preset-es2015": "^6.18.0",
     "babel-preset-react": "^6.16.0",
     "babel-preset-stage-0": "^6.16.0",
-    "babel-runtime": "^6.11.6",
+    "babel-runtime": "^6.20.0",
     "babel-tape-runner": "^2.0.1",
-    "babel-types": "^6.16.0",
+    "babel-types": "^6.21.0",
     "babelify": "^7.3.0",
     "blue-tape": "^1.0.0",
-    "eslint": "^3.8.1",
-    "eslint-config-shakacode": "^13.2.0-beta.1",
-    "eslint-plugin-import": "^2.0.1",
+    "eslint": "^3.12.2",
+    "eslint-config-shakacode": "^13.2.1",
+    "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^2.2.3",
-    "eslint-plugin-react": "^6.4.1",
-    "flow-bin": "^0.36.0",
-    "jsdom": "^9.8.0",
-    "react": "^15.3.2",
-    "react-dom": "^15.3.2",
+    "eslint-plugin-react": "^6.8.0",
+    "flow-bin": "^0.37.4",
+    "jsdom": "^9.9.1",
+    "react": "^15.4.1",
+    "react-dom": "^15.4.1",
     "react-transform-hmr": "^1.0.4",
     "redux": "^3.6.0",
-    "release-it": "^2.4.3",
+    "release-it": "^2.5.2",
     "tap-spec": "^4.1.1",
-    "tape": "^4.6.2",
-    "webpack": "^1.13.2"
+    "tape": "^4.6.3",
+    "webpack": "^1.14.0"
   },
   "peerDependencies": {
     "react": ">= 0.14",

data/rakelib/docker.rake

@@ -19,10 +19,6 @@ namespace :docker do
     sh "docker-compose run lint rake lint:eslint"
   end
 
-  desc "Run jscs linter from docker"
-  task :jscs do
-    sh "docker-compose run lint rake lint:jscs"
-  end
   desc "Run all linting from docker"
   task :lint do
     sh "docker-compose run lint rake lint"

data/react_on_rails.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = '>= 2.0.0'
+
   s.add_dependency "connection_pool"
   s.add_dependency "execjs", "~> 2.5"
   s.add_dependency "rainbow", "~> 2.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 6.3.2
+  version: 6.3.3
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -452,7 +452,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -460,9 +460,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Rails with react server rendering with webpack.
 test_files: []
-has_rdoc: