react_on_rails 8.0.1 → 8.0.2

data/lib/generators/react_on_rails/generator_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rainbow"
 
 module GeneratorHelper
@@ -13,11 +15,13 @@ module GeneratorHelper
   end
 
   def setup_file_error(file, data)
+    # rubocop:disable Layout/IndentHeredoc
     <<-MSG
 #{file} was not found.
 Please add the following content to your #{file} file:
 #{data}
     MSG
+    # rubocop:enable Layout/IndentHeredoc
   end
 
   def empty_directory_with_keep_file(destination, config = {})

data/lib/generators/react_on_rails/generator_messages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeneratorMessages
   class << self
     def output

data/lib/generators/react_on_rails/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators"
 require_relative "generator_helper"
 require_relative "generator_messages"
@@ -65,16 +67,14 @@ module ReactOnRails
 
       def missing_yarn?
         return false unless ReactOnRails::Utils.running_on_windows? ? `where yarn`.blank? : `which yarn`.blank?
-        error = "yarn is required. Please install it before continuing. "
-        error << "https://yarnpkg.com/en/docs/install"
+        error = "yarn is required. Please install it before continuing. https://yarnpkg.com/en/docs/install"
         GeneratorMessages.add_error(error)
         true
       end
 
       def missing_node?
         return false unless ReactOnRails::Utils.running_on_windows? ? `where node`.blank? : `which node`.blank?
-        error = "** nodejs is required. Please install it before continuing. "
-        error << "https://nodejs.org/en/"
+        error = "** nodejs is required. Please install it before continuing. https://nodejs.org/en/"
         GeneratorMessages.add_error(error)
         true
       end

data/lib/generators/react_on_rails/node_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators"
 
 module ReactOnRails
@@ -12,8 +14,8 @@ module ReactOnRails
 
       def copy_base_redux_files
         base_path = "node/base/"
-        %w(client/node/server.js
-           client/node/package.json).each do |file|
+        %w[client/node/server.js
+           client/node/package.json].each do |file|
              copy_file(base_path + file, file)
            end
       end

data/lib/generators/react_on_rails/react_no_redux_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators"
 require_relative "generator_helper"
 
@@ -10,7 +12,7 @@ module ReactOnRails
 
       def copy_base_files
         base_path = "base/base/"
-        base_files = %w(client/app/bundles/HelloWorld/components/HelloWorld.jsx)
+        base_files = %w[client/app/bundles/HelloWorld/components/HelloWorld.jsx]
         base_files.each { |file| copy_file("#{base_path}#{file}", file) }
       end
 

data/lib/generators/react_on_rails/react_with_redux_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators"
 
 module ReactOnRails
@@ -7,19 +9,19 @@ module ReactOnRails
       source_root(File.expand_path("../templates", __FILE__))
 
       def create_redux_directories
-        dirs = %w(actions constants reducers store)
+        dirs = %w[actions constants reducers store]
         dirs.each { |name| empty_directory("client/app/bundles/HelloWorld/#{name}") }
       end
 
       def copy_base_redux_files
         base_path = "redux/base/"
-        %w(client/app/bundles/HelloWorld/components/HelloWorld.jsx
+        %w[client/app/bundles/HelloWorld/components/HelloWorld.jsx
            client/app/bundles/HelloWorld/actions/helloWorldActionCreators.jsx
            client/app/bundles/HelloWorld/containers/HelloWorldContainer.jsx
            client/app/bundles/HelloWorld/constants/helloWorldConstants.jsx
            client/app/bundles/HelloWorld/reducers/helloWorldReducer.jsx
            client/app/bundles/HelloWorld/store/helloWorldStore.jsx
-           client/app/bundles/HelloWorld/startup/HelloWorldApp.jsx).each do |file|
+           client/app/bundles/HelloWorld/startup/HelloWorldApp.jsx].each do |file|
              copy_file(base_path + file, file)
            end
       end

data/lib/generators/react_on_rails/templates/base/base/app/controllers/hello_world_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HelloWorldController < ApplicationController
   layout "hello_world"
 

data/lib/generators/react_on_rails/templates/dev_tests/spec/features/hello_world_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "../rails_helper"
 
 feature "Hello World", js: true do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is copied to spec/ when you run "rails generate rspec:install"
 ENV["RAILS_ENV"] ||= "test"
 require_relative "../config/environment"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Starts SimpleCov for code coverage.
 
 if ENV["COVERAGE"]

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause

