trailblazer-rails 2.3.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e43931b1874b64a31a8a64c738d6568a213c3fa4d796f4dd28d93b894f3c928a
-  data.tar.gz: d51bde81af75fcd5fead6b78a2e27b1caddbd1e0b86bf575a139784fd92bd306
+  metadata.gz: 9faf7799e32876341a5879295f057abdfd07e604d6514dffea13ae45e32a927e
+  data.tar.gz: c2798545a46b91da97399c51d1958f425c3d14aaf5c76f996fba153be18cd486
 SHA512:
-  metadata.gz: 430cc9f51fe61f924a9d82581ddbcd00343a7b70956e85f82da8cd4a31577e95533f887ab13889a947982957ccebdcca31e1402414886dcb1c5e775ab0fe8421
-  data.tar.gz: 65c5490e4030fb7638e3cab85d3d7e1a1f7a320e85f5f84cf884f622ce945b86738e34819b835bf883801afe09bb7773aa33d4a399d0a9e5db62d6cd6addb700
+  metadata.gz: 3b2b1685d78a0b221fb6631187bbf07723d03716202dffebf0d4affeb9b753bdb133f506280c9294143eec94d028045985a7ed395d5b1c2d530ea64a0648abed
+  data.tar.gz: 20ac39cc9d69742d70590b201ce2d66a11d40fcbe2ad68f11aa9b297fa9fc5b5ed995761b00d6f5c0b1d2ca0618089c7721ade8de6cab4c8a9942d602be8cbfb

data/Appraisals

@@ -7,8 +7,9 @@ appraise "rails-6.1" do
     gem "activerecord", "~> 6.1.0"
 end
 appraise "rails-7.0" do
-    gem "actionpack", "~> 7.0.0.rc1"
-    gem "activerecord", "~> 7.0.0.rc1"
+    gem "actionpack", "~> 7.0.0"
+    gem "activerecord", "~> 7.0.0"
+    gem "sqlite3", "~> 1.4.0"
 end
 
 appraise "rails-5.2" do

data/CHANGES.md

@@ -1,3 +1,15 @@
+# 2.4.2
+
+* Fix a bug where `Controller#run` wouldn't return the ctx.
+
+# 2.4.1
+
+* Pass keyword arguments to the success result block.
+
+# 2.4.0
+* Remove legacy code belonging to the old `trailblazer-loader` gem.
+* Use ActionController::API in addition to ActionController::Base to add the `run` method.
+
 # 2.3.0
 * Remove loader support (no longer needed as zeitwerk is now a better alternative)
 

data/README.md

@@ -36,6 +36,16 @@ Note that the 2.x version only runs with TRB >= 2.1.0.
 * `config.trailblazer.enable_loader = false` to disable Trailblazer loader (default TRUE)
 * `config.trailblazer.enable_tracing = true` to enable tracing when using `run` (default FALSE)
 
+## Testing
+
+If you feel like contributing, you can run the test suite per Rails version as follows.
+
+```
+$ BUNDLE_GEMFILE=gemfiles/rails_7.0.gemfile bundle exec rake db:create db:schema:load test
+```
+
+Successful merges will be rewarded with at least one beer!
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/TESTING.md

@@ -0,0 +1,9 @@
+Trailblazer-Rails supports rails 5.2.0 and up.
+
+To run the tests, you need to have the run the following command:
+```
+bundle install
+bundle exec appraisal install # This will install the different version of rails
+bundle exec appraisal rake db:create db:schema:load test # Run tests in all versions
+bundle exec appraisal rails-7.0 rake db:create db:schema:load test # Run tests in rails 7.0 only
+```

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    trailblazer-rails (2.3.0)
+    trailblazer-rails (2.4.1)
       railties (>= 5.2.0)
       trailblazer (>= 2.1.0, < 2.2.0)
 
@@ -87,6 +87,8 @@ GEM
       capybara
       minitest (~> 5.0)
       rake
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     public_suffix (4.0.6)
@@ -160,6 +162,8 @@ GEM
       nokogiri (~> 1.8)
 
 PLATFORMS
+  x86_64-darwin-19
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -180,4 +184,4 @@ DEPENDENCIES
   trailblazer-rails!
 
 BUNDLED WITH
-   2.2.22
+   2.3.11

data/gemfiles/rails_6.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    trailblazer-rails (2.3.0)
+    trailblazer-rails (2.4.1)
       railties (>= 5.2.0)
       trailblazer (>= 2.1.0, < 2.2.0)
 
