react_on_rails 8.0.1 → 8.0.2

data/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rake"
 require "fileutils"
 require "react_on_rails/utils"

data/lib/react_on_rails/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   module TestHelper
     # Because you will probably want to run RSpec tests that rely on compiled webpack assets
@@ -31,7 +33,7 @@ module ReactOnRails
     # metatags - metatags to add the ensure_assets_compiled check.
     #            Default is :js, :server_rendering
     def self.configure_rspec_to_compile_assets(config, *metatags)
-      metatags = %i(js server_rendering controller) if metatags.empty?
+      metatags = %i[js server_rendering controller] if metatags.empty?
 
       metatags.each do |metatag|
         config.before(:example, metatag) { ReactOnRails::TestHelper.ensure_assets_compiled }

data/lib/react_on_rails/utils.rb

@@ -1,7 +1,38 @@
+# frozen_string_literal: true
+
 require "English"
+require "open3"
+require "rainbow"
+require "active_support"
+require "active_support/core_ext/string"
 
 module ReactOnRails
   module Utils
+    # https://forum.shakacode.com/t/yak-of-the-week-ruby-2-4-pathname-empty-changed-to-look-at-file-size/901
+    # return object if truthy, else return nil
+    def self.truthy_presence(obj)
+      if obj.nil? || obj == false
+        nil
+      else
+        obj
+      end
+    end
+
+    # Wraps message and makes it colored.
+    # Pass in the msg and color as a symbol.
+    def self.wrap_message(msg, color = :red)
+      # binding.pry
+      wrapper_line = ("=" * 80).to_s
+      # rubocop:disable Layout/IndentHeredoc
+      fenced_msg = <<-MSG
+#{wrapper_line}
+#{msg.strip}
+#{wrapper_line}
+      MSG
+      # rubocop:enable Layout/IndentHeredoc
+      Rainbow(fenced_msg).color(color)
+    end
+
     def self.object_to_boolean(value)
       [true, "true", "yes", 1, "1", "t"].include?(value.class == String ? value.downcase : value)
     end
@@ -10,9 +41,24 @@ module ReactOnRails
       ReactOnRails.configuration.server_bundle_js_file.present?
     end
 
-    def self.last_process_completed_successfully?
-      # rubocop:disable Style/NumericPredicate
-      $CHILD_STATUS.exitstatus == 0
+    # Invokes command, exiting with a detailed message if there's a failure.
+    def self.invoke_and_exit_if_failed(cmd, failure_message)
+      stdout, stderr, status = Open3.capture3(cmd)
+      unless status.success?
+        stdout_msg = stdout.present? ? "\nstdout:\n#{stdout.strip}\n" : ""
+        stderr_msg = stderr.present? ? "\nstderr:\n#{stderr.strip}\n" : ""
+        # rubocop:disable Layout/IndentHeredoc
+        msg = <<-MSG
+React on Rails FATAL ERROR!
+#{failure_message}
+cmd: #{cmd}
+exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
+        MSG
+        # rubocop:enable Layout/IndentHeredoc
+        puts wrap_message(msg)
+        exit(1)
+      end
+      [stdout, stderr, status]
     end
 
     def self.server_bundle_js_file_path

data/lib/react_on_rails/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReactOnRails
-  VERSION = "8.0.1".freeze
+  VERSION = "8.0.2"
 end

data/lib/react_on_rails/version_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   # Responsible for checking versions of rubygem versus yarn node package
   # against each otherat runtime.

data/lib/react_on_rails/version_syntax_converter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "version"
 
 class VersionSyntaxConverter

data/lib/react_on_rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails"
 
 require "react_on_rails/controller"

data/lib/tasks/assets.rake

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require "react_on_rails/assets_precompile"
+require "active_support"
 
 if defined?(Sprockets)
   namespace :react_on_rails do
@@ -14,11 +17,11 @@ if defined?(Sprockets)
       end
 
       # In this task, set prerequisites for the assets:precompile task
-      desc <<-DESC
-Create webpack assets before calling assets:environment
-The webpack task must run before assets:environment task.
-Otherwise Sprockets cannot find the files that webpack produces.
-This is the secret sauce for how a Heroku deployment knows to create the webpack generated JavaScript files.
+      desc <<-DESC.strip_heredoc
+        Create webpack assets before calling assets:environment
+        The webpack task must run before assets:environment task.
+        Otherwise Sprockets cannot find the files that webpack produces.
+        This is the secret sauce for how a Heroku deployment knows to create the webpack generated JavaScript files.
       DESC
       task compile_environment: :webpack do
         Rake::Task["assets:environment"].invoke
@@ -45,10 +48,10 @@ end
 # Sprockets independent tasks
 namespace :react_on_rails do
   namespace :assets do
