trailblazer-rails 2.1.1 → 2.1.2

data/lib/trailblazer/rails/railtie.rb

@@ -1,91 +1,30 @@
-require "rails/railtie"
-require "trailblazer/loader"
-
-module Trailblazer
-  class Railtie < ::Rails::Railtie
-    config.trailblazer = ActiveSupport::OrderedOptions.new
-    ## Accept also an Array of controllers
-    config.trailblazer.application_controller ||= 'ActionController::Base'
-    config.trailblazer.use_loader ||= true
-    config.trailblazer.enable_tracing ||= false
-
-    def self.load_concepts(app)
-      # Loader.new.(insert: [ModelFile, before: Loader::AddConceptFiles]) { |file| require_dependency("#{app.root}/#{file}") }
-      load_for(app)
-
-      engines.each { |engine| load_for(engine) }
-    end
-
-    def self.engines
-      if Gem::Version.new(::Rails.version) >= Gem::Version.new("4.1")
-        ::Rails.application.railties.find_all { |tie| tie.is_a?(::Rails::Engine) }
-      else
-        ::Rails.application.railties.engines
-      end
-    end
-
-    def self.load_for(app)
-      Loader.new.(prepend: AllModelFiles, root: app.root) { |file| require_dependency(file) }
-    end
-
-    # This is to autoload Operation::Dispatch, etc. I'm simply assuming people find this helpful in Rails.
-    initializer "trailblazer.library_autoloading" do
-    end
-
-    # thank you, http://stackoverflow.com/a/17573888/465070
-    initializer 'trailblazer.install', after: "reform.form_extensions" do |app|
-      # the trb autoloading has to be run after initializers have been loaded, so we can tweak inclusion of features in
-      # initializers.
-      if config.trailblazer.use_loader
-        reloader_class.to_prepare do
-          Trailblazer::Railtie.load_concepts(app)
-        end
-      end
-    end
-
-    initializer "trailblazer.application_controller", before: "finisher_hook" do
-      reloader_class.to_prepare do
-        ActiveSupport.on_load(:action_controller) do |app|
-          Trailblazer::Railtie.extend_application_controller!(app)
-        end
-      end
-    end
-
-    # Prepend model file, before the concept files like operation.rb get loaded.
-    ModelFile = ->(input, options) do
-      model = "app/models/#{options[:name]}.rb"
-      File.exist?(model) ? [model] + input : input
-    end
-
-    # Load all model files before any TRB files.
-    AllModelFiles = ->(input, options) do
-      Dir.glob("#{options[:root]}/app/models/**/*.rb").sort + input
-    end
-
-    private
-
-    def reloader_class
-      # Rails 5.0.0.rc1 says:
-      # DEPRECATION WARNING: to_prepare is deprecated and will be removed from Rails 5.1
-      # (use ActiveSupport::Reloader.to_prepare instead)
-      if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('5')
-        ActiveSupport::Reloader
-      else
-        ActionDispatch::Reloader
-      end
-    end
-
-    module ExtendApplicationController
-      def extend_application_controller!(app)
-        controllers = Array(::Rails.application.config.trailblazer.application_controller).map { |x| x.to_s }
-        if controllers.include? app.to_s
-          app.send :include, Trailblazer::Rails::Controller
-          app.send :include, Trailblazer::Rails::Controller::Cell if defined?(::Cell)
-        end
-        app
-      end
-    end
-
-    extend ExtendApplicationController
-  end
-end
+require "rails/railtie"
+require "trailblazer/loader"
+require "trailblazer/rails/railtie/extend_application_controller"
+require "trailblazer/rails/railtie/loader"
+
+module Trailblazer
+  class Railtie < ::Rails::Railtie
+    config.trailblazer = ActiveSupport::OrderedOptions.new
+    ## Accept also an Array of controllers
+    config.trailblazer.application_controller ||= 'ActionController::Base'
+    config.trailblazer.use_loader ||= true
+    config.trailblazer.enable_tracing ||= false
+
+    include Loader
+    include ExtendApplicationController
+
+    private
+
+    def reloader_class
+      # Rails 5.0.0.rc1 says:
+      # DEPRECATION WARNING: to_prepare is deprecated and will be removed from Rails 5.1
+      # (use ActiveSupport::Reloader.to_prepare instead)
+      if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('5')
+        ActiveSupport::Reloader
+      else
+        ActionDispatch::Reloader
+      end
+    end
+  end
+end

data/lib/trailblazer/rails/railtie/extend_application_controller.rb

@@ -0,0 +1,28 @@
+require 'active_support/concern'
+
+module Trailblazer
+  class Railtie < ::Rails::Railtie
+    module ExtendApplicationController
+      extend ActiveSupport::Concern
+
+      included do
+        initializer "trailblazer.application_controller", before: "finisher_hook" do
+          reloader_class.to_prepare do
+            ActiveSupport.on_load(:action_controller) do |app|
+              Trailblazer::Railtie.extend_application_controller!(app)
+            end
+          end
+        end
+
+        def extend_application_controller!(app)
+          controllers = Array(::Rails.application.config.trailblazer.application_controller).map { |x| x.to_s }
+          if controllers.include? app.to_s
+            app.send :include, Trailblazer::Rails::Controller
+            app.send :include, Trailblazer::Rails::Controller::Cell if defined?(::Cell)
+          end
+          app
+        end
+      end
+    end
+  end
+end

