factory_girl 4.0.0 → 4.1.0

data/GETTING_STARTED.md

@@ -101,7 +101,7 @@ are defined in files at the following locations:
 Using factories
 ---------------
 
-factory\_girl supports several different build strategies: build, create, attributes\_for and stub:
+factory\_girl supports several different build strategies: build, create, attributes\_for and build\_stubbed:
 
 ```ruby
 # Returns a User instance that's not saved
@@ -714,6 +714,16 @@ Calling FactoryGirl.create will invoke both `after_build` and `after_create` cal
 
 Also, like standard attributes, child factories will inherit (and can also define) callbacks from their parent factory.
 
+Multiple callbacks can be assigned to run a block; this is useful when building various strategies that run the same code (since there are no callbacks that are shared across all strategies).
+
+```ruby
+factory :user do
+  callback(:after_stub, :before_create) { do_something }
+  after(:stub, :create) { do_something_else }
+  before(:create, :custom) { do_a_third_thing }
+end
+```
+
 Modifying factories
 -------------------
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (4.0.0)
+    factory_girl (4.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/NEWS

@@ -1,3 +1,7 @@
+4.1.0 (September 11, 2012)
+  Allow multiple callbacks to bind to the same block
+  Fix documentation surrounding the stub strategy
+
 4.0.0 (August 3, 2012)
   Remove deprecated cucumber_steps
   Remove deprecated alternate syntaxes

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (4.0.0)
+    factory_girl (4.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (4.0.0)
+    factory_girl (4.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (4.0.0)
+    factory_girl (4.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/lib/factory_girl/definition_proxy.rb

@@ -158,17 +158,19 @@ module FactoryGirl
       @definition.define_constructor(&block)
     end
 
-    def before(name, &block)
-      callback("before_#{name}", &block)
+    def before(*names, &block)
+      callback(*names.map {|name| "before_#{name}" }, &block)
     end
 
-    def after(name, &block)
-      callback("after_#{name}", &block)
+    def after(*names, &block)
+      callback(*names.map {|name| "after_#{name}" }, &block)
     end
 
-    def callback(name, &block)
-      FactoryGirl.register_callback(name)
-      @definition.add_callback(Callback.new(name, block))
+    def callback(*names, &block)
+      names.each do |name|
+        FactoryGirl.register_callback(name)
+        @definition.add_callback(Callback.new(name, block))
+      end
     end
   end
 end

data/lib/factory_girl/version.rb

@@ -1,3 +1,3 @@
 module FactoryGirl
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 end

data/spec/acceptance/callbacks_spec.rb

@@ -149,3 +149,29 @@ describe "custom callbacks" do
     FactoryGirl.totally_custom(:user).name.should == "Totally Custom"
   end
 end
+
+describe 'binding a callback to multiple callbacks' do
+  before do
+    define_model('User', name: :string)
+
+    FactoryGirl.define do
+      factory :user do
+        callback(:before_create, :after_stub) do |instance|
+          instance.name = instance.name.upcase
+        end
+      end
+    end
+  end
+
+  it 'binds the callback to creation' do
+    FactoryGirl.create(:user, name: 'John Doe').name.should == 'JOHN DOE'
+  end
+
+  it 'does not bind the callback to building' do
+    FactoryGirl.build(:user, name: 'John Doe').name.should == 'John Doe'
+  end
+
+  it 'binds the callback to stubbing' do
+    FactoryGirl.build_stubbed(:user, name: 'John Doe').name.should == 'JOHN DOE'
+  end
+end

data/spec/factory_girl/definition_proxy_spec.rb

@@ -140,6 +140,24 @@ describe FactoryGirl::DefinitionProxy, "adding callbacks" do
     before { proxy.after(:stub, &callback) }
     it     { should have_callback(:after_stub).with_block(callback) }
   end
+
+  context "#after(:stub, :create)" do
+    before { proxy.after(:stub, :create, &callback) }
+    it     { should have_callback(:after_stub).with_block(callback) }
+    it     { should have_callback(:after_create).with_block(callback) }
+  end
+
+  context "#before(:stub, :create)" do
+    before { proxy.before(:stub, :create, &callback) }
+    it     { should have_callback(:before_stub).with_block(callback) }
+    it     { should have_callback(:before_create).with_block(callback) }
+  end
+
+  context "#callback(:after_stub, :before_create)" do
+    before { proxy.callback(:after_stub, :before_create, &callback) }
+    it     { should have_callback(:after_stub).with_block(callback) }
+    it     { should have_callback(:before_create).with_block(callback) }
+  end
 end
 
 describe FactoryGirl::DefinitionProxy, "#to_create" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport