trailblazer-compat 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 169d646a93a9381db03f539f7505dc3f517f95fe
-  data.tar.gz: 8c8ea2e8acb1038192445c1d945c25404712884b
+  metadata.gz: a87137cd62ece252507795dc3827decf12a7af0a
+  data.tar.gz: f125592d8350be4c655f4eb86b9c4a1b4e6ef323
 SHA512:
-  metadata.gz: 758de6c143c9f0d6627cb4c49217ec3fb31a86a3f960a63a52f3c6c7e767559213024185653dc083d99a6cd71f1a7c1cd6a93393263c60d2fa7043fad1f466ac
-  data.tar.gz: 78be2811e719614ecf356eb5a78299a5b7450dc719a1fed0f5ca8e939623d824943b3c2e32cdaa2a2921b2369f5611f8d9fdad12e20ed5cc61d4fa94512104c4
+  metadata.gz: 1fe430099274c39dca277202863000c4613272f51db956ac48461c47d8683c627aa8ea2eae473f2b13ee42fd644378c109c5ffceb452844ca23acee856c15405
+  data.tar.gz: d6922d7858014f9ba381d056d19e85893ee5ee0877d994ea8a320e8a3f61ec329b4a5c3dfcebdd07e7cca4243358eb4d75a2550cae7c17ada439a4885d6a95e4

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.1.2
+
+* Fix a circular dependency problem in some environments, when loading `ApplicationController`.
+
 # 0.1.1
 
 * Allow using `compat` without Rails.

data/README.md

@@ -1,4 +1,5 @@
 # Trailblazer::Compat
+[![Gem Version](https://badge.fury.io/rb/trailblazer-compat.svg)](https://badge.fury.io/rb/trailblazer-compat)
 
 This gem provides a seamless-er™ upgrade from TRB 1.1 to 2.x.
 
@@ -16,7 +17,7 @@ gem "trailblazer-compat"
 In a Rails application, you also need to pull the 1.x line of the `trailblazer-rails` gem.
 
 ```ruby
-gem "trailblazer-rails", ">= 1.0.0"
+gem "trailblazer-rails", ">= 1.0.3"
 ```
 
 ## Upgrade Path / Overview

data/lib/trailblazer/1.1/rails.rb

@@ -19,3 +19,4 @@ end
 
 require "trailblazer/1.1/autoloading"
 require "trailblazer/1.1/rails/autoloading"
+

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

@@ -2,26 +2,39 @@ begin
   require 'rails/railtie'
 rescue LoadError
 else
+
   module Trailblazer::V1_1
     class Railtie < ::Rails::Railtie
+      module ExtendApplicationController
+        def extend_application_controller!(app)
+          # this requires trailblazer-rails-1.0.3
+          application_controller = super
+
+          v2_Controller = Trailblazer::Rails::Controller
+
+          application_controller.class_eval do
+            include v2_Controller # if Trailblazer::Operation.const_defined?(:Controller) # from V2.
+            alias_method :run_v2, :run
+            include Trailblazer::V1_1::Operation::Controller
+          end
+        end
+      end
+
+
       # This is to autoload Operation::Dispatch, etc. I'm simply assuming people find this helpful in Rails.
       initializer "trailblazer.library_autoloading" do
         require "trailblazer/1.1/autoloading"
       end
 
-      initializer "trailblazer.application_controller" do
-        ActiveSupport.on_load(:action_controller) do
-          require "trailblazer/rails/railtie"
-          # this requires trailblazer-rails-1.0.0
-          V2_Controller = Trailblazer::Rails::Controller
+      initializer "trailblazer.application_controller.compat", before: "trailblazer.application_controller" do |app|
+        require "trailblazer/rails/railtie"
 
-          ActionController::Base.class_eval do
-            include V2_Controller # if Trailblazer::Operation.const_defined?(:Controller) # from V2.
-            alias run_v2 run
-            include Trailblazer::V1_1::Operation::Controller
-          end
+        if Gem::Version.new(Trailblazer::Rails::VERSION) < Gem::Version.new("1.0.4")
+          raise "[Trailblazer-compat] Please update to trailblazer-rails 1.0.4 or above."
         end
+
+        Trailblazer::Railtie.extend ExtendApplicationController
       end
-    end
+    end # Railtie
   end
 end

data/lib/trailblazer/compat.rb

@@ -43,8 +43,12 @@ Trailblazer::NotAuthorizedError = Trailblazer::V1_1::NotAuthorizedError
 Trailblazer::Operation.extend(Trailblazer::Compat::Version)
 
 Trailblazer::V2::Operation::Nested.module_eval do
-  def self.nestable_object?(object)
+  def self.nestable_object?(object) # 2.0
     # interestingly, with < we get a weird nil exception. bug in Ruby?
     object.is_a?(Class) && object <= Trailblazer::V2::Operation
   end
+
+  def self.operation_class          # 2.1
+    Trailblazer::V2::Operation
+  end
 end

data/lib/trailblazer/compat/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   module Compat
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-compat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Use Trailblazer 1.1 and 2.x.