Simplify #build_hierarchy

lib/factory_girl/definition_hierarchy.rb

@@ -12,6 +12,12 @@ module FactoryGirl
       FactoryGirl.to_create
     end
 
+    def self.build_from_definition(definition)
+      build_to_create &definition.to_create
+      build_constructor &definition.constructor
+      add_callbacks definition.callbacks
+    end
+
     def self.add_callbacks(callbacks)
       if callbacks.any?
         define_method :callbacks do
@@ -19,6 +25,7 @@ module FactoryGirl
         end
       end
     end
+    private_class_method :add_callbacks
 
     def self.build_constructor(&block)
       if block
@@ -27,6 +34,7 @@ module FactoryGirl
         end
       end
     end
+    private_class_method :build_constructor
 
     def self.build_to_create(&block)
       if block
@@ -35,5 +43,6 @@ module FactoryGirl
         end
       end
     end
+    private_class_method :build_to_create
   end
 end

lib/factory_girl/factory.rb

@@ -121,9 +121,7 @@ module FactoryGirl
     end
 
     def build_hierarchy
-      hierarchy_class.build_to_create &definition.to_create
+      hierarchy_class.build_from_definition definition
-      hierarchy_class.build_constructor &definition.constructor
-      hierarchy_class.add_callbacks definition.callbacks
     end
 
     def callbacks