Merge f82d103 into 2b05903

bwillis · Jun 4, 2020 · de2dd88 · de2dd88
2 parents 2b05903 + f82d103
commit de2dd88
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 12 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    versioncake (4.0.1)
+    versioncake (4.0.2)
       actionpack (> 5.0)
       activesupport (> 5.0)
       railties (> 5.0)

diff --git a/gemfiles/rails5.0.gemfile.lock b/gemfiles/rails5.0.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    versioncake (4.0.1)
+    versioncake (4.0.2)
       actionpack (> 5.0)
       activesupport (> 5.0)
       railties (> 5.0)

diff --git a/gemfiles/rails5.2.gemfile.lock b/gemfiles/rails5.2.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    versioncake (4.0.1)
+    versioncake (4.0.2)
       actionpack (> 5.0)
       activesupport (> 5.0)
       railties (> 5.0)

diff --git a/gemfiles/rails6.0.gemfile.lock b/gemfiles/rails6.0.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    versioncake (4.0.1)
+    versioncake (4.0.2)
       actionpack (> 5.0)
       activesupport (> 5.0)
       railties (> 5.0)

diff --git a/lib/versioncake.rb b/lib/versioncake.rb
@@ -26,6 +26,7 @@
   require 'versioncake/controller_additions'
   require 'versioncake/view_additions'
   require 'versioncake/engine'
+  require 'versioncake/railtie'
 end
 
 module VersionCake
@@ -38,4 +39,5 @@ module VersionCake
   def self.setup
     yield self.config
   end
-end
+end
+
diff --git a/lib/versioncake/controller_additions.rb b/lib/versioncake/controller_additions.rb
@@ -83,9 +83,3 @@ def set_version(version)
     end
   end
 end
-
-ActionController::Base.send(:include, VersionCake::ControllerAdditions)
-
-if defined?(ActionController::API)
-  ActionController::API.send(:include, VersionCake::ControllerAdditions)
-end
diff --git a/lib/versioncake/railtie.rb b/lib/versioncake/railtie.rb
@@ -0,0 +1,9 @@
+require 'rails/railtie'
+
+class Railtie < ::Rails::Railtie
+  initializer :versioncake do
+    ActiveSupport.on_load :action_controller do
+      include VersionCake::ControllerAdditions
+    end
+  end
+end
diff --git a/lib/versioncake/version.rb b/lib/versioncake/version.rb
@@ -1,3 +1,3 @@
 module VersionCake
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end