trailblazer-rails 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23162999add75f4ab1c7aa0c35c9a724ab782f43aa691f42c39a957efd432ec3
-  data.tar.gz: 83016e2f641215fef72122d2af2310745528ac9f81f82b5f0773318cee2749b7
+  metadata.gz: e43931b1874b64a31a8a64c738d6568a213c3fa4d796f4dd28d93b894f3c928a
+  data.tar.gz: d51bde81af75fcd5fead6b78a2e27b1caddbd1e0b86bf575a139784fd92bd306
 SHA512:
-  metadata.gz: 5f32d5bf8b70bd0bfde72874d0c5825fe724b1557e4b4adff08db90d5bba11c02b3c5a6697ae5e07ee3d9b95db53f4f922d06fc4f8e7056ff65348e3319c1b09
-  data.tar.gz: 304419bf4c80e9ddd30636c67a2346b6e8a9121b9d1614b6610853bc2f9433a28d7468a5b3ffed78d922e0e97f4be926d5ccabe97663c7771ad7b983c9178360
+  metadata.gz: 430cc9f51fe61f924a9d82581ddbcd00343a7b70956e85f82da8cd4a31577e95533f887ab13889a947982957ccebdcca31e1402414886dcb1c5e775ab0fe8421
+  data.tar.gz: 65c5490e4030fb7638e3cab85d3d7e1a1f7a320e85f5f84cf884f622ce945b86738e34819b835bf883801afe09bb7773aa33d4a399d0a9e5db62d6cd6addb700

data/CHANGES.md

@@ -1,3 +1,6 @@
+# 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/gemfiles/rails_5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    trailblazer-rails (2.2.0)
+    trailblazer-rails (2.3.0)
       railties (>= 5.2.0)
       trailblazer (>= 2.1.0, < 2.2.0)
 

data/gemfiles/rails_6.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    trailblazer-rails (2.2.0)
+    trailblazer-rails (2.3.0)
       railties (>= 5.2.0)
       trailblazer (>= 2.1.0, < 2.2.0)
 

data/gemfiles/rails_6.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    trailblazer-rails (2.2.0)
+    trailblazer-rails (2.3.0)
       railties (>= 5.2.0)
       trailblazer (>= 2.1.0, < 2.2.0)
 

data/gemfiles/rails_7.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    trailblazer-rails (2.2.0)
+    trailblazer-rails (2.3.0)
       railties (>= 5.2.0)
       trailblazer (>= 2.1.0, < 2.2.0)
 

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/railtie.rb

@@ -1,17 +1,27 @@
 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.enable_tracing ||= false
 
-    include Loader
-    include ExtendApplicationController
+    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

data/lib/trailblazer/rails/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   module Rails
-    VERSION = "2.2.0".freeze
+    VERSION = "2.3.0".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.3.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2021-12-13 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
@@ -124,14 +110,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

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