Permalink
Browse files

Revert "Run callbacks from object's metaclass"

  • Loading branch information...
1 parent 40dbebb commit d8a72b32c5b0c32abf257f05b89bad7d21f178ec @josh josh committed Jul 17, 2008
Showing with 1 addition and 35 deletions.
  1. +0 −2 activesupport/CHANGELOG
  2. +1 −9 activesupport/lib/active_support/callbacks.rb
  3. +0 −24 activesupport/test/callbacks_test.rb
View
2 activesupport/CHANGELOG
@@ -1,7 +1,5 @@
*Edge*
-* Run callbacks from object's metaclass [Josh Peek]
-
* Add Array#in_groups which splits or iterates over the array in specified number of groups. #579. [Adrian Mugnolo] Example:
a = (1..10).to_a
View
10 activesupport/lib/active_support/callbacks.rb
@@ -269,15 +269,7 @@ def self.#{callback}_callback_chain
# pass
# stop
def run_callbacks(kind, options = {}, &block)
- callback_chain_method = "#{kind}_callback_chain"
-
- # Meta class inherits Class so we don't have to merge it in 1.9
- if RUBY_VERSION >= '1.9'
- metaclass.send(callback_chain_method).run(self, options, &block)
- else
- callbacks = self.class.send(callback_chain_method) | metaclass.send(callback_chain_method)
- callbacks.run(self, options, &block)
- end
+ self.class.send("#{kind}_callback_chain").run(self, options, &block)
end
end
end
View
24 activesupport/test/callbacks_test.rb
@@ -84,30 +84,6 @@ def test_save_person
end
end
-class MetaclassCallbacksTest < Test::Unit::TestCase
- module ModuleWithCallbacks
- def self.extended(object)
- object.metaclass.before_save :raise_metaclass_callback_called
- end
-
- def module_callback_called?
- @module_callback_called ||= false
- end
-
- def raise_metaclass_callback_called
- @module_callback_called = true
- end
- end
-
- def test_metaclass_callbacks
- person = Person.new
- person.extend(ModuleWithCallbacks)
- assert !person.module_callback_called?
- person.save
- assert person.module_callback_called?
- end
-end
-
class ConditionalCallbackTest < Test::Unit::TestCase
def test_save_conditional_person
person = ConditionalPerson.new

0 comments on commit d8a72b3

Please sign in to comment.