data/lib/react_on_rails/assets_precompile.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   class AssetsPrecompile
-    class SymlinkTargetDoesNotExistException < StandardError; end
+    class SymlinkTargetDoesNotExistException < StandardError
+    end
 
     # Used by the rake task
     def default_asset_path
@@ -9,13 +12,16 @@ module ReactOnRails
       Pathname.new(dir)
     end
 
+    # assets_path should be a Pathname object
     def initialize(assets_path: nil,
                    symlink_non_digested_assets_regex: nil,
                    generated_assets_dir: nil)
-      @assets_path = assets_path.presence || default_asset_path
-      @symlink_non_digested_assets_regex = symlink_non_digested_assets_regex.presence ||
-                                           ReactOnRails.configuration.symlink_non_digested_assets_regex
-      @generated_assets_dir = generated_assets_dir.presence || ReactOnRails.configuration.generated_assets_dir
+      @assets_path = ReactOnRails::Utils.truthy_presence(assets_path) || default_asset_path
+      @symlink_non_digested_assets_regex =
+        ReactOnRails::Utils.truthy_presence(symlink_non_digested_assets_regex) ||
+        ReactOnRails.configuration.symlink_non_digested_assets_regex
+      @generated_assets_dir = ReactOnRails::Utils.truthy_presence(generated_assets_dir) ||
+                              ReactOnRails.configuration.generated_assets_dir
     end
 
     # target and symlink are relative to the assets directory

data/lib/react_on_rails/configuration.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   def self.configure
     yield(configuration)
     setup_config_values
   end
 
-  DEFAULT_GENERATED_ASSETS_DIR = File.join(%w(public webpack), Rails.env).freeze
+  DEFAULT_GENERATED_ASSETS_DIR = File.join(%w[public webpack], Rails.env).freeze
 
   def self.setup_config_values
     ensure_webpack_generated_files_exists

data/lib/react_on_rails/controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   module Controller
     # Separate initialization of store from react_component allows multiple react_component calls to

data/lib/react_on_rails/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/railtie"
 
 module ReactOnRails

data/lib/react_on_rails/git_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   module GitUtils
     def self.uncommitted_changes?(message_handler)

data/lib/react_on_rails/json_output.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/string/output_safety"
 
 module ReactOnRails

data/lib/react_on_rails/locales_to_js.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "erb"
 
 module ReactOnRails
@@ -27,7 +29,7 @@ module ReactOnRails
     end
 
     def js_file_names
-      %w(translations default)
+      %w[translations default]
     end
 
     def js_files
@@ -43,7 +45,9 @@ module ReactOnRails
         if i18n_yml_dir.present?
           Dir["#{i18n_yml_dir}/**/*.yml"]
         else
-          (Rails.application && Rails.application.config.i18n.load_path).presence
+          ReactOnRails::Utils.truthy_presence(
+            Rails.application && Rails.application.config.i18n.load_path
+          ).presence
         end
       end
     end
@@ -110,20 +114,20 @@ module ReactOnRails
     end
 
     def template_translations
-      <<-JS
-export const translations = #{@translations};
+      <<-JS.strip_heredoc
+        export const translations = #{@translations};
       JS
     end
 
     def template_default
-      <<-JS
-import { defineMessages } from 'react-intl';
+      <<-JS.strip_heredoc
+        import { defineMessages } from 'react-intl';
 
-const defaultLocale = \'#{default_locale}\';
+        const defaultLocale = \'#{default_locale}\';
 
