lib/active_ldap/callbacks.rb in activeldap-4.0.6 vs lib/active_ldap/callbacks.rb in activeldap-5.1.0

@@ -12,17 +12,16 @@
     ]
 
     included do
       extend ActiveModel::Callbacks
       include ActiveModel::Validations::Callbacks
-      
+      singleton_class.class_eval do
+        prepend CallbackedInstantiatable
+      end
+
       define_model_callbacks :initialize, :find, :touch, :only => :after
       define_model_callbacks :save, :create, :update, :destroy
-      
-      class << self
-        alias_method_chain :instantiate, :callbacks
-      end
     end
 
     module ClassMethods
       def method_added(meth)
         super
@@ -31,12 +30,12 @@
           send(meth.to_sym, meth.to_sym)
         end
       end
     end
 
-    module ClassMethods
-      def instantiate_with_callbacks(record)
-        object = instantiate_without_callbacks(record)
+    module CallbackedInstantiatable
+      def instantiate(record)
+        object = super(record)
         object.run_callbacks(:find)
         object.run_callbacks(:initialize)
         object
       end
     end