factory_girl 2.4.0 → 2.4.1

data/Changelog

@@ -1,3 +1,7 @@
+2.4.1 (January 17, 2012)
+  Deprecate build_stubbed and attributes_for
+  Fix inline traits
+
 2.4.0 (January 13, 2012)
   Refactor internals of Factory Girl to use anonymous class on which attributes
     get defined

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (2.4.0)
+    factory_girl (2.4.1)
       activesupport
 
 GEM

data/gemfiles/2.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.4.0)
+    factory_girl (2.4.1)
       activesupport
 
 GEM

data/gemfiles/2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.4.0)
+    factory_girl (2.4.1)
       activesupport
 
 GEM

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.4.0)
+    factory_girl (2.4.1)
       activesupport
 
 GEM

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.4.0)
+    factory_girl (2.4.1)
       activesupport
 
 GEM

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.4.0)
+    factory_girl (2.4.1)
       activesupport
 
 GEM

data/lib/factory_girl/factory.rb

@@ -152,6 +152,7 @@ module FactoryGirl
     def initialize_copy(source)
       super
       @definition = @definition.clone
+      @evaluator_class = nil
     end
   end
 end

data/lib/factory_girl/syntax/methods.rb

@@ -5,6 +5,10 @@ module FactoryGirl
       # can be individually overridden by passing in a Hash of attribute => value
       # pairs.
       #
+      # DEPRECATED
+      #
+      # Use build or create instead, calling attributes on the result
+      #
       # Arguments:
       # * name: +Symbol+ or +String+
       #   The name of the factory that should be used.
@@ -18,6 +22,7 @@ module FactoryGirl
       # A set of attributes that can be used to build an instance of the class
       # this factory generates.
       def attributes_for(name, *traits_and_overrides, &block)
+        $stderr.puts "DEPRECATION WARNING: FactoryGirl.attributes_for is deprecated; use FactoryGirl.build or FactoryGirl.create and call #attributes on the result instead."
         run_factory_girl_proxy(name, traits_and_overrides, Proxy::AttributesFor, &block)
       end
 
@@ -67,6 +72,10 @@ module FactoryGirl
       # stubbed out. Attributes can be individually overridden by passing in a Hash
       # of attribute => value pairs.
       #
+      # DEPRECATED
+      #
+      # Use build instead
+      #
       # Arguments:
       # * name: +Symbol+ or +String+
       #   The name of the factory that should be used.
@@ -79,6 +88,7 @@ module FactoryGirl
       # Returns: +Object+
       # An object with generated attributes stubbed out.
       def build_stubbed(name, *traits_and_overrides, &block)
+        $stderr.puts "DEPRECATION WARNING: FactoryGirl.build_stubbed is deprecated; use FactoryGirl.build instead."
         run_factory_girl_proxy(name, traits_and_overrides, Proxy::Stub, &block)
       end
 

data/lib/factory_girl/syntax/vintage.rb

@@ -110,6 +110,10 @@ module FactoryGirl
         end
 
         # Alias for FactoryGirl.attributes_for
+        #
+        # DEPRECATED
+        #
+        # Use build or create instead, calling attributes on the result
         def self.attributes_for(name, overrides = {})
           FactoryGirl.attributes_for(name, overrides)
         end
@@ -125,6 +129,10 @@ module FactoryGirl
         end
 
         # Alias for FactoryGirl.build_stubbed.
+        #
+        # DEPRECATED
+        #
+        # Use build instead
         def self.stub(name, overrides = {})
           FactoryGirl.build_stubbed(name, overrides)
         end

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end
 

data/spec/acceptance/traits_spec.rb

@@ -286,3 +286,29 @@ describe "traits and dynamic attributes that are applied simultaneously" do
   its(:email)    { should == "John@example.com" }
   its(:combined) { should == "John <John@example.com>" }
 end
+
+describe "applying inline traits" do
+  before do
+    define_model("User") do
+      has_many :posts
+    end
+
+    define_model("Post", :user_id => :integer) do
+      belongs_to :user
+    end
+
+    FactoryGirl.define do
+      factory :user do
+        trait :with_post do
+          posts { [ Post.new ] }
+        end
+      end
+    end
+  end
+
+  it "applies traits only to the instance generated for that call" do
+    FactoryGirl.create(:user, :with_post).posts.should_not be_empty
+    FactoryGirl.create(:user).posts.should be_empty
+    FactoryGirl.create(:user, :with_post).posts.should_not be_empty
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70203557477340 !ruby/object:Gem::Requirement
+  requirement: &70308695491200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203557477340
+  version_requirements: *70308695491200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70203557470340 !ruby/object:Gem::Requirement
+  requirement: &70308695490500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70203557470340
+  version_requirements: *70308695490500
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70203557469400 !ruby/object:Gem::Requirement
+  requirement: &70308695489400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70203557469400
+  version_requirements: *70308695489400
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70203557468720 !ruby/object:Gem::Requirement
+  requirement: &70308695489000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203557468720
+  version_requirements: *70308695489000
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70203557467720 !ruby/object:Gem::Requirement
+  requirement: &70308695488540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203557467720
+  version_requirements: *70308695488540
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70203557466180 !ruby/object:Gem::Requirement
+  requirement: &70308695488000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203557466180
+  version_requirements: *70308695488000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70203557465420 !ruby/object:Gem::Requirement
+  requirement: &70308695487580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203557465420
+  version_requirements: *70308695487580
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70203557464620 !ruby/object:Gem::Requirement
+  requirement: &70308695481180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203557464620
+  version_requirements: *70308695481180
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70203557456720 !ruby/object:Gem::Requirement
+  requirement: &70308695480520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *70203557456720
+  version_requirements: *70308695480520
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70203557455540 !ruby/object:Gem::Requirement
+  requirement: &70308695479860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203557455540
+  version_requirements: *70308695479860
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70203557454880 !ruby/object:Gem::Requirement
+  requirement: &70308695479120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203557454880
+  version_requirements: *70308695479120
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70203557453700 !ruby/object:Gem::Requirement
+  requirement: &70308695478620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203557453700
+  version_requirements: *70308695478620
 description: ! "factory_girl provides a framework and DSL for defining and\n                       using
   factories - less error-prone, more explicit, and\n                       all-around
   easier to work with than fixtures."