-const defaultMessages = defineMessages(#{@defaults});
+        const defaultMessages = defineMessages(#{@defaults});
 
-export { defaultMessages, defaultLocale };
+        export { defaultMessages, defaultLocale };
       JS
     end
   end

data/lib/react_on_rails/prerender_error.rb

@@ -1,27 +1,30 @@
+# frozen_string_literal: true
+
+# rubocop:disable: Layout/IndentHeredoc
 module ReactOnRails
   class PrerenderError < RuntimeError
     # err might be nil if JS caught the error
     def initialize(component_name: nil, err: nil, props: nil,
                    js_code: nil, console_messages: nil)
-      message = "ERROR in SERVER PRERENDERING\n"
+      message = "ERROR in SERVER PRERENDERING\n".dup
       if err
-        message << <<-MSG
-Encountered error: \"#{err}\"
+        message << <<~MSG
+          Encountered error: \"#{err}\"
         MSG
         backtrace = err.backtrace.join("\n")
       else
         backtrace = nil
       end
-      message << <<-MSG
-when prerendering #{component_name} with props: #{props}
-js_code was:
-#{js_code}
+      message << <<~MSG
+        when prerendering #{component_name} with props: #{props}
+        js_code was:
+        #{js_code}
       MSG
 
       if console_messages
-        message << <<-MSG
-console messages:
-#{console_messages}
+        message << <<~MSG
+          console messages:
+          #{console_messages}
         MSG
       end
 

data/lib/react_on_rails/react_component/options.rb

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

data/lib/react_on_rails/server_rendering_pool/exec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   module ServerRenderingPool
     # This implementation of the rendering pool uses ExecJS to execute javasript code
@@ -89,11 +91,13 @@ module ReactOnRails
           end
 
           bundle_js_code = File.read(server_js_file)
+          # rubocop:disable Layout/IndentHeredoc
           base_js_code = <<-JS
 #{console_polyfill}
           #{execjs_timer_polyfills}
           #{bundle_js_code};
           JS
+          # rubocop:enable Layout/IndentHeredoc
           file_name = "tmp/base_js_code.js"
           begin
             trace_messsage(base_js_code, file_name)
@@ -111,6 +115,7 @@ module ReactOnRails
         end
 
         def execjs_timer_polyfills
+          # rubocop:disable Layout/IndentHeredoc
           <<-JS
 function getStackTrace () {
   var stack;
@@ -136,6 +141,7 @@ function clearTimeout() {
   #{undefined_for_exec_js_logging('clearTimeout')}
 }
           JS
+          # rubocop:enable Layout/IndentHeredoc
         end
 
         def undefined_for_exec_js_logging(function_name)
@@ -150,6 +156,7 @@ function clearTimeout() {
 
         # Reimplement console methods for replaying on the client
         def console_polyfill
+          # rubocop:disable Layout/IndentHeredoc
           <<-JS
 var console = { history: [] };
 ['error', 'log', 'info', 'warn'].forEach(function (level) {
@@ -162,6 +169,7 @@ var console = { history: [] };
   };
 });
           JS
+          # rubocop:enable Layout/IndentHeredoc
         end
       end
     end

data/lib/react_on_rails/server_rendering_pool/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   module ServerRenderingPool
     class Node
@@ -51,7 +53,7 @@ module ReactOnRails
         end
 
         def eval_js(js_code)
-          eof_symbol = "\r\n\0".freeze
+          eof_symbol = "\r\n\0"
           max_int = (2**30 - 1)
           @js_context_pool.with do |js_context|
             js_context.send(js_code + eof_symbol, 0)

data/lib/react_on_rails/server_rendering_pool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "connection_pool"
 require_relative "server_rendering_pool/exec"
 require_relative "server_rendering_pool/node"

data/lib/react_on_rails/test_helper/ensure_assets_compiled.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   module TestHelper
     class EnsureAssetsCompiled
@@ -41,6 +43,7 @@ module ReactOnRails
       end
 
       def puts_start_compile_check_message(stale_files)
+        # rubocop:disable Layout/IndentHeredoc
         puts <<-MSG
 
 Detected the following stale generated files:
@@ -50,6 +53,7 @@ React on Rails will ensure your JavaScript generated files are up to date, using
 /client level package.json `#{ReactOnRails.configuration.npm_build_test_command}` command.
 
         MSG
+        # rubocop:enable Layout/IndentHeredoc
       end
     end
   end

data/lib/react_on_rails/test_helper/node_process_launcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ReactOnRails
   module TestHelper
     def self.launch_node

data/lib/react_on_rails/test_helper/webpack_assets_compiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # You can replace this implementation with your own for use by the
 # ReactOnRails::TestHelper.ensure_assets_compiled helper
 module ReactOnRails
@@ -6,9 +8,9 @@ module ReactOnRails
       def compile_assets
         puts "\nBuilding Webpack assets..."
 
-        build_output = `cd client && #{ReactOnRails.configuration.npm_build_test_command}`
+        cmd = "cd client && #{ReactOnRails.configuration.npm_build_test_command}"
 
-        raise "Error in building assets!\n#{build_output}" unless Utils.last_process_completed_successfully?
+        ReactOnRails::Utils.invoke_and_exit_if_failed(cmd, "Error in building webpack assets!")
 
         puts "Completed building Webpack assets."
       end