0
@@ -200,11 +200,21 @@ module DataMapper
0
     end
0
 
0
     def hooks
0
-      @hooks ||= Hash.new { |h, k| h[k] = {} }
0
+      return @hooks if @hooks
0
+      if self.superclass != Object
0
+        @hooks = self.superclass.hooks
0
+      else
0
+        @hooks = Hash.new { |h, k| h[k] = {} }
0
+      end
0
     end
0
 
0
     def class_method_hooks
0
-      @class_method_hooks ||= Hash.new { |h, k| h[k] = {} }
0
+      return @class_method_hooks if @class_method_hooks
0
+      if self.superclass != Object
0
+        @class_method_hooks = self.superclass.class_method_hooks
0
+      else
0
+        @class_method_hooks = Hash.new { |h, k| h[k] = {} }
0
+      end
0
     end
0
 
0
     def quote_method(name)

0
@@ -52,6 +52,19 @@ describe "DataMapper::Hook" do
0
     @class.a_class_method
0
   end
0
 
0
+  it 'should run an advice block for class methods when the class is inherited' do
0
+    @inherited_class = Class.new(@class)
0
+    
0
+    @class.before_class_method :a_class_method do
0
+      hi_dad!
0
+    end
0
+
0
+    @inherited_class.should_receive(:hi_dad!)
0
+
0
+    @inherited_class.a_class_method
0
+  end
0
+
0
+
0
   it 'should run an advice block' do
0
     @class.before :a_method do
0
       hi_mom!
0
@@ -62,6 +75,19 @@ describe "DataMapper::Hook" do
0
 
0
     inst.a_method
0
   end
0
+  
0
+  it 'should run an advice block when the class is inherited' do
0
+    @inherited_class = Class.new(@class)
0
+    
0
+    @class.before :a_method do
0
+      hi_dad!
0
+    end
0
+
0
+    inst = @inherited_class.new
0
+    inst.should_receive(:hi_dad!)
0
+
0
+    inst.a_method
0
+  end
0
 
0
   it 'should run an advice method' do
0
     @class.class_eval do