data/lib/trailblazer/rails/railtie/loader.rb

@@ -0,0 +1,56 @@
+require 'active_support/concern'
+
+module Trailblazer
+  class Railtie < ::Rails::Railtie
+    module Loader
+      extend ActiveSupport::Concern
+
+      included do
+        def self.load_concepts(app)
+        # Loader.new.(insert: [ModelFile, before: Loader::AddConceptFiles]) { |file| require_dependency("#{app.root}/#{file}") }
+          load_for(app)
+
+          engines.each { |engine| load_for(engine) }
+        end
+
+        def self.engines
+          if Gem::Version.new(::Rails.version) >= Gem::Version.new("4.1")
+            ::Rails.application.railties.find_all { |tie| tie.is_a?(::Rails::Engine) }
+          else
+            ::Rails.application.railties.engines
+          end
+        end
+
+        def self.load_for(app)
+          Trailblazer::Loader.new.(prepend: AllModelFiles, root: app.root) { |file| require_dependency(file) }
+        end
+
+        # Prepend model file, before the concept files like operation.rb get loaded.
+        ModelFile = ->(input, options) do
+          model = "app/models/#{options[:name]}.rb"
+          File.exist?(model) ? [model] + input : input
+        end
+
+        # Load all model files before any TRB files.
+        AllModelFiles = ->(input, options) do
+          Dir.glob("#{options[:root]}/app/models/**/*.rb").sort + input
+        end
+
+        # This is to autoload Operation::Dispatch, etc. I'm simply assuming people find this helpful in Rails.
+        initializer "trailblazer.library_autoloading" do
+        end
+
+        # thank you, http://stackoverflow.com/a/17573888/465070
+        initializer 'trailblazer.install', after: "reform.form_extensions" do |app|
+          # the trb autoloading has to be run after initializers have been loaded, so we can tweak inclusion of features in
+          # initializers.
+          if config.trailblazer.use_loader
+            reloader_class.to_prepare do
+              Trailblazer::Railtie.load_concepts(app)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trailblazer/rails/test/integration.rb

@@ -1,6 +1,6 @@
-require "minitest/rails/capybara" # loads Capybara, etc.
-
-module Trailblazer::Test
-  class Integration < Capybara::Rails::TestCase
-  end
-end
+require "minitest/rails/capybara" # loads Capybara, etc.
+
+module Trailblazer::Test
+  class Integration < Capybara::Rails::TestCase
+  end
+end

data/lib/trailblazer/rails/version.rb

@@ -1,5 +1,5 @@
-module Trailblazer
-  module Rails
-    VERSION = "2.1.1"
-  end
-end
+module Trailblazer
+  module Rails
+    VERSION = "2.1.2"
+  end
+end

data/trailblazer-rails.gemspec

@@ -1,27 +1,27 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'trailblazer/rails/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "trailblazer-rails"
-  spec.version       = Trailblazer::Rails::VERSION
-  spec.authors       = ["Nick Sutterer"]
-  spec.email         = ["apotonick@gmail.com"]
-
-  spec.summary       = %q{Convenient Rails support for Trailblazer.}
-  spec.homepage      = "http://trailblazer.to/gems/trailblazer/2.0/rails.html"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test)/}) }
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "trailblazer", ">= 2.1.0.beta1", "< 2.2.0"
-  spec.add_dependency "trailblazer-loader", ">= 0.1.0"
-  spec.add_dependency "reform-rails", ">= 0.1.4", "< 0.2.0"
-
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "rubocop"
-end
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'trailblazer/rails/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "trailblazer-rails"
+  spec.version       = Trailblazer::Rails::VERSION
+  spec.authors       = ["Nick Sutterer"]
+  spec.email         = ["apotonick@gmail.com"]
+
+  spec.summary       = %q{Convenient Rails support for Trailblazer.}
+  spec.homepage      = "http://trailblazer.to/gems/trailblazer/2.0/rails.html"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test)/}) }
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "trailblazer", ">= 2.1.0.beta1", "< 2.2.0"
+  spec.add_dependency "trailblazer-loader", ">= 0.1.0"
+  spec.add_dependency "reform-rails", ">= 0.1.4", "< 0.2.0"
+
+  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "rubocop"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer
@@ -144,6 +144,8 @@ files:
 - lib/trailblazer/rails/controller.rb
 - lib/trailblazer/rails/form.rb
 - lib/trailblazer/rails/railtie.rb
+- lib/trailblazer/rails/railtie/extend_application_controller.rb
+- lib/trailblazer/rails/railtie/loader.rb
 - lib/trailblazer/rails/test/integration.rb
 - lib/trailblazer/rails/version.rb
 - trailblazer-rails.gemspec
@@ -167,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Convenient Rails support for Trailblazer.