react_on_rails 8.0.2 → 8.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e87c2d5daec14b131563f66b8813aadc20962b0
-  data.tar.gz: d04373277451a8cd984a63e1e325fa520b7c932e
+  metadata.gz: 980e63fa85b8221f7773b8e4cc43b19d3d6188f5
+  data.tar.gz: a5e71d9a44e77c888d92619ad9c3dc849949364e
 SHA512:
-  metadata.gz: 7779155e1479945571bcf199003b158c78422a8f61ae0bde697544132e78e6a48e42617b0662cb664a455b2f305da7badd53286776206b54b55d6eed5fa19f02
-  data.tar.gz: 656b9484ca39ab1b67d26dcaf3e1d38f695c8b8e5be6a1bf8836be392614146eac2c0e8e05576408cee9222d19398372623342f877c4fa026b085a9b7a1cc0ad
+  metadata.gz: 1aa2a2935544f0b058e9d3f0d9dbfae8c205fc086d57b43de6bcc68134db3914edb6879c36f4f7865eb279c5e0be1f780811334d85c6371abc29b19c274f672b
+  data.tar.gz: ab4eaf6ec4ef2f01895f385cc236207c5660f394e200a1222f9af045c919f94ea9f51df6034f22b06322c482bd5f4421983bd322ee66994e6d7b6f60d33de609

data/CHANGELOG.md

@@ -8,9 +8,14 @@ Changes since last non-beta release.
 
 *Please add entries here for your pull requests.*
 
