Added compatibility layer for new ActiveSupport::Callback syntax to b…

…e used in Rails 3.
taf2 · Jan 14, 2010 · 1480388 · 1480388
1 parent f2e9517
commit 1480388
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/lib/authlogic/acts_as_authentic/password.rb b/lib/authlogic/acts_as_authentic/password.rb
@@ -180,6 +180,17 @@ module Callbacks
         def self.included(klass)
           return if klass.crypted_password_field.nil?
           klass.define_callbacks *METHODS
+
+          # If Rails 3, support the new callback syntax
+          if klass.metaclass.method_defined?(:set_callback)
+            METHODS.each do |method|
+              klass.class_eval <<-"end_eval", __FILE__, __LINE__
+                def self.#{method}(*methods, &block)
+                  set_callback :#{method}, *methods, &block
+                end
+              end_eval
+            end
+          end
         end
 
         private

diff --git a/lib/authlogic/session/callbacks.rb b/lib/authlogic/session/callbacks.rb
@@ -64,6 +64,17 @@ module Callbacks
       def self.included(base) #:nodoc:
         base.send :include, ActiveSupport::Callbacks
         base.define_callbacks *METHODS
+
+        # If Rails 3, support the new callback syntax
+        if base.metaclass.method_defined?(:set_callback)
+          METHODS.each do |method|
+            base.class_eval <<-"end_eval", __FILE__, __LINE__
+              def self.#{method}(*methods, &block)
+                set_callback :#{method}, *methods, &block
+              end
+            end_eval
+          end
+        end
       end
 
       private