-    desc <<-DESC
-Compile assets with webpack
-Uses command defined with ReactOnRails.configuration.npm_build_production_command
-sh "cd client && `ReactOnRails.configuration.npm_build_production_command`"
+    desc <<-DESC.strip_heredoc
+      Compile assets with webpack
+      Uses command defined with ReactOnRails.configuration.npm_build_production_command
+      sh "cd client && `ReactOnRails.configuration.npm_build_production_command`"
     DESC
     task webpack: :locale do
       if ReactOnRails.configuration.npm_build_production_command.present?

data/lib/tasks/locale.rake

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 require "react_on_rails/locales_to_js"
+require "active_support"
 
 namespace :react_on_rails do
-  desc <<-DESC
-Generate i18n javascript files
-This task generates javascript locale files: `translations.js` & `default.js` and places them in
-the "ReactOnRails.configuration.i18n_dir".
+  desc <<-DESC.strip_heredoc
+    Generate i18n javascript files
+    This task generates javascript locale files: `translations.js` & `default.js` and places them in
+    the "ReactOnRails.configuration.i18n_dir".
   DESC
   task locale: :environment do
     ReactOnRails::LocalesToJs.new

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
@@ -66,7 +66,7 @@
     "release:major": "node_package/scripts/release major",
     "dummy:install": "rake dummy_apps",
     "dummy:spec": "rake run_rspec:dummy",