+## [8.0.3]
+### Fixed
+- Ruby 2.1 issue due to `<<~` as reported in [issue #870](https://github.com/shakacode/react_on_rails/issues/870). [#867](https://github.com/shakacode/react_on_rails/pull/867) by [justin808](https://github.com/justin808)
+
 ## [8.0.2]
 ### Fixed
 - Any failure in webpack to build test files quits tests. 
+- Fixed a Ruby 2.4 potential crash which could cause a crash due to pathname change in Ruby 2.4.
 - CI Improvements: 
   - Switched to yarn link and removed relative path install of react-on-rails
   - Removed testing of Turbolinks 2
@@ -606,7 +611,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/8.0.2...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/8.0.3...master
+[8.0.3]: https://github.com/shakacode/react_on_rails/compare/8.0.2...8.0.3
 [8.0.2]: https://github.com/shakacode/react_on_rails/compare/8.0.1...8.0.2
 [8.0.1]: https://github.com/shakacode/react_on_rails/compare/8.0.0...8.0.1
 [8.0.0]: https://github.com/shakacode/react_on_rails/compare/7.0.4...8.0.0

data/docs/additional-reading/hot-reloading-rails-development.md

@@ -1,5 +1,9 @@
 # Hot Reloading of Assets For Rails Development
 
+_Note, this document is not yet updated for React on Rails v8+. See [PR #865](https://github.com/shakacode/react_on_rails/pull/865) for a detailed example of doing hot reloading using V8+ with Webpack v2. Any volunteers to update this page? See [#772](https://github.com/shakacode/react_on_rails/issues/772) and [#361](https://github.com/shakacode/react-webpack-rails-tutorial/issues/361)._
+
+------
+
 This document outlines the steps to setup your React On Rails Environment so that you can experience the pleasure of hot reloading of JavaScript and Sass during your Rails development work. See [Issue 332](https://github.com/shakacode/react_on_rails/issues/332) for troubleshooting. There are 3 examples of this setup:
 
 1. [minimal demo here](https://github.com/retroalgic/react-on-rails-hot-minimal): The most simple and updated hot reloading setup.

data/docs/tutorial.md

@@ -83,8 +83,8 @@ foreman start -f Procfile.dev
 
 ![04](https://cloud.githubusercontent.com/assets/20628911/17464921/3c2fdb40-5cf2-11e6-9343-6afa53593a70.png)
 
-Visit http://localhost:5000/hello_world and see your **React On Rails** app running!
-Note, foreman defaults to PORT 5000 unless you set the value of PORT in your environment.
+Visit http://localhost:3000/hello_world and see your **React On Rails** app running!
+Note, foreman defaults to PORT 5000 unless you set the value of PORT in your environment or in the Procfile.
 
 ![05](https://cloud.githubusercontent.com/assets/20628911/17464920/3c2e8ae2-5cf2-11e6-9e30-5ec5f9e2cbc6.png)
 

data/lib/generators/react_on_rails/templates/dev_tests/spec/simplecov_helper.rb

@@ -2,7 +2,7 @@
 
 # Starts SimpleCov for code coverage.
 
-if ENV["COVERAGE"]
+if ENV["COVERAGE"] == "true"
   require "simplecov"
 
   # Using a command name prevents results from getting clobbered by other test suites

data/lib/react_on_rails/git_utils.rb

@@ -3,7 +3,7 @@
 module ReactOnRails
   module GitUtils
     def self.uncommitted_changes?(message_handler)
-      return false if ENV["COVERAGE"]
+      return false if ENV["COVERAGE"] == "true"
       status = `git status --porcelain`
       return false if status.empty?
       error = "You have uncommitted code. Please commit or stash your changes before continuing"

data/lib/react_on_rails/prerender_error.rb

@@ -8,24 +8,30 @@ module ReactOnRails
                    js_code: nil, console_messages: nil)
       message = "ERROR in SERVER PRERENDERING\n".dup
       if err
-        message << <<~MSG
-          Encountered error: \"#{err}\"
+        # rubocop:disable Layout/IndentHeredoc
+        message << <<-MSG
+Encountered error: \"#{err}\"
         MSG
+        # rubocop:enable Layout/IndentHeredoc
         backtrace = err.backtrace.join("\n")
       else
         backtrace = nil
       end
-      message << <<~MSG
-        when prerendering #{component_name} with props: #{props}
-        js_code was:
-        #{js_code}
+      # rubocop:disable Layout/IndentHeredoc
+      message << <<-MSG
+when prerendering #{component_name} with props: #{props}
+js_code was:
+#{js_code}
       MSG
+      # rubocop:enable Layout/IndentHeredoc
 
       if console_messages
-        message << <<~MSG
-          console messages:
-          #{console_messages}
+        # rubocop:disable Layout/IndentHeredoc
+        message << <<-MSG
+console messages:
+#{console_messages}
         MSG
+        # rubocop:enable Layout/IndentHeredoc
       end
 
       super([message, backtrace].compact.join("\n"))

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "8.0.2"
+  VERSION = "8.0.3"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

data/rakelib/release.rake

@@ -22,6 +22,7 @@ which are installed via `bundle install` and `yarn`
 
 Example: `rake release[2.1.0,false]`")
 
+# rubocop:disable Metrics/BlockLength
 task :release, %i[gem_version dry_run tools_install] do |_t, args|
   class MessageHandler
     def add_error(error)
@@ -66,4 +67,8 @@ task :release, %i[gem_version dry_run tools_install] do |_t, args|
 
   # Release the new gem version
   sh_in_dir(gem_root, "gem release") unless is_dry_run
+
+  # Update master with new npm version
+  sh_in_dir(Path.join(gem_root, "spec", "dummy", "client"), "yarn add react-on-rails@#{npm_version}")
+  sh_in_dir(gem_root, "git commit -am 'Updated spec/dummy/client/package.json latest version'") unless is_dry_run
 end

data/rakelib/run_rspec.rake

@@ -49,7 +49,7 @@ namespace :run_rspec do
 
   desc "(HACK) Run RSpec on spec/empty_spec in order to have SimpleCov generate a coverage report from cache"
   task :empty do
-    sh %(COVERAGE=true rspec spec/empty_spec.rb)
+    sh %(#{ENV['USE_COVERALLS'] ? 'COVERAGE=true' : ''} rspec spec/empty_spec.rb)
   end
 
   Coveralls::RakeTask.new if ENV["USE_COVERALLS"] == "TRUE"
@@ -70,7 +70,7 @@ task :js_tests do
   sh "yarn run test"
 end
 
-msg = <<~DESC
+msg = <<-DESC.strip_heredoc
   Runs all tests, run `rake -D run_rspec` to see all available test options.
   "rake run_rspec:example_basic" is a good way to run only one generator test.
 DESC
@@ -101,7 +101,8 @@ def run_tests_in(dir, options = {})
 
   command_name = options.fetch(:command_name, path.basename)
   rspec_args = options.fetch(:rspec_args, "")
-  env_vars = %(#{options.fetch(:env_vars, '')} COVERAGE=true TEST_ENV_COMMAND_NAME="#{command_name}")
+  env_vars = %(#{options.fetch(:env_vars, '')} TEST_ENV_COMMAND_NAME="#{command_name}").dup
+  env_vars << "COVERAGE=true" if ENV["USE_COVERALLS"]
   sh_in_dir(path.realpath, "#{env_vars} bundle exec rspec #{rspec_args}")
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 8.0.2
+  version: 8.0.3
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow