<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -538,23 +538,26 @@ describe ObjectDaddy, &quot;when spawning a class instance&quot; do
     end
     
     describe 'using generators called directly' do
+      before :each do
+        @class.generator_for :other do |prev| 'bang'; end
+        @class.generator_for :blah  do |prev| 'blah'; end
+      end
+      
       it 'should use generators from the parent class' do
-        @class.generator_for :blah do |prev| 'blah'; end
-        @subclass.spawn.blah.should == 'blah'
+        @subclass.spawn.other.should == 'bang'
+        @subclass.spawn.blah.should  == 'blah'
       end
       
-      it 'should let subclass generators override parent generators' do
-        pending 'figuring out what to do about this, including deciding whether or not this is even important' do
-          @class.generator_for :blah do |prev| 'blah'; end
-          # p @class
-          # p @subclass
-          # @subclass.send(:gather_exemplars)
-          # p @subclass.generators
+      describe 'with subclass generators' do
+        before :each do
           @subclass.generator_for :blah do |prev| 'blip'; end
-          # @subclass.send(:gather_exemplars)
-          # p @subclass.generators
-          # p @subclass.generators[:blah][:generator][:block].call
-          # @subclass.send(:gather_exemplars)
+        end
+        
+        it 'should still use generators from the parent class' do
+          @subclass.spawn.other.should == 'bang'
+        end
+        
+        it 'should allow overriding parent generators' do
           @subclass.spawn.blah.should == 'blip'
         end
       end</diff>
      <filename>spec/object_daddy_spec.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>28da67223f89c16f34c58fb149ea03c77ddd8b32</id>
    </parent>
  </parents>
  <author>
    <name>Yossef Mendelssohn</name>
    <email>ymendel@pobox.com</email>
  </author>
  <url>http://github.com/flogic/object_daddy/commit/0d4b0cc609efe3004f4934421be1c2468c5275ff</url>
  <id>0d4b0cc609efe3004f4934421be1c2468c5275ff</id>
  <committed-date>2009-07-27T23:01:06-07:00</committed-date>
  <authored-date>2009-07-27T23:01:06-07:00</authored-date>
  <message>Fixing specs for direct-call inherited generators.

Finally, this can work. Is it important? I don't know, but it works.</message>
  <tree>5ac19d321cdff2294597c9aff309180d7c8407e0</tree>
  <committer>
    <name>Yossef Mendelssohn</name>
    <email>ymendel@pobox.com</email>
  </committer>
</commit>
