Maintain abstraction consistency within definition_proxy

lib/factory_girl/callback.rb

@@ -18,6 +18,11 @@ def run(instance, proxy)
       end
     end
 
+    def ==(other)
+      name == other.name &&
+        block == other.block
+    end
+
     private
 
     def check_name

lib/factory_girl/definition_proxy.rb

@@ -139,15 +139,15 @@ def association(name, options = {})
     end
 
     def after_build(&block)
-      @factory.add_callback(:after_build, &block)
+      @factory.add_callback(Callback.new(:after_build, block))
     end
 
     def after_create(&block)
-      @factory.add_callback(:after_create, &block)
+      @factory.add_callback(Callback.new(:after_create, block))
     end
 
     def after_stub(&block)
-      @factory.add_callback(:after_stub, &block)
+      @factory.add_callback(Callback.new(:after_stub, block))
     end
 
     def to_create(&block)

lib/factory_girl/factory.rb

@@ -19,7 +19,7 @@ def initialize(name, options = {}) #:nodoc:
       @compiled         = false
     end
 
-    delegate :overridable?, :declarations, :declare_attribute, :to => :@attribute_list
+    delegate :overridable?, :declarations, :declare_attribute, :add_callback, :to => :@attribute_list
 
     def factory_name
       $stderr.puts "DEPRECATION WARNING: factory.factory_name is deprecated; use factory.name instead."
@@ -44,10 +44,6 @@ def define_trait(trait)
       @defined_traits << trait
     end
 
-    def add_callback(name, &block)
-      @attribute_list.add_callback(Callback.new(name, block))
-    end
-
     def run(proxy_class, overrides, &block) #:nodoc:
       ensure_compiled
       proxy = proxy_class.new(build_class)

spec/factory_girl/definition_proxy_spec.rb

@@ -128,20 +128,17 @@
 
   context "#after_build" do
     before { proxy.after_build(&callback) }
-
-    its(:build_callbacks) { should include(callback) }
+    it     { should have_callback(:after_build).with_block(callback) }
   end
 
   context "#after_create" do
     before { proxy.after_create(&callback) }
-
-    its(:create_callbacks) { should include(callback) }
+    it     { should have_callback(:after_create).with_block(callback) }
   end
 
   context "#after_stub" do
     before { proxy.after_stub(&callback) }
-
-    its(:stub_callbacks) { should include(callback) }
+    it     { should have_callback(:after_stub).with_block(callback) }
   end
 end
 

spec/support/matchers/callback.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :have_callback do |callback_name|
+  match do |instance|
+    instance.callbacks.include?(FactoryGirl::Callback.new(callback_name, @block))
+  end
+
+  chain :with_block do |block|
+    @block = block
+  end
+end

spec/support/mock_factory.rb

@@ -1,10 +1,10 @@
 class MockFactory
-  attr_reader :declarations, :traits
+  attr_reader :declarations, :traits, :callbacks
 
   def initialize
     @declarations = []
     @traits       = []
-    @callbacks    = Hash.new([])
+    @callbacks    = []
     @to_create    = nil
   end
 
@@ -20,20 +20,8 @@ def declare_attribute(declaration)
     @declarations << declaration
   end
 
-  def build_callbacks
-    @callbacks[:after_build]
-  end
-
-  def create_callbacks
-    @callbacks[:after_create]
-  end
-
-  def stub_callbacks
-    @callbacks[:after_stub]
-  end
-
-  def add_callback(callback_type, &callback)
-    @callbacks[callback_type] << callback
+  def add_callback(callback)
+    @callbacks << callback
   end
 
   def define_trait(trait)