trailblazer-rails 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a00d731d3bb61523513f95f173bcc30e78199b0a
-  data.tar.gz: 6d198db0cad2bea4e9661e3a9aec5b4cad3fc091
+  metadata.gz: 60d8e312cc34a8cf86ba6d4adf0fb5d3a4d178a8
+  data.tar.gz: f601570b5823b9b46dd07962a89785d0bff8508e
 SHA512:
-  metadata.gz: f12e95e33a107baf386047f45b378033111e7f493ac3f98a725422f4382fc2cf3460f1251a5b1a4338789018a060989d6eb0b659d75f676850f573813f35ebaf
-  data.tar.gz: ae5ec2d715325622fcaf417e48d3d5bef0f3e4d457f375e844c564fbaf2a7b45a7441929f790b9b1424922f2e44d4d9ab93d80026583b395a2a467e06d9ea79e
+  metadata.gz: 53124f47f70adc69246da35cb2a1c9aabd32ec8f1064aa1f1c397b5356282399e0dd06bde285d6437db6b64bc598d39c01e98bd61bbc17433494c378fe5dc39a
+  data.tar.gz: 426612868af63cc5b2949b18493ae4d3fb2f4f8155b4aea3ed7d61524cff1b80bbeaccfd2d7a1b56204356d8734cae005e42e4e3d9a5e406c1743e6bcf572544

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 1.0.5
+
+* Hook trailblazer application_controller initializer to finisher_hook
+
 # 1.0.4
 
 * Make `Railtie::extend_application_controller!` overwriteable via a module.

data/lib/trailblazer/rails/railtie.rb

@@ -4,7 +4,8 @@ require "trailblazer/loader"
 module Trailblazer
   class Railtie < ::Rails::Railtie
     config.trailblazer = ActiveSupport::OrderedOptions.new
-    config.trailblazer.application_controller ||= :ApplicationController
+    ## Accept also an Array of controllers
+    config.trailblazer.application_controller ||= 'ActionController::Base'
 
     def self.load_concepts(app)
       # Loader.new.(insert: [ModelFile, before: Loader::AddConceptFiles]) { |file| require_dependency("#{app.root}/#{file}") }
@@ -38,9 +39,11 @@ module Trailblazer
       end
     end
 
-    initializer "trailblazer.application_controller" do |app|
+    initializer "trailblazer.application_controller", before: "finisher_hook" do |app|
       reloader_class.to_prepare do
-        Trailblazer::Railtie.extend_application_controller!(app)
+        ActiveSupport.on_load(:action_controller) do |app|
+          Trailblazer::Railtie.extend_application_controller!(app)
+        end
       end
     end
 
@@ -70,12 +73,12 @@ module Trailblazer
 
     module ExtendApplicationController
       def extend_application_controller!(app)
-        application_controller = app.config.trailblazer.application_controller.to_s.constantize
-
-        application_controller.send :include, Trailblazer::Rails::Controller
-        application_controller.send :include, Trailblazer::Rails::Controller::Cell if defined?(::Cell)
-
-        application_controller
+        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
 

data/lib/trailblazer/rails/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   module Rails
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Convenient Rails support for Trailblazer.