@@ -86,6 +86,8 @@ GEM
       capybara
       minitest (~> 5.0)
       rake
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     public_suffix (4.0.6)
@@ -160,6 +162,8 @@ GEM
     zeitwerk (2.5.1)
 
 PLATFORMS
+  x86_64-darwin-19
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -180,4 +184,4 @@ DEPENDENCIES
   trailblazer-rails!
 
 BUNDLED WITH
-   2.2.22
+   2.3.11

data/gemfiles/rails_6.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    trailblazer-rails (2.3.0)
+    trailblazer-rails (2.4.1)
       railties (>= 5.2.0)
       trailblazer (>= 2.1.0, < 2.2.0)
 
@@ -86,6 +86,8 @@ GEM
       capybara
       minitest (~> 5.0)
       rake
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     public_suffix (4.0.6)
@@ -159,6 +161,8 @@ GEM
     zeitwerk (2.5.1)
 
 PLATFORMS
+  x86_64-darwin-19
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -179,4 +183,4 @@ DEPENDENCIES
   trailblazer-rails!
 
 BUNDLED WITH
-   2.2.22
+   2.3.11

data/gemfiles/rails_7.0.gemfile

@@ -8,10 +8,10 @@ gem "reform-rails"
 gem "trailblazer"
 gem "trailblazer-cells"
 gem "trailblazer-loader"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4.0"
 gem "minitest-capybara"
 gem "appraisal"
-gem "actionpack", "~> 7.0.0.rc1"
-gem "activerecord", "~> 7.0.0.rc1"
+gem "actionpack", "~> 7.0.0"
+gem "activerecord", "~> 7.0.0"
 
 gemspec path: "../"

data/gemfiles/rails_7.0.gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: ..
   specs:
-    trailblazer-rails (2.3.0)
+    trailblazer-rails (2.4.1)
       railties (>= 5.2.0)
       trailblazer (>= 2.1.0, < 2.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.0.rc1)
-      actionview (= 7.0.0.rc1)
-      activesupport (= 7.0.0.rc1)
+    actionpack (7.0.3)
+      actionview (= 7.0.3)
+      activesupport (= 7.0.3)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.0.rc1)
-      activesupport (= 7.0.0.rc1)
+    actionview (7.0.3)
+      activesupport (= 7.0.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.0.rc1)
-      activesupport (= 7.0.0.rc1)
-    activerecord (7.0.0.rc1)
-      activemodel (= 7.0.0.rc1)
-      activesupport (= 7.0.0.rc1)
-    activesupport (7.0.0.rc1)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -38,7 +38,7 @@ GEM
       rake
       thor (>= 0.14.0)
     builder (3.2.4)
-    capybara (3.36.0)
+    capybara (3.37.1)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -55,10 +55,10 @@ GEM
     cells-erb (0.1.0)
       cells (~> 4.0)
       erbse (>= 0.1.1)
-    cells-rails (0.1.4)
+    cells-rails (0.1.5)
       actionpack (>= 5.0)
       cells (>= 4.1.6, < 5.0.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     declarative (0.0.20)
     declarative-builder (0.1.0)
@@ -72,22 +72,24 @@ GEM
     erubi (1.10.0)
     hashie (5.0.0)
     hirb (0.7.3)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.12.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.14.4)
+    minitest (5.15.0)
     minitest-capybara (0.9.0)
       capybara
       minitest (~> 5.0)
       rake
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.13.6-x86_64-darwin)
       racc (~> 1.4)
-    public_suffix (4.0.6)
+    nokogiri (1.13.6-x86_64-linux)
+      racc (~> 1.4)
+    public_suffix (4.0.7)
     racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
