trailblazer-rails 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75dc8012bc26b4744c1e9d9bbbac1a9c48bb2dfbb2a2fcc3666cb90dbf5bb98c
-  data.tar.gz: 448a1646c41e7b061a75466201fd2dfc39a792952ef57c71d744854bafe7b894
+  metadata.gz: db779c924f25b07c73639fafabed8bb50358d608d4b431ae4442bcd41a8e9ac2
+  data.tar.gz: c8638b5f985eee0365c133a67b78fdc27573ce3e73ce05e905e7ad3ae2773d28
 SHA512:
-  metadata.gz: 4d6b74c528958964c57ec7a01d071f46800ac6788419be2c968901132a3acd7a7baac93df43d86913bca100072b213280761b94c0733deaf414649ced759d827
-  data.tar.gz: f2cc72a1e83d51bdb5045fb5cfd4a6fde0b9fb6b7e9312b2eb96bcc3058aa815a475d10958828b5291a8e252d1e3ee9ac30dcb72d49d2ac0aa6d7fb347e55a62
+  metadata.gz: bc3da31ae65846ddd42e9127f9825e02698ecb5df8759ba9faa797cca1ed2d95d71748e13877b26f2d5da9075954ccb2126aee8400188a37b3f1b94fe9b1bee5
+  data.tar.gz: ee91cb041f488ab42032a7be71592767be0a00d0827b0797483ddff2e8bf57785871a6d032846e59852aa68dccba2bb6cd7b238939535d3ff17572c4bff1d1a6

data/.gitignore

@@ -1,12 +1,12 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-test/**/*.log
-test/**/db/*.sqlite3
-test/**/Gemfile.lock
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+test/**/*.log
+test/**/db/*.sqlite3
+test/**/Gemfile.lock

data/.rubocop-https---raw-githubusercontent-com-trailblazer-meta-master-rubocop-yml

@@ -0,0 +1,101 @@
+AllCops:
+  DisplayCopNames: true
+Layout/CaseIndentation:
+  IndentOneStep: true
+Layout/FirstArrayElementLineBreak:
+  Enabled: true
+Layout/FirstHashElementLineBreak:
+  Enabled: true
+Layout/FirstMethodArgumentLineBreak:
+  Enabled: true
+Layout/FirstMethodParameterLineBreak:
+  Enabled: true
+Layout/MultilineAssignmentLayout:
+  Enabled: true
+  EnforcedStyle: same_line
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+Metrics/LineLength:
+  Max: 130
+Metrics/ParameterLists:
+  Max: 5
+Naming/VariableNumber:
+  EnforcedStyle: snake_case
+Style/AndOr:
+  EnforcedStyle: conditionals
+Style/AutoResourceCleanup:
+  Enabled: true
+Style/CollectionMethods:
+  Enabled: true
+Style/Documentation:
+  Enabled: false
+Style/EmptyLiteral:
+  Enabled: false
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+Style/FormatStringToken:
+  EnforcedStyle: template
+Style/ImplicitRuntimeError:
+  Enabled: true
+Style/MethodCalledOnDoEndBlock:
+  Enabled: true
+Style/MethodDefParentheses:
+  EnforcedStyle: require_parentheses
+Style/MissingElse:
+  Enabled: true
+  EnforcedStyle: case
+Style/NumericLiterals:
+  Enabled: false
+Style/OptionHash:
+  Enabled: true
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    "%w": "[]"
+    "%W": "[]"
+    "%i": "[]"
+    "%I": "[]"
+    "%r": "()"
+Style/ReturnNil:
+  Enabled: true
+Style/SafeNavigation:
+  Enabled: false
+Style/Send:
+  Enabled: true
+Style/SignalException:
+  EnforcedStyle: semantic
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+Style/StringMethods:
+  Enabled: true
+Style/SymbolArray:
+  Enabled: true
+# this allows in rspec to have expect { } with multiple lines
+Style/BlockDelimiters:
+  EnforcedStyle: braces_for_chaining
+Layout/EndOfLine:
+  Enabled: false
+# don't need these checks in test folders
+Metrics/ModuleLength:
+  Exclude:
+    - "spec/**/*"
+    - "test/**/*"
+Metrics/BlockLength:
+  Exclude:
+    - "spec/**/*"
+    - "test/**/*"
+    - "*.gemspec" # definitely not in the gemspec
+Metrics/MethodLength:
+  Max: 20
+Lint/UnreachableCode:
+  Description: 'Unreachable code.'
+  Enabled: false
+Lint/Void:
+  Enabled: false
+Layout/AlignHash:
+  EnforcedLastArgumentHashStyle: ignore_implicit
+Metrics/AbcSize:
+  Max: 25
+Style/LambdaCall:
+  Enabled: false

