@@ -200,11 +200,21 @@ module DataMapper end def hooks - @hooks ||= Hash.new { |h, k| h[k] = {} } + return @hooks if @hooks + if self.superclass != Object + @hooks = self.superclass.hooks + else + @hooks = Hash.new { |h, k| h[k] = {} } + end end def class_method_hooks - @class_method_hooks ||= Hash.new { |h, k| h[k] = {} } + return @class_method_hooks if @class_method_hooks + if self.superclass != Object + @class_method_hooks = self.superclass.class_method_hooks + else + @class_method_hooks = Hash.new { |h, k| h[k] = {} } + end end def quote_method(name) lib/data_mapper/hook.rb @@ -52,6 +52,19 @@ describe "DataMapper::Hook" do @class.a_class_method end + it 'should run an advice block for class methods when the class is inherited' do + @inherited_class = Class.new(@class) + + @class.before_class_method :a_class_method do + hi_dad! + end + + @inherited_class.should_receive(:hi_dad!) + + @inherited_class.a_class_method + end + + it 'should run an advice block' do @class.before :a_method do hi_mom! @@ -62,6 +75,19 @@ describe "DataMapper::Hook" do inst.a_method end + + it 'should run an advice block when the class is inherited' do + @inherited_class = Class.new(@class) + + @class.before :a_method do + hi_dad! + end + + inst = @inherited_class.new + inst.should_receive(:hi_dad!) + + inst.a_method + end it 'should run an advice method' do @class.class_eval do spec/unit/hook_spec.rb 0f57b64a8a8b0d036dd9cee602ceb448ac6a4e88 Alex Coles alexbcoles@mac.com http://github.com/sam/dm-core/commit/613a3676c8c312cf4385cfc142c0741f51deda33 613a3676c8c312cf4385cfc142c0741f51deda33 2008-05-13T11:13:17-07:00 2008-05-13T11:13:17-07:00 Allow use of hooks defined in a superclass with an inherited class * Useful in cases of Single Table Inheritance * Fixes issue # 278 Signed-off-by: Alex Coles <alexbcoles@mac.com> fc853423ec6845ac56a7d069d7a83e802da6ee6e Alex Coles alexbcoles@mac.com