Clean up more method scoping

lib/factory_girl/factory.rb

@@ -54,10 +54,6 @@ def allow_overrides?
       @attribute_list.overridable?
     end
 
-    def add_child(factory)
-      @children << factory unless @children.include?(factory)
-    end
-
     def define_trait(trait)
       @defined_traits << trait
     end
@@ -147,10 +143,6 @@ def to_create(&block)
       @to_create_block = block
     end
 
-    def callbacks
-      attributes.callbacks
-    end
-
     def ensure_compiled
       compile unless @compiled
     end
@@ -165,8 +157,16 @@ def class_name #:nodoc:
       @class_name || (parent && parent.class_name) || name
     end
 
+    def add_child(factory)
+      @children << factory unless @children.include?(factory)
+    end
+
     private
 
+    def callbacks
+      attributes.callbacks
+    end
+
     def compile
       inherit_factory(parent) if parent
 

spec/factory_girl/factory_spec.rb

@@ -161,13 +161,6 @@
     end
   end
 
-  it "inherits callbacks" do
-    @factory.add_callback(:after_stub) { |object| object.name = 'Stubby' }
-    child = FactoryGirl::Factory.new(:child, :parent => @factory.name)
-    child.ensure_compiled
-    child.callbacks.should_not be_empty
-  end
-
   it "compiles when looking for attributes" do
     @factory.declare_attribute(FactoryGirl::Declaration::Static.new("name", "value"))
     @factory.attributes.size.should == 1