data/.rubocop.yml

@@ -0,0 +1,11 @@
+inherit_from:
+  - https://raw.githubusercontent.com/trailblazer/meta/master/rubocop.yml
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/Send:
+  Enabled: false

data/.travis.yml

@@ -1,17 +1,22 @@
-language: ruby
-matrix:
-  include:
-  - rvm: 2.3.1
-    env: TEST_SUITE=rails4.2
-    gemfile: test/rails4.2/Gemfile
-  - rvm: 2.4.1
-    env: TEST_SUITE=rails5.0
-    gemfile: test/rails5.0/Gemfile
-  - rvm: 2.4.1
-    env: TEST_SUITE=rails5.1
-    gemfile: test/rails5.1/Gemfile
-  - rvm: 2.5.1
-    env: TEST_SUITE=rails5.2
-    gemfile: test/rails5.2/Gemfile
-
-script: cd test/$TEST_SUITE &&  bundle install && bundle exec rake test
+sudo: false
+language: ruby
+cache: bundler
+matrix:
+  include:
+  - rvm: 2.4.1
+    env: TEST_SUITE=rails4.2
+    gemfile: test/rails4.2/Gemfile
+
+  - rvm: 2.4.1
+    env: TEST_SUITE=rails5.0
+    gemfile: test/rails5.0/Gemfile
+
+  - rvm: 2.4.1
+    env: TEST_SUITE=rails5.1
+    gemfile: test/rails5.1/Gemfile
+
+  - rvm: 2.5.1
+    env: TEST_SUITE=rails5.2
+    gemfile: test/rails5.2/Gemfile
+
+script: cd test/$TEST_SUITE && bundle install && bundle exec rake test

data/CHANGES.md

