From a58514ecfa0d904abc22b6dde12492855f3358fb Mon Sep 17 00:00:00 2001 From: Kyle Lamy Date: Mon, 4 Jan 2016 10:56:33 -0700 Subject: [PATCH 1/3] Change hide! to the implementation to support rails 3.2 --- lib/generators/react_on_rails/base_generator.rb | 2 +- lib/generators/react_on_rails/bootstrap_generator.rb | 2 +- lib/generators/react_on_rails/dev_tests_generator.rb | 2 +- lib/generators/react_on_rails/heroku_deployment_generator.rb | 2 +- lib/generators/react_on_rails/js_linters_generator.rb | 2 +- lib/generators/react_on_rails/react_no_redux_generator.rb | 2 +- lib/generators/react_on_rails/react_with_redux_generator.rb | 2 +- lib/generators/react_on_rails/ruby_linters_generator.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/generators/react_on_rails/base_generator.rb b/lib/generators/react_on_rails/base_generator.rb index 995d7a6f4..ff7bc4f8a 100644 --- a/lib/generators/react_on_rails/base_generator.rb +++ b/lib/generators/react_on_rails/base_generator.rb @@ -6,7 +6,7 @@ module ReactOnRails module Generators class BaseGenerator < Rails::Generators::Base # rubocop:disable Metrics/ClassLength - hide! + Rails::Generators.hide_namespace self.namespace source_root(File.expand_path("../templates", __FILE__)) # --redux diff --git a/lib/generators/react_on_rails/bootstrap_generator.rb b/lib/generators/react_on_rails/bootstrap_generator.rb index bfc15b7b8..f3dd93db0 100644 --- a/lib/generators/react_on_rails/bootstrap_generator.rb +++ b/lib/generators/react_on_rails/bootstrap_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class BootstrapGenerator < Rails::Generators::Base - hide! + Rails::Generators.hide_namespace self.namespace source_root(File.expand_path("../templates", __FILE__)) def copy_bootstrap_files diff --git a/lib/generators/react_on_rails/dev_tests_generator.rb b/lib/generators/react_on_rails/dev_tests_generator.rb index b734c2ef1..16a12b406 100644 --- a/lib/generators/react_on_rails/dev_tests_generator.rb +++ b/lib/generators/react_on_rails/dev_tests_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class DevTestsGenerator < Rails::Generators::Base - hide! + Rails::Generators.hide_namespace self.namespace source_root(File.expand_path("../templates/dev_tests", __FILE__)) def copy_rspec_files diff --git a/lib/generators/react_on_rails/heroku_deployment_generator.rb b/lib/generators/react_on_rails/heroku_deployment_generator.rb index 994b92883..615a76271 100644 --- a/lib/generators/react_on_rails/heroku_deployment_generator.rb +++ b/lib/generators/react_on_rails/heroku_deployment_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class HerokuDeploymentGenerator < Rails::Generators::Base - hide! + Rails::Generators.hide_namespace self.namespace source_root(File.expand_path("../templates", __FILE__)) def copy_heroku_deployment_files diff --git a/lib/generators/react_on_rails/js_linters_generator.rb b/lib/generators/react_on_rails/js_linters_generator.rb index fc391cca1..c6da5bd2c 100644 --- a/lib/generators/react_on_rails/js_linters_generator.rb +++ b/lib/generators/react_on_rails/js_linters_generator.rb @@ -3,7 +3,7 @@ module ReactOnRails module Generators class JsLintersGenerator < Rails::Generators::Base - hide! + Rails::Generators.hide_namespace self.namespace source_root File.expand_path("../templates", __FILE__) # NOTE: linter modules are included via template in base/base/client/package.json.tt diff --git a/lib/generators/react_on_rails/react_no_redux_generator.rb b/lib/generators/react_on_rails/react_no_redux_generator.rb index e751d59e3..10298312b 100644 --- a/lib/generators/react_on_rails/react_no_redux_generator.rb +++ b/lib/generators/react_on_rails/react_no_redux_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class ReactNoReduxGenerator < Rails::Generators::Base - hide! + Rails::Generators.hide_namespace self.namespace source_root(File.expand_path("../templates", __FILE__)) # --server-rendering diff --git a/lib/generators/react_on_rails/react_with_redux_generator.rb b/lib/generators/react_on_rails/react_with_redux_generator.rb index d1d0bc5b2..8d82c416a 100644 --- a/lib/generators/react_on_rails/react_with_redux_generator.rb +++ b/lib/generators/react_on_rails/react_with_redux_generator.rb @@ -3,7 +3,7 @@ module ReactOnRails module Generators class ReactWithReduxGenerator < Rails::Generators::Base - hide! + Rails::Generators.hide_namespace self.namespace source_root(File.expand_path("../templates", __FILE__)) # --server-rendering diff --git a/lib/generators/react_on_rails/ruby_linters_generator.rb b/lib/generators/react_on_rails/ruby_linters_generator.rb index fe98ba924..ffcfa8892 100644 --- a/lib/generators/react_on_rails/ruby_linters_generator.rb +++ b/lib/generators/react_on_rails/ruby_linters_generator.rb @@ -3,7 +3,7 @@ module ReactOnRails module Generators class RubyLintersGenerator < Rails::Generators::Base - hide! + Rails::Generators.hide_namespace self.namespace source_root File.expand_path("../templates", __FILE__) def add_ruby_linter_gems_to_gemfile From 2ab00f823a3169b22b95f6a541f4b45358ee1e18 Mon Sep 17 00:00:00 2001 From: Kyle Lamy Date: Mon, 4 Jan 2016 15:50:17 -0700 Subject: [PATCH 2/3] Add parens for method call --- lib/generators/react_on_rails/base_generator.rb | 2 +- lib/generators/react_on_rails/bootstrap_generator.rb | 2 +- lib/generators/react_on_rails/dev_tests_generator.rb | 2 +- lib/generators/react_on_rails/heroku_deployment_generator.rb | 2 +- lib/generators/react_on_rails/js_linters_generator.rb | 2 +- lib/generators/react_on_rails/react_no_redux_generator.rb | 2 +- lib/generators/react_on_rails/react_with_redux_generator.rb | 2 +- lib/generators/react_on_rails/ruby_linters_generator.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/generators/react_on_rails/base_generator.rb b/lib/generators/react_on_rails/base_generator.rb index ff7bc4f8a..17cceb0b2 100644 --- a/lib/generators/react_on_rails/base_generator.rb +++ b/lib/generators/react_on_rails/base_generator.rb @@ -6,7 +6,7 @@ module ReactOnRails module Generators class BaseGenerator < Rails::Generators::Base # rubocop:disable Metrics/ClassLength - Rails::Generators.hide_namespace self.namespace + Rails::Generators.hide_namespace(self.namespace) source_root(File.expand_path("../templates", __FILE__)) # --redux diff --git a/lib/generators/react_on_rails/bootstrap_generator.rb b/lib/generators/react_on_rails/bootstrap_generator.rb index f3dd93db0..55d2f0c9e 100644 --- a/lib/generators/react_on_rails/bootstrap_generator.rb +++ b/lib/generators/react_on_rails/bootstrap_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class BootstrapGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace self.namespace + Rails::Generators.hide_namespace(self.namespace) source_root(File.expand_path("../templates", __FILE__)) def copy_bootstrap_files diff --git a/lib/generators/react_on_rails/dev_tests_generator.rb b/lib/generators/react_on_rails/dev_tests_generator.rb index 16a12b406..12e2da760 100644 --- a/lib/generators/react_on_rails/dev_tests_generator.rb +++ b/lib/generators/react_on_rails/dev_tests_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class DevTestsGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace self.namespace + Rails::Generators.hide_namespace(self.namespace) source_root(File.expand_path("../templates/dev_tests", __FILE__)) def copy_rspec_files diff --git a/lib/generators/react_on_rails/heroku_deployment_generator.rb b/lib/generators/react_on_rails/heroku_deployment_generator.rb index 615a76271..d59b6b3e4 100644 --- a/lib/generators/react_on_rails/heroku_deployment_generator.rb +++ b/lib/generators/react_on_rails/heroku_deployment_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class HerokuDeploymentGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace self.namespace + Rails::Generators.hide_namespace(self.namespace) source_root(File.expand_path("../templates", __FILE__)) def copy_heroku_deployment_files diff --git a/lib/generators/react_on_rails/js_linters_generator.rb b/lib/generators/react_on_rails/js_linters_generator.rb index c6da5bd2c..0a7acbb27 100644 --- a/lib/generators/react_on_rails/js_linters_generator.rb +++ b/lib/generators/react_on_rails/js_linters_generator.rb @@ -3,7 +3,7 @@ module ReactOnRails module Generators class JsLintersGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace self.namespace + Rails::Generators.hide_namespace(self.namespace) source_root File.expand_path("../templates", __FILE__) # NOTE: linter modules are included via template in base/base/client/package.json.tt diff --git a/lib/generators/react_on_rails/react_no_redux_generator.rb b/lib/generators/react_on_rails/react_no_redux_generator.rb index 10298312b..2ced5d873 100644 --- a/lib/generators/react_on_rails/react_no_redux_generator.rb +++ b/lib/generators/react_on_rails/react_no_redux_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class ReactNoReduxGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace self.namespace + Rails::Generators.hide_namespace(self.namespace) source_root(File.expand_path("../templates", __FILE__)) # --server-rendering diff --git a/lib/generators/react_on_rails/react_with_redux_generator.rb b/lib/generators/react_on_rails/react_with_redux_generator.rb index 8d82c416a..2d5d058bf 100644 --- a/lib/generators/react_on_rails/react_with_redux_generator.rb +++ b/lib/generators/react_on_rails/react_with_redux_generator.rb @@ -3,7 +3,7 @@ module ReactOnRails module Generators class ReactWithReduxGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace self.namespace + Rails::Generators.hide_namespace(self.namespace) source_root(File.expand_path("../templates", __FILE__)) # --server-rendering diff --git a/lib/generators/react_on_rails/ruby_linters_generator.rb b/lib/generators/react_on_rails/ruby_linters_generator.rb index ffcfa8892..c838cc1a0 100644 --- a/lib/generators/react_on_rails/ruby_linters_generator.rb +++ b/lib/generators/react_on_rails/ruby_linters_generator.rb @@ -3,7 +3,7 @@ module ReactOnRails module Generators class RubyLintersGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace self.namespace + Rails::Generators.hide_namespace(self.namespace) source_root File.expand_path("../templates", __FILE__) def add_ruby_linter_gems_to_gemfile From 0093f963956b144da1410e7633077480756325cd Mon Sep 17 00:00:00 2001 From: Kyle Lamy Date: Tue, 5 Jan 2016 09:43:07 -0700 Subject: [PATCH 3/3] Remove redundent self calls --- lib/generators/react_on_rails/base_generator.rb | 2 +- lib/generators/react_on_rails/bootstrap_generator.rb | 2 +- lib/generators/react_on_rails/dev_tests_generator.rb | 2 +- lib/generators/react_on_rails/heroku_deployment_generator.rb | 2 +- lib/generators/react_on_rails/js_linters_generator.rb | 2 +- lib/generators/react_on_rails/react_no_redux_generator.rb | 2 +- lib/generators/react_on_rails/react_with_redux_generator.rb | 2 +- lib/generators/react_on_rails/ruby_linters_generator.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/generators/react_on_rails/base_generator.rb b/lib/generators/react_on_rails/base_generator.rb index 17cceb0b2..bb89604c7 100644 --- a/lib/generators/react_on_rails/base_generator.rb +++ b/lib/generators/react_on_rails/base_generator.rb @@ -6,7 +6,7 @@ module ReactOnRails module Generators class BaseGenerator < Rails::Generators::Base # rubocop:disable Metrics/ClassLength - Rails::Generators.hide_namespace(self.namespace) + Rails::Generators.hide_namespace(namespace) source_root(File.expand_path("../templates", __FILE__)) # --redux diff --git a/lib/generators/react_on_rails/bootstrap_generator.rb b/lib/generators/react_on_rails/bootstrap_generator.rb index 55d2f0c9e..aa41467a2 100644 --- a/lib/generators/react_on_rails/bootstrap_generator.rb +++ b/lib/generators/react_on_rails/bootstrap_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class BootstrapGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace(self.namespace) + Rails::Generators.hide_namespace(namespace) source_root(File.expand_path("../templates", __FILE__)) def copy_bootstrap_files diff --git a/lib/generators/react_on_rails/dev_tests_generator.rb b/lib/generators/react_on_rails/dev_tests_generator.rb index 12e2da760..7882d3cf6 100644 --- a/lib/generators/react_on_rails/dev_tests_generator.rb +++ b/lib/generators/react_on_rails/dev_tests_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class DevTestsGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace(self.namespace) + Rails::Generators.hide_namespace(namespace) source_root(File.expand_path("../templates/dev_tests", __FILE__)) def copy_rspec_files diff --git a/lib/generators/react_on_rails/heroku_deployment_generator.rb b/lib/generators/react_on_rails/heroku_deployment_generator.rb index d59b6b3e4..28f1ccc73 100644 --- a/lib/generators/react_on_rails/heroku_deployment_generator.rb +++ b/lib/generators/react_on_rails/heroku_deployment_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class HerokuDeploymentGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace(self.namespace) + Rails::Generators.hide_namespace(namespace) source_root(File.expand_path("../templates", __FILE__)) def copy_heroku_deployment_files diff --git a/lib/generators/react_on_rails/js_linters_generator.rb b/lib/generators/react_on_rails/js_linters_generator.rb index 0a7acbb27..22b1a24d2 100644 --- a/lib/generators/react_on_rails/js_linters_generator.rb +++ b/lib/generators/react_on_rails/js_linters_generator.rb @@ -3,7 +3,7 @@ module ReactOnRails module Generators class JsLintersGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace(self.namespace) + Rails::Generators.hide_namespace(namespace) source_root File.expand_path("../templates", __FILE__) # NOTE: linter modules are included via template in base/base/client/package.json.tt diff --git a/lib/generators/react_on_rails/react_no_redux_generator.rb b/lib/generators/react_on_rails/react_no_redux_generator.rb index 2ced5d873..26aec4d42 100644 --- a/lib/generators/react_on_rails/react_no_redux_generator.rb +++ b/lib/generators/react_on_rails/react_no_redux_generator.rb @@ -5,7 +5,7 @@ module ReactOnRails module Generators class ReactNoReduxGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace(self.namespace) + Rails::Generators.hide_namespace(namespace) source_root(File.expand_path("../templates", __FILE__)) # --server-rendering diff --git a/lib/generators/react_on_rails/react_with_redux_generator.rb b/lib/generators/react_on_rails/react_with_redux_generator.rb index 2d5d058bf..de1a494ac 100644 --- a/lib/generators/react_on_rails/react_with_redux_generator.rb +++ b/lib/generators/react_on_rails/react_with_redux_generator.rb @@ -3,7 +3,7 @@ module ReactOnRails module Generators class ReactWithReduxGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace(self.namespace) + Rails::Generators.hide_namespace(namespace) source_root(File.expand_path("../templates", __FILE__)) # --server-rendering diff --git a/lib/generators/react_on_rails/ruby_linters_generator.rb b/lib/generators/react_on_rails/ruby_linters_generator.rb index c838cc1a0..857967654 100644 --- a/lib/generators/react_on_rails/ruby_linters_generator.rb +++ b/lib/generators/react_on_rails/ruby_linters_generator.rb @@ -3,7 +3,7 @@ module ReactOnRails module Generators class RubyLintersGenerator < Rails::Generators::Base - Rails::Generators.hide_namespace(self.namespace) + Rails::Generators.hide_namespace(namespace) source_root File.expand_path("../templates", __FILE__) def add_ruby_linter_gems_to_gemfile