lib/global_session/rails.rb in global_session-0.9.0 vs lib/global_session/rails.rb in global_session-1.0.0

@@ -1,23 +1,28 @@
 basedir = File.dirname(__FILE__)
 
 require 'rack/contrib/cookies'
+require 'action_pack'
+require 'action_controller'
 
-
 #Require the files necessary for Rails integration
 require 'global_session/rack'
 require 'global_session/rails/action_controller_class_methods'
 require 'global_session/rails/action_controller_instance_methods'
 
+# Enable ActionController integration.
+class <<ActionController::Base
+  include GlobalSession::Rails::ActionControllerClassMethods
+end
+
+ActionController::Base.instance_eval do
+  include GlobalSession::Rails::ActionControllerInstanceMethods
+end
+
 module GlobalSession
   module Rails
     def self.activate(config)
-      # Enable ActionController integration.
-      class <<ActionController::Base
-        include GlobalSession::Rails::ActionControllerClassMethods
-      end
-
       authorities = File.join(::Rails.root, 'config', 'authorities')
       hgs_config  = ActionController::Base.global_session_config
       hgs_dir     = GlobalSession::Directory.new(hgs_config, authorities)
 
       # Add our middleware to the stack.
@@ -25,6 +30,6 @@
       config.middleware.use ::Rack::GlobalSession, hgs_config, hgs_dir
 
       return true
     end
   end
-end
\ No newline at end of file
+end