trailblazer-rails 2.2.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23162999add75f4ab1c7aa0c35c9a724ab782f43aa691f42c39a957efd432ec3
-  data.tar.gz: 83016e2f641215fef72122d2af2310745528ac9f81f82b5f0773318cee2749b7
+  metadata.gz: 1ac9dffebfdbbac3059ac33b30b6b3fc58958d10af2de83c0113c634e4def667
+  data.tar.gz: 74a09ebe5100532430d532c83c69ab5e7dccfe21bf0fdfbbf407af6268652cef
 SHA512:
-  metadata.gz: 5f32d5bf8b70bd0bfde72874d0c5825fe724b1557e4b4adff08db90d5bba11c02b3c5a6697ae5e07ee3d9b95db53f4f922d06fc4f8e7056ff65348e3319c1b09
-  data.tar.gz: 304419bf4c80e9ddd30636c67a2346b6e8a9121b9d1614b6610853bc2f9433a28d7468a5b3ffed78d922e0e97f4be926d5ccabe97663c7771ad7b983c9178360
+  metadata.gz: dfd30ba60691fa98acd40e32498dd75a768a23783fd6f62dbf5fce4cfd67684b35bbf2b6ae384112a1acbad1ac65eb60d1c21d305c24c6c0f98fbefb6ae36a33
+  data.tar.gz: e95e9d4e38226bba64a06fb9483e815373ac5ed58ff41d8e5ae279042d5db3feac18e1cec4e06ea1784488d9e01ff044049a3b4472cd0b24f40d84e3a1f4d460

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,14 @@
+# 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)
+
 # 2.2.0
 
 * Allow passing ctx variables to `Controller#run`.

data/README.md

@@ -2,10 +2,9 @@
 
 *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)
+![Build
+Status](https://github.com/trailblazer/trailblazer-rails/actions/workflows/ci.yml/badge.svg?branch=master)
 [![Gem Version](https://badge.fury.io/rb/trailblazer-rails.svg)](http://badge.fury.io/rb/trailblazer-rails)
 
 ## Endpoint

data/Rakefile

@@ -8,10 +8,11 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-
-require File.expand_path("test/dummy/config/application", __dir__)
-
-Rails.application.load_tasks
+begin
+  require File.expand_path("test/dummy/config/application", __dir__)
+  Rails.application.load_tasks
+rescue LoadError
+end
 
 desc "Running Tests"
 task default: :test

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.2.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.2.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.2.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.2.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/cell.rb

@@ -1,6 +1,4 @@
 module Trailblazer::Rails::Controller::Cell
-  private
-
   module Render
     def render(cell = nil, options = {}, *, &block)
       return super unless cell.kind_of?(::Cell::ViewModel)

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,15 @@ module Trailblazer::Rails
 
       _assign_trb_ivars(result)
 
-      yield(result) if result.success? && block_given?
-
       @_result = result
+
+      return if result.failure? || block.nil?
+
+      if block.arity.eql?(1)
+        yield(result)
+      else
+        yield(result, **result.to_hash)
+      end
     end
 
     alias run run_v21 unless method_defined?(:run)

data/lib/trailblazer/rails/railtie.rb

@@ -1,17 +1,25 @@
 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.enable_loader ||= true
+    config.trailblazer.application_controller ||= %w[ActionController::Base ActionController::API]
     config.trailblazer.enable_tracing ||= false
 
-    include Loader
-    include ExtendApplicationController
+    initializer "trailblazer.application_controller", before: "finisher_hook" do
+      ActiveSupport.on_load(:action_controller) do |app|
+        Trailblazer::Railtie.extend_application_controller!(app)
+      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

data/lib/trailblazer/rails/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   module Rails
-    VERSION = "2.2.0".freeze
+    VERSION = "2.4.1".freeze
   end
 end

data/trailblazer-rails.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "railties", ">= 5.2.0"
   spec.add_dependency "trailblazer", ">= 2.1.0", "< 2.2.0"
 
-  spec.add_development_dependency "trailblazer-loader", ">= 0.1.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -44,20 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: trailblazer-loader
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,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
@@ -124,14 +111,11 @@ files:
 - gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.0.gemfile.lock
 - lib/trailblazer-rails.rb
-- lib/trailblazer/operation/responder.rb
 - lib/trailblazer/rails.rb
 - lib/trailblazer/rails/cell.rb
 - 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/version.rb
 - trailblazer-rails.gemspec
 homepage: https://trailblazer.to/2.1/docs/trailblazer.html#trailblazer-rails
@@ -153,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Convenient Rails support for Trailblazer.

data/lib/trailblazer/operation/responder.rb

@@ -1,18 +0,0 @@
-module Trailblazer::Operation::Responder
-  def self.included(base)
-    base.extend ClassMethods
-  end
-
-  module ClassMethods
-    def model_name
-      model_class.model_name
-    end
-  end
-
-  extend Forwardable
-  def_delegators :@model, :to_param, :destroyed?, :persisted?
-
-  def to_model
-    @model
-  end
-end

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

@@ -1,28 +0,0 @@
-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
-          ActiveSupport::Reloader.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,58 +0,0 @@
-require "active_support/concern"
-
-module Trailblazer
-  class Railtie < ::Rails::Railtie
-    module Loader
-      extend ActiveSupport::Concern
-
-      included do
-        def self.load_concepts(app)
-          load_for(app)
-
-          engines.each { |engine| load_for(engine) }
-        end
-
-        def self.engines
-          ::Rails.application.railties.select { |tie| tie.is_a?(::Rails::Engine) }
-        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.
-
-          # TODO: remove me in v2.2.0
-          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.2.0"
-          end
-
-          if config.trailblazer.enable_loader || config.trailblazer.use_loader
-            ActiveSupport::Reloader.to_prepare do
-              Trailblazer::Railtie.load_concepts(app)
-            end
-          end
-        end
-      end
-    end
-  end
-end