-    "local": "echo 'Be sure to run yarn run dummy:install' && yarn run build && cd spec/dummy && foreman start"
+    "install-react-on-rails": "yarn link"
   },
   "repository": {
     "type": "git",

data/rakelib/docker.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :docker do
   desc "Run Rubocop linter from docker"
   task :rubocop do

data/rakelib/dummy_apps.rake

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require_relative "task_helpers"
 include ReactOnRails::TaskHelpers
 
 namespace :dummy_apps do
   task :yarn_install do
-    yarn_install_cmd = "yarn install --mutex network && yarn run install-react-on-rails"
+    yarn_install_cmd = "yarn install --mutex network"
     sh_in_dir(dummy_app_dir, yarn_install_cmd)
   end
 
@@ -12,11 +14,6 @@ namespace :dummy_apps do
     bundle_install_in(dummy_app_dir)
   end
 
-  task dummy_app_with_turbolinks_2: [:yarn_install] do
-    dummy_app_dir = File.join(gem_root, "spec/dummy")
-    bundle_install_with_turbolinks_2_in(dummy_app_dir)
-  end
-
   task dummy_apps: %i[dummy_app node_package] do
     puts "Prepared all Dummy Apps"
   end

data/rakelib/example_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rake"
 require "pathname"
 
@@ -80,7 +82,7 @@ module ReactOnRails
         "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record"
       end
 
-      %w(gen prepare clean clobber npm_install build_webpack_bundles).each do |task_type|
+      %w[gen prepare clean clobber npm_install build_webpack_bundles].each do |task_type|
         method_name_normal = "#{task_type}_task_name"          # ex: `clean_task_name`
         method_name_short = "#{method_name_normal}_short"      # ex: `clean_task_name_short`
 

data/rakelib/examples.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Defines tasks related to generating example apps using the gem's generator.
 # Allows us to create and test apps generated using a wide range of options.
 #
@@ -8,6 +10,7 @@ require_relative "example_type"
 require_relative "task_helpers"
 include ReactOnRails::TaskHelpers
 
+# rubocop:disable Metrics/BlockLength
 namespace :examples do
   # Loads data from examples_config.yml and instantiates corresponding ExampleType objects
   examples_config_file = File.expand_path("../examples_config.yml", __FILE__)
@@ -40,7 +43,7 @@ namespace :examples do
       sh_in_dir(example_type.client_dir, example_type.build_webpack_bundles_shell_commands)
     end
 
-    # NPM INSTALL
+    # YARN INSTALL
     task example_type.npm_install_task_name_short => example_type.package_json do
       unless uptodate?(example_type.node_modules_dir, [example_type.source_package_json])
         sh_in_dir(example_type.client_dir, "yarn install --mutex network")

data/rakelib/lint.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "task_helpers"
 include ReactOnRails::TaskHelpers
 

data/rakelib/node_package.rake

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require_relative "task_helpers"
 include ReactOnRails::TaskHelpers
 
 namespace :node_package do
   task :build do
-    sh "yarn run build"
+    sh "yarn run build && yarn link"
   end
 end
 

data/rakelib/release.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "task_helpers"
 include ReactOnRails::TaskHelpers
 require_relative File.join(gem_root, "lib", "react_on_rails", "version_syntax_converter")
@@ -57,7 +59,7 @@ task :release, %i[gem_version dry_run tools_install] do |_t, args|
   sh_in_dir(gem_root, "git add .")
 
   # Will bump the yarn version, commit, tag the commit, push to repo, and release on yarn
-  release_it_command = "$(yarn bin)/release-it --non-interactive --npm.publish"
+  release_it_command = "$(yarn bin)/release-it --non-interactive --npm.publish".dup
   release_it_command << " --dry-run --verbose" if is_dry_run
   release_it_command << " #{npm_version}" unless npm_version.strip.empty?
   sh_in_dir(gem_root, release_it_command)

data/rakelib/run_rspec.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "coveralls/rake/task" if ENV["USE_COVERALLS"] == "TRUE"
 
 require "pathname"
@@ -7,6 +9,7 @@ require_relative "example_type"
 
 include ReactOnRails::TaskHelpers
 
+# rubocop:disable Metrics/BlockLength
 namespace :run_rspec do
   spec_dummy_dir = File.join("spec", "dummy")
 
@@ -18,23 +21,17 @@ namespace :run_rspec do
   desc "Runs dummy rspec with turbolinks"
   task dummy: ["dummy_apps:dummy_app"] do
     clean_gen_assets(spec_dummy_dir)
+    bundle_install_in(dummy_app_dir)
     run_tests_in(spec_dummy_dir)
   end
 
   desc "Runs dummy rspec without turbolinks"
   task dummy_no_turbolinks: ["dummy_apps:dummy_app"] do
     clean_gen_assets(spec_dummy_dir)
+    bundle_install_in(dummy_app_dir)
     run_tests_in(spec_dummy_dir,
                  env_vars: "DISABLE_TURBOLINKS=TRUE",
                  command_name: "dummy_no_turbolinks")
-    bundle_install_in(dummy_app_dir)
-  end
-
-  desc "Runs dummy respec with turbolinks 2"
-  task dummy_turbolinks_2: ["dummy_apps:dummy_app_with_turbolinks_2"] do
-    clean_gen_assets(spec_dummy_dir)
-    run_tests_in(spec_dummy_dir, env_vars:
-      "ENABLE_TURBOLINKS_2=TRUE BUNDLE_GEMFILE=#{dummy_app_dir}/Gemfile")
   end
 
   # Dynamically define Rake tasks for each example app found in the examples directory
@@ -58,7 +55,7 @@ namespace :run_rspec do
   Coveralls::RakeTask.new if ENV["USE_COVERALLS"] == "TRUE"
 
   desc "run all tests no examples"
-  task all_but_examples: %i[gem dummy_no_turbolinks dummy_turbolinks_2 dummy empty js_tests] do
+  task all_but_examples: %i[gem dummy_no_turbolinks dummy empty js_tests] do
     puts "Completed all RSpec tests"
   end
 
@@ -73,9 +70,9 @@ task :js_tests do
   sh "yarn run test"
 end
 
-msg = <<-DESC
-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.
+msg = <<~DESC
+  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
 desc msg
 task run_rspec: ["run_rspec:run_rspec"]
@@ -88,7 +85,7 @@ def calc_path(dir)
              Pathname.new(dir)
            else
              Pathname.new(File.join(gem_root, dir))
-                  end
+           end
          else
            dir
          end

data/rakelib/task_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   module TaskHelpers
     # Returns the root folder of the react_on_rails gem
@@ -28,10 +30,6 @@ module ReactOnRails
       sh_in_dir(dir, "DISABLE_TURBOLINKS=TRUE bundle install")
     end
 
-    def bundle_install_with_turbolinks_2_in(dir)
-      sh_in_dir(dir, "ENABLE_TURBOLINKS_2=TRUE BUNDLE_GEMFILE=#{dir}/Gemfile bundle install")
-    end
-
     # Runs bundle exec using that directory's Gemfile
     def bundle_exec(dir: nil, args: nil, env_vars: "")
       sh_in_dir(dir, "#{env_vars} #{args}")

data/react_on_rails.gemspec

@@ -1,9 +1,11 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "react_on_rails/version"
 
+# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |s|
   s.name          = "react_on_rails"
   s.version       = ReactOnRails::VERSION
@@ -15,19 +17,22 @@ Gem::Specification.new do |s|
   s.homepage      = "https://github.com/shakacode/react_on_rails"
   s.license       = "MIT"
 
-  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|gen-examples|tmp|node_modules|node_package|coverage)/}) }
+  s.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features|gen-examples|tmp|node_modules|node_package|coverage)/})
+  end
   s.bindir        = "exe"
   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 "rainbow", "~> 2.2"
   s.add_dependency "connection_pool"
   s.add_dependency "execjs", "~> 2.5"
-  s.add_dependency "rainbow", "~> 2.1"
   s.add_dependency "rails", ">= 3.2"
   s.add_dependency "addressable"
 
+  s.add_development_dependency "rails", "~> 5.1.1"
   s.add_development_dependency "bundler", "~> 1.10"
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec"
@@ -40,7 +45,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry-state"
   s.add_development_dependency "pry-toys"
   s.add_development_dependency "pry-rescue"
-  s.add_development_dependency "binding_of_caller"
   s.add_development_dependency "awesome_print"
   s.add_development_dependency "gem-release"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.2
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: execjs
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -248,20 +262,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: binding_of_caller
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rails with react server rendering with webpack.