@@ -1,7 +1,5 @@ *2.1.1 (next release)* -* Run callbacks from object's metaclass [Josh Peek] - * TimeWithZone: when crossing DST boundary, treat Durations of days, months or years as variable-length, and all other values as absolute length. A time + 24.hours will advance exactly 24 hours, but a time + 1.day will advance 23-25 hours, depending on the day. Ensure consistent behavior across all advancing methods [Geoff Buesing] * Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, because Ruby's marshaling of Time instances doesn't respect the zone [Geoff Buesing] activesupport/CHANGELOG @@ -269,15 +269,7 @@ module ActiveSupport # 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 activesupport/lib/active_support/callbacks.rb @@ -84,30 +84,6 @@ class CallbacksTest < Test::Unit::TestCase 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 activesupport/test/callbacks_test.rb 7a84681016a176185df95b347b94c37496cac159 Joshua Peek josh@joshpeek.com http://github.com/azimux/rails/commit/82f338635fd908b40b7adf0328e3041b961109dc 82f338635fd908b40b7adf0328e3041b961109dc 2008-07-16T16:03:34-07:00 2008-07-16T16:03:34-07:00 Revert "Run callbacks from object's metaclass" This reverts commit e0846c8417093853f4f7f62732983e990c28d669. ce1af2b1934788d873665e9a4339a2701a8b8a6d Joshua Peek josh@joshpeek.com