factory_girl 2.6.3 → 2.6.4

data/Changelog

@@ -1,3 +1,7 @@
+2.6.4 (March 16, 2012)
+  Do not ignore names of transient attributes
+  Ensure attributes set on instance are calculated uniquely
+
 2.6.3 (March 9, 2012)
   Fix issue with traits not being present the first time a factory is accessed
   Update available Cucumber step definitions to not require a trialing colon

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (2.6.3)
+    factory_girl (2.6.4)
       activesupport (>= 2.3.9)
 
 GEM

data/factory_girl.gemspec

@@ -16,8 +16,9 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
-  s.authors = ["Joe Ferris"]
-  s.email   = %q{jferris@thoughtbot.com}
+  s.authors = ["Josh Clayton", "Joe Ferris"]
+  s.email   = ["jclayton@thoughtbot.com", "jferris@thoughtbot.com"]
+
   s.homepage = "https://github.com/thoughtbot/factory_girl"
 
   s.add_dependency("activesupport", ">= 2.3.9")

data/gemfiles/2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.6.3)
+    factory_girl (2.6.4)
       activesupport (>= 2.3.9)
 
 GEM

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.6.3)
+    factory_girl (2.6.4)
       activesupport (>= 2.3.9)
 
 GEM

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.6.3)
+    factory_girl (2.6.4)
       activesupport (>= 2.3.9)
 
 GEM

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.6.3)
+    factory_girl (2.6.4)
       activesupport (>= 2.3.9)
 
 GEM

data/lib/factory_girl/attribute_assigner.rb

@@ -37,7 +37,7 @@ module FactoryGirl
     end
 
     def attributes_to_set_on_instance
-      attribute_names_to_assign - @attribute_names_assigned
+      (attribute_names_to_assign - @attribute_names_assigned).uniq
     end
 
     def attributes_to_set_on_hash
@@ -66,7 +66,7 @@ module FactoryGirl
 
     def alias_names_to_ignore
       @attribute_list.reject(&:ignored).map do |attribute|
-        override_names.map {|override| attribute.name if attribute.alias_for?(override) && attribute.name != override }
+        override_names.map {|override| attribute.name if attribute.alias_for?(override) && attribute.name != override && !ignored_attribute_names.include?(override) }
       end.flatten.compact
     end
   end

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.6.3"
+  VERSION = "2.6.4"
 end
 

data/spec/acceptance/nested_attributes_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+
+describe "association assignment from nested attributes" do
+  before do
+    define_model("Post", :title => :string) do
+      has_many :comments
+      accepts_nested_attributes_for :comments
+    end
+
+    define_model("Comment", :post_id => :integer, :body => :text) do
+      belongs_to :post
+    end
+
+    FactoryGirl.define do
+      factory :post do
+        comments_attributes { [FactoryGirl.attributes_for(:comment), FactoryGirl.attributes_for(:comment)] }
+      end
+
+      factory :comment do
+        sequence(:body) {|n| "Body #{n}" }
+      end
+    end
+  end
+
+  it "assigns the correct amount of comments" do
+    FactoryGirl.create(:post).comments.count.should == 2
+  end
+
+  it "assigns the correct amount of comments when overridden" do
+    FactoryGirl.create(:post, :comments_attributes => [FactoryGirl.attributes_for(:comment)]).comments.count.should == 1
+  end
+end

data/spec/acceptance/transient_attributes_spec.rb

@@ -108,3 +108,36 @@ describe "transient sequences" do
     FactoryGirl.build(:user).name.should == "John Doe 2"
   end
 end
+
+describe "assigning values from a transient attribute" do
+  before do
+    define_class("User") do
+      attr_accessor :foo_id, :foo_name
+    end
+
+    define_class("Foo") do
+      attr_accessor :id, :name
+      def initialize(id, name)
+        @id = id
+        @name = name
+      end
+    end
+
+    FactoryGirl.define do
+      factory :user do
+        ignore do
+          foo { Foo.new('id-of-foo', 'name-of-foo')}
+        end
+
+        foo_id   { foo.id }
+        foo_name { foo.name }
+      end
+    end
+  end
+
+  it "does not ignore an _id attribute that is an alias for a transient attribute" do
+    user = FactoryGirl.build(:user, :foo => Foo.new('passed-in-id-of-foo', 'passed-in-name-of-foo'))
+    user.foo_id.should == 'passed-in-id-of-foo'
+    user.foo_name.should == 'passed-in-name-of-foo'
+  end
+end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
   prerelease: 
 platform: ruby
 authors:
+- Josh Clayton
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70304756543100 !ruby/object:Gem::Requirement
+  requirement: &70301124622100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: 2.3.9
   type: :runtime
   prerelease: false
-  version_requirements: *70304756543100
+  version_requirements: *70301124622100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70304756359060 !ruby/object:Gem::Requirement
+  requirement: &70301124620680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +33,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70304756359060
+  version_requirements: *70301124620680
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70304756358440 !ruby/object:Gem::Requirement
+  requirement: &70301124619560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70304756358440
+  version_requirements: *70301124619560
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70304756357920 !ruby/object:Gem::Requirement
+  requirement: &70301124635340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304756357920
+  version_requirements: *70301124635340
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70304756356480 !ruby/object:Gem::Requirement
+  requirement: &70301124634520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304756356480
+  version_requirements: *70301124634520
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70304756355320 !ruby/object:Gem::Requirement
+  requirement: &70301124633060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304756355320
+  version_requirements: *70301124633060
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70304756353280 !ruby/object:Gem::Requirement
+  requirement: &70301124631940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304756353280
+  version_requirements: *70301124631940
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70304756351660 !ruby/object:Gem::Requirement
+  requirement: &70301124630000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304756351660
+  version_requirements: *70301124630000
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70304756397340 !ruby/object:Gem::Requirement
+  requirement: &70301124629000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +110,10 @@ dependencies:
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *70304756397340
+  version_requirements: *70301124629000
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70304756396380 !ruby/object:Gem::Requirement
+  requirement: &70301124628220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304756396380
+  version_requirements: *70301124628220
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70304756394680 !ruby/object:Gem::Requirement
+  requirement: &70301124642860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304756394680
+  version_requirements: *70301124642860
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70304756393520 !ruby/object:Gem::Requirement
+  requirement: &70301124641880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,11 +143,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304756393520
+  version_requirements: *70301124641880
 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."
-email: jferris@thoughtbot.com
+email:
+- jclayton@thoughtbot.com
+- jferris@thoughtbot.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -248,6 +251,7 @@ files:
 - spec/acceptance/initialize_with_spec.rb
 - spec/acceptance/modify_factories_spec.rb
 - spec/acceptance/modify_inherited_spec.rb
+- spec/acceptance/nested_attributes_spec.rb
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/sequence_spec.rb
@@ -353,6 +357,7 @@ test_files:
 - spec/acceptance/initialize_with_spec.rb
 - spec/acceptance/modify_factories_spec.rb
 - spec/acceptance/modify_inherited_spec.rb
+- spec/acceptance/nested_attributes_spec.rb
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/sequence_spec.rb