@@ -1,111 +1,116 @@
-# 1.0.9
-
-* `Trailblazer::Rails::Railtie` divided in 2 modules:
-  * `Loader` -> require_dependecy `concepts`
-  * `ExtendApplicationController` -> include `run` and `render` in controllers
-* Remove Gemfile.lock in the test folders to make travis CI to work
-
-# 1.0.8
-
-* Fixed Circular dependency detected in rails 5.2
-
-# 1.0.7
-
-* Fixed typo error in use_loader config flag
-
-# 1.0.6 (revoked)
-
-* Introduce use_loader config flag
-
-# 1.0.5
-
-* Hook trailblazer application_controller initializer to finisher_hook
-
-# 1.0.4
-
-* Make `Railtie::extend_application_controller!` overwriteable via a module.
-
-# 1.0.3
-
-* Return the computed application controller constant from `Railtie::extend_application_controller!` to make `compat` code simpler.
-
-# 1.0.2
-
-* Allow configuring `ApplicationController` constant via `config.trailblazer.application_controller`.
-
-# 1.0.1
-
-* Allow using this gem without `cells,` by loading cells support only when the `cells` gem got detected. Thanks to @promisedlandt.
-
-# 1.0.0
-
-* Runs only with >= Trailblazer 2.0.0.
-* Removed `Controller#form`, `#present` and `#respond`. The latter is now [replaced with `Endpoint`](https://github.com/trailblazer/trailblazer-endpoint/). The only operation trigger is `Controller#run`.
-* Added support for explicit `render cell(Artist::Cell::Index, model)`.
-* Autoloading got replaced with explicit requires.
-
-# 0.4.0
-
-* Better engines support.
-* Fix `Responder#errors` by simply removing it and letting `Operation#errors` return the contract errors.
-
-# 0.3.2
-
-* Make it work with Rails 3.x, again.
-
-# 0.3.1
-
-* Fix loading of `reform-rails`.
-
-# 0.3.0
-
-* Require `reform-rails` as a static dependency. This simplifies the user's setup significantly.
-* Run the `Railtie` after `reform.form_extensions` and allow reform-rails to do its setup work, then load concepts.
-
-# 0.2.4
-
-* Require `trailblazer-loader-0.0.7`.
-* Fix sorting, model files are now always required first.
-* Manually include `Operation::Controller` in `ApplicationController` for every reload.
-
-# 0.2.3
-
-* Bump to `trailblazer-loader` 0.0.4.
-
-# 0.2.2
-
-* Remove cells loading code, this happens via trailblazer-loader now.
-* We now load the concept's model file if it exists.
-
-# 0.2.1
-
-* Require `trailblazer-loader`.
-
-# 0.2.0
-
-* Use `trailblazer-loader` for loading operations and associated files, now. Note that `operations.rb` now is `operation.rb` (hence the minor bump).
-* The `Operation::Controller` module is not included into `ApplicationController` automatically.
-* Added `Trailblazer::Test::Integration`.
-
-# 0.1.6
-
-* Fix `Controller#run`, which now returns the operation instance instead of the `Else` object.
-
-# 0.1.5
-
-* Treat all requests as `params` requests unless the operation has a representer mixed in. If you don't want that, you can override using `is_document: false`. This appears to be the smoothest solution for all. Thanks to @Scharrels for discussion.
-* In `Controller#form`, the options argument is now passed into `form.prepopulate!(options)`. This allows to use arbitrary options and the `options[:params]` for prepopulation. Thanks @sauy7 for discussion.
-
-# 0.1.4
-
-* Treat `:js` requests as non-document, too.
-* `Controller#form` now returns the form object and not the operation.
-* In `Controller`, `#form`, `#present`, `#run` and `#respond` now all have the same API: `run(constant, options)`. If you want to pass a custom params hash, use `run Comment::Create, params: {..}`.
-
-# 0.1.3
-
-* `Operation::contract` works properly with `Operation::ActiveModel` mixed in.
-
-# 0.1.2
-
-* First version running with Trailblazer 1.0.0.
+# 1.0.10
+
+* Reintroduced railtie dependency 4.x +
+* Config flag use_loader renamed with enable_loader
+
+# 1.0.9
+
+* `Trailblazer::Rails::Railtie` divided in 2 modules:
+  * `Loader` -> require_dependecy `concepts`
+  * `ExtendApplicationController` -> include `run` and `render` in controllers
+* Remove Gemfile.lock in the test folders to make travis CI to work
+
+# 1.0.8
+
+* Fixed Circular dependency detected in rails 5.2
+
+# 1.0.7
+
+* Fixed typo error in use_loader config flag
+
+# 1.0.6 (revoked)
+
+* Introduce use_loader config flag
+
+# 1.0.5
+
+* Hook trailblazer application_controller initializer to finisher_hook
+
+# 1.0.4
+
+* Make `Railtie::extend_application_controller!` overwriteable via a module.
+
+# 1.0.3
+
+* Return the computed application controller constant from `Railtie::extend_application_controller!` to make `compat` code simpler.
+
+# 1.0.2
+
+* Allow configuring `ApplicationController` constant via `config.trailblazer.application_controller`.
+
+# 1.0.1
+
+* Allow using this gem without `cells,` by loading cells support only when the `cells` gem got detected. Thanks to @promisedlandt.
+
+# 1.0.0
+
+* Runs only with >= Trailblazer 2.0.0.
+* Removed `Controller#form`, `#present` and `#respond`. The latter is now [replaced with `Endpoint`](https://github.com/trailblazer/trailblazer-endpoint/). The only operation trigger is `Controller#run`.
+* Added support for explicit `render cell(Artist::Cell::Index, model)`.
+* Autoloading got replaced with explicit requires.
+
+# 0.4.0
+
+* Better engines support.
+* Fix `Responder#errors` by simply removing it and letting `Operation#errors` return the contract errors.
+
+# 0.3.2
+
+* Make it work with Rails 3.x, again.
+
+# 0.3.1
+
+* Fix loading of `reform-rails`.
+
+# 0.3.0
+
+* Require `reform-rails` as a static dependency. This simplifies the user's setup significantly.
+* Run the `Railtie` after `reform.form_extensions` and allow reform-rails to do its setup work, then load concepts.
+
+# 0.2.4
+
+* Require `trailblazer-loader-0.0.7`.
+* Fix sorting, model files are now always required first.
+* Manually include `Operation::Controller` in `ApplicationController` for every reload.
+
+# 0.2.3
+
+* Bump to `trailblazer-loader` 0.0.4.
+
+# 0.2.2
+
+* Remove cells loading code, this happens via trailblazer-loader now.
+* We now load the concept's model file if it exists.
+
+# 0.2.1
+
+* Require `trailblazer-loader`.
+
+# 0.2.0
+
+* Use `trailblazer-loader` for loading operations and associated files, now. Note that `operations.rb` now is `operation.rb` (hence the minor bump).
+* The `Operation::Controller` module is not included into `ApplicationController` automatically.
+* Added `Trailblazer::Test::Integration`.
+
+# 0.1.6
+
+* Fix `Controller#run`, which now returns the operation instance instead of the `Else` object.
+
+# 0.1.5
+
+* Treat all requests as `params` requests unless the operation has a representer mixed in. If you don't want that, you can override using `is_document: false`. This appears to be the smoothest solution for all. Thanks to @Scharrels for discussion.
+* In `Controller#form`, the options argument is now passed into `form.prepopulate!(options)`. This allows to use arbitrary options and the `options[:params]` for prepopulation. Thanks @sauy7 for discussion.
+
+# 0.1.4
+
+* Treat `:js` requests as non-document, too.
+* `Controller#form` now returns the form object and not the operation.
+* In `Controller`, `#form`, `#present`, `#run` and `#respond` now all have the same API: `run(constant, options)`. If you want to pass a custom params hash, use `run Comment::Create, params: {..}`.
+
+# 0.1.3
+
+* `Operation::contract` works properly with `Operation::ActiveModel` mixed in.
+
+# 0.1.2
+
+* First version running with Trailblazer 1.0.0.

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Nick Sutterer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2015 Nick Sutterer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,34 +1,34 @@
-# Trailblazer::Rails
-
-*Trailblazer in your Rails controllers.*
-
-[![Gitter Chat](https://badges.gitter.im/trailblazer/chat.svg)](https://gitter.im/trailblazer/chat)
-[![TRB Newsletter](https://img.shields.io/badge/TRB-newsletter-lightgrey.svg)](http://trailblazer.to/newsletter/)
-[![Build
-Status](https://travis-ci.org/trailblazer/trailblazer-rails.svg)](https://travis-ci.org/trailblazer/trailblazer-rails)
-[![Gem Version](https://badge.fury.io/rb/trailblazer-rails.svg)](http://badge.fury.io/rb/cells)
-
-## Overview
-
-`trailblazer-rails` helps you with the following.
-
-* Running operations in your controller actions.
-* Minimalistic integration tests ("smoke tests") to test controller/operation wiring.
-* Rendering cells instead of an ActionView in a controller action.
-
-Please refer to the [full documentation for more](http://trailblazer.to/gems/trailblazer/2.0/rails.html).
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'trailblazer-rails'
-```
-
-Note that the 1.x version only runs with TRB >= 2.0.0.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
+# Trailblazer::Rails
+
+*Trailblazer in your Rails controllers.*
+
+[![Gitter Chat](https://badges.gitter.im/trailblazer/chat.svg)](https://gitter.im/trailblazer/chat)
+[![TRB Newsletter](https://img.shields.io/badge/TRB-newsletter-lightgrey.svg)](http://trailblazer.to/newsletter/)
+[![Build
+Status](https://travis-ci.org/trailblazer/trailblazer-rails.svg)](https://travis-ci.org/trailblazer/trailblazer-rails)
+[![Gem Version](https://badge.fury.io/rb/trailblazer-rails.svg)](http://badge.fury.io/rb/cells)
+
+## Overview
+
+`trailblazer-rails` helps you with the following.
+
+* Running operations in your controller actions.
+* Minimalistic integration tests ("smoke tests") to test controller/operation wiring.
+* Rendering cells instead of an ActionView in a controller action.
+
+Please refer to the [full documentation for more](http://trailblazer.to/gems/trailblazer/2.0/rails.html).
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'trailblazer-rails'
+```
+
+Note that the 1.x version only runs with TRB >= 2.0.0.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/lib/trailblazer/rails/cell.rb

@@ -1,21 +1,22 @@
-module Trailblazer::Rails::Controller::Cell
-  private
-
-  module Render
-    def render(cell=nil, options={}, *, &block)
-      return super unless cell.kind_of?(::Cell::ViewModel)
-      render_cell(cell, options)
-    end
-
-    def render_cell(cell, options)
-      options = options.reverse_merge(layout: true)
-
-      # render the cell.
-      content = cell.()
-
-      render( { html: content }.merge(options) )
-    end
-  end
-
-  include Render
-end
+module Trailblazer::Rails::Controller::Cell
+  private # rubocop:disable Lint/UselessAccessModifier
+
+  module Render
+    def render(cell = nil, options = {}, *, &block)
+      return super unless cell.kind_of?(::Cell::ViewModel) # rubocop:disable Style/ClassCheck
+
+      render_cell(cell, options)
+    end
+
+    def render_cell(cell, options)
+      options = options.reverse_merge(layout: true)
+
+      # render the cell.
+      content = cell.()
+
+      render({html: content}.merge(options))
+    end
+  end
+
+  include Render
+end

data/lib/trailblazer/rails/controller.rb

@@ -1,43 +1,52 @@
-module Trailblazer::Rails
-  module Controller
-    def run(operation, params=self.params, *dependencies)
-      result = operation.(
-        _run_params(params),
-        *_run_runtime_options(*dependencies)
-      )
-
-      @form  = Trailblazer::Rails::Form.new(result["contract.default"], result["model"].class)
-      @model = result["model"]
-
-      yield(result) if result.success? && block_given?
-
-      @_result = result
-    end
-
-  private
-    # Override to tweak params. Not recommended.
-    # Use a deserializer instead.
-    def _run_params(params)
-      params
-    end
-
-    # This is where we can inject Dry.RB containers and the like via dependencies.
-    def _run_runtime_options(options={}, *dependencies)
-      [_run_options(options), *dependencies]
-    end
-
-    # Override this to inject dependencies such as "current_user"
-    # into the runtime options.
-    def _run_options(options)
-      options
-    end
-
-    module Result
-      def result
-        @_result
-      end
-    end
-
-    include Result
-  end
-end
+module Trailblazer::Rails
+  module Controller
+    def run(operation, params = self.params, *dependencies)
+      result = operation.(
+        _run_params(params),
+        *_run_runtime_options(*dependencies)
+      )
+
+      _assign_trb_ivars(result)
+
+      yield(result) if result.success? && block_given?
+
+      @_result = result
+    end
+
+    private
+
+    # Override to tweak params. Not recommended.
+    # Use a deserializer instead.
+    def _run_params(params)
+      params
+    end
+
+    # This is where we can inject Dry.RB containers and the like via dependencies.
+    def _run_runtime_options(options = {}, *dependencies)
+      [_run_options(options), *dependencies]
+    end
+
+    # Override this to inject dependencies such as "current_user"
+    # into the runtime options.
+    def _run_options(options)
+      options
+    end
+
+    def _assign_trb_ivars(result)
+      @model = result["model"]
+      @form  = _wrap_with_trb_form(result["contract.default"], @model.class)
+    end
+
+    def _wrap_with_trb_form(form, model)
+      Trailblazer::Rails::Form.new(form, model)
+    end
+
+    module Result
+      def result
+        @_result
+      end
+    end
+
+    include Result
+  end
+end

data/lib/trailblazer/rails/railtie.rb

@@ -1,29 +1,30 @@
-require "rails/railtie"
-require "trailblazer/loader"
-require "trailblazer/rails/railtie/loader"
-require "trailblazer/rails/railtie/extend_application_controller"
-
-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
-
-    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
+require "rails/railtie"
+require "trailblazer/loader"
+require "trailblazer/rails/railtie/loader"
+require "trailblazer/rails/railtie/extend_application_controller"
+
+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.enable_loader ||= true
+    config.trailblazer.use_loader ||= true # TODO: remove with next release
+
+    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

@@ -1,28 +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 |app|
-          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
+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(&: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

@@ -1,56 +1,63 @@
-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
+require "active_support/concern"
+
+module Trailblazer
+  class Railtie < ::Rails::Railtie
+    module Loader
+      extend ActiveSupport::Concern
+
+      included do # rubocop:disable Metrics/BlockLength
+        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.select { |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 = lambda do |input, options|
+          model = "app/models/#{options[:name]}.rb"
+          File.exist?(model) ? [model] + input : input
+        end
+
+        # Load all model files before any TRB files.
+        AllModelFiles = lambda do |input, options|
+          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.
+
+          # TODO: remove me in the next version!
+          if config.trailblazer.use_loader.to_s.present?
+            warn "DEPRECATION WARNING [trailblazer-rails]: please use config.trailblazer.enable_loader" \
+                 " to enable/disable the loader. config.trailblazer.use_loader will be removed from version > 2.1.6"
+          end
+
+          if config.trailblazer.enable_loader || 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 = "1.0.9"
-  end
-end
+module Trailblazer
+  module Rails
+    VERSION = "1.0.10".freeze
+  end
+end

data/trailblazer-rails.gemspec

@@ -1,31 +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|features)/}) }
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "trailblazer", "~> 2.0.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 "actionpack", '>= 3.0.0' # Rails is optional.
-  spec.add_development_dependency "sqlite3"
-  # spec.add_development_dependency "responders"
-
-  spec.add_development_dependency "multi_json"
-end
+lib = File.expand_path('lib', __dir__)
+$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       = "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|features)/}) }
+  spec.executables   = spec.files.grep(%r(^exe/)) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "railties", '>= 4.0.0'
+  spec.add_dependency "trailblazer", "~> 2.0.0"
+  spec.add_dependency "trailblazer-loader", ">= 0.1.0"
+
+  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rubocop"
+end

metadata

@@ -1,63 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trailblazer
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: trailblazer-loader
+  name: trailblazer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: reform-rails
+  name: trailblazer-loader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -101,35 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,6 +116,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop-https---raw-githubusercontent-com-trailblazer-meta-master-rubocop-yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
@@ -167,7 +135,6 @@ files:
 - lib/trailblazer/rails/railtie/loader.rb
 - lib/trailblazer/rails/test/integration.rb
 - lib/trailblazer/rails/version.rb
-- trailblazer-rails-2.1.4.gem
 - trailblazer-rails.gemspec
 homepage: http://trailblazer.to/gems/trailblazer/2.0/rails.html
 licenses:
@@ -189,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Convenient Rails support for Trailblazer.