@@ -97,9 +99,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (7.0.0.rc1)
-      actionpack (= 7.0.0.rc1)
-      activesupport (= 7.0.0.rc1)
+    railties (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -112,40 +114,39 @@ GEM
     reform-rails (0.2.3)
       activemodel (>= 5.0)
       reform (>= 2.3.1, < 3.0.0)
-    regexp_parser (2.2.0)
+    regexp_parser (2.4.0)
     representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     sqlite3 (1.4.2)
     temple (0.8.2)
-    thor (1.1.0)
+    thor (1.2.1)
     tilt (2.0.10)
     trailblazer (2.1.0)
       trailblazer-macro (>= 2.1.0, < 2.2.0)
       trailblazer-macro-contract (>= 2.1.0, < 2.2.0)
       trailblazer-operation
-    trailblazer-activity (0.12.2)
+    trailblazer-activity (0.13.0)
       trailblazer-context (~> 0.5.0)
       trailblazer-option (~> 0.1.0)
-    trailblazer-activity-dsl-linear (0.4.3)
-      trailblazer-activity (>= 0.12.2, < 0.13.0)
+    trailblazer-activity-dsl-linear (0.5.0)
+      trailblazer-activity (>= 0.13.0, < 1.0.0)
     trailblazer-cells (0.0.3)
       cells (>= 4.1.0.rc1, < 5.0.0)
     trailblazer-context (0.5.0)
       hashie (>= 3.0.0)
-    trailblazer-developer (0.0.22)
+    trailblazer-developer (0.0.23)
       hirb
-      representable (>= 3.1.1, < 4.0.0)
       trailblazer-activity (>= 0.12.2, < 1.0.0)
       trailblazer-activity-dsl-linear (>= 0.4.1, < 1.0.0)
     trailblazer-loader (0.1.2)
-    trailblazer-macro (2.1.7)
-      trailblazer-activity-dsl-linear (>= 0.4.0, < 0.5.0)
+    trailblazer-macro (2.1.9)
+      trailblazer-activity-dsl-linear (>= 0.5.0, < 0.6.0)
       trailblazer-operation (>= 0.7.0)
-    trailblazer-macro-contract (2.1.1)
+    trailblazer-macro-contract (2.1.2)
       reform (>= 2.2.0, < 3.0.0)
-      trailblazer-activity-dsl-linear (>= 0.4.0, < 0.5.0)
+      trailblazer-activity-dsl-linear (>= 0.5.0, < 0.6.0)
     trailblazer-operation (0.7.5)
       trailblazer-activity (>= 0.12.2, < 1.0.0)
       trailblazer-activity-dsl-linear (>= 0.4.1, < 1.0.0)
@@ -156,14 +157,16 @@ GEM
     uber (0.1.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.1)
+    zeitwerk (2.6.0)
 
 PLATFORMS
+  x86_64-darwin-19
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
-  actionpack (~> 7.0.0.rc1)
-  activerecord (~> 7.0.0.rc1)
+  actionpack (~> 7.0.0)
+  activerecord (~> 7.0.0)
   appraisal
   bundler
   cells-erb
@@ -172,11 +175,11 @@ DEPENDENCIES
   minitest-capybara
   rake
   reform-rails
-  sqlite3
+  sqlite3 (~> 1.4.0)
   trailblazer
   trailblazer-cells
   trailblazer-loader
   trailblazer-rails!
 
 BUNDLED WITH
-   2.2.22
+   2.3.11

data/lib/trailblazer/rails/controller.rb

@@ -1,7 +1,7 @@
 module Trailblazer::Rails
   module Controller
     # TODO: deprecate {*dependencies}.
-    def run_v21(operation, *dependencies, **variables)
+    def run_v21(operation, *dependencies, **variables, &block)
       result = if Rails.application.config.trailblazer.enable_tracing
                  _run_operation_v21(operation, :trace, *dependencies, **variables).tap { |r| _operation_trace(r) }
                else
@@ -10,9 +10,17 @@ module Trailblazer::Rails
 
       _assign_trb_ivars(result)
 
-      yield(result) if result.success? && block_given?
-
       @_result = result
+
+      return result if result.failure? || block.nil?
+
+      if block.arity.eql?(1)
+        yield(result)
+      else
+        yield(result, **result.to_hash)
+      end
+
+      result
     end
 
     alias run run_v21 unless method_defined?(:run)

data/lib/trailblazer/rails/railtie.rb

@@ -4,14 +4,12 @@ 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.application_controller ||= %w[ActionController::Base ActionController::API]
     config.trailblazer.enable_tracing ||= false
 
     initializer "trailblazer.application_controller", before: "finisher_hook" do
-      ActiveSupport::Reloader.to_prepare do
-        ActiveSupport.on_load(:action_controller) do |app|
-          Trailblazer::Railtie.extend_application_controller!(app)
-        end
+      ActiveSupport.on_load(:action_controller) do |app|
+        Trailblazer::Railtie.extend_application_controller!(app)
       end
     end
 

data/lib/trailblazer/rails/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   module Rails
-    VERSION = "2.3.0".freeze
+    VERSION = "2.4.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.2
 platform: ruby
 authors:
 - Nick Sutterer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -86,7 +86,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - apotonick@gmail.com
 executables: []
@@ -101,6 +101,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TESTING.md
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_5.2.gemfile.lock
 - gemfiles/rails_6.0.gemfile
@@ -121,7 +122,7 @@ homepage: https://trailblazer.to/2.1/docs/trailblazer.html#trailblazer-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -136,8 +137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: Convenient Rails support for Trailblazer.
 test_files: []