factory_girl 3.0.0.rc1 → 3.0.0

data/Changelog

@@ -1,3 +1,15 @@
+3.0.0 (March 23, 2012)
+  Deprecate the vintage syntax
+  Remove Rails 2.x support
+  Remove Ruby 1.8 support
+  Remove deprecated features, including default_strategy, factory_name,
+    :method for defining default strategy, ignore on individual attributes, and
+    interacting with Factory the way you would FactoryGirl
+
+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/GETTING_STARTED.md

@@ -7,13 +7,13 @@ Update Your Gemfile
 If you're using Rails, you'll need to change the required version of `factory_girl_rails`:
 
 ```ruby
-gem "factory_girl_rails", "~> 1.2"
+gem "factory_girl_rails", "~> 2.0"
 ```
 
 If you're *not* using Rails, you'll just have to change the required version of `factory_girl`:
 
 ```ruby
-gem "factory_girl", "~> 2.1.0"
+gem "factory_girl", "~> 3.0"
 ```
 
 Once your Gemfile is updated, you'll want to update your bundle.

data/Gemfile.lock

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

data/README.md

@@ -2,7 +2,7 @@
 
 factory_girl is a fixtures replacement with a straightforward definition syntax, support for multiple build strategies (saved instances, unsaved instances, attribute hashes, and stubbed objects), and support for multiple factories for the same class (user, admin_user, and so on), including factory inheritance.
 
-If you want to use factory_girl with Rails 3, see
+If you want to use factory_girl with Rails, see
 [factory_girl_rails](https://github.com/thoughtbot/factory_girl_rails).
 
 Documentation

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.0.0.rc1)
+    factory_girl (3.0.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 (3.0.0.rc1)
+    factory_girl (3.0.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 (3.0.0.rc1)
+    factory_girl (3.0.0)
       activesupport (>= 3.0.0)
 
 GEM

data/lib/factory_girl.rb

@@ -26,10 +26,6 @@ require 'factory_girl/find_definitions'
 require 'factory_girl/reload'
 require 'factory_girl/version'
 
-if defined?(Rails) && Rails::VERSION::MAJOR == 2
-  require 'factory_girl/rails2'
-end
-
 module FactoryGirl
   def self.factories
     @factories ||= Registry.new("Factory")

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/factory_runner.rb

@@ -4,12 +4,8 @@ module FactoryGirl
       @name     = name
       @strategy = strategy
 
-      @overrides = if traits_and_overrides.last.respond_to?(:has_key?)
-                    traits_and_overrides.pop
-                  else
-                    {}
-                  end
-      @traits = traits_and_overrides
+      @overrides = traits_and_overrides.extract_options!
+      @traits    = traits_and_overrides
     end
 
     def run(strategy_override = nil, &block)

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "3.0.0.rc1"
+  VERSION = "3.0.0"
 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/overrides_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'active_support/ordered_hash'
 
 describe "attribute overrides" do
   before do
@@ -32,9 +31,7 @@ describe "attribute overrides" do
   let(:admin) { FactoryGirl.create(:admin) }
 
   let(:post_attributes) do
-    attributes = ActiveSupport::OrderedHash.new
-    attributes[:secure] = false
-    attributes
+    { secure: false }
   end
 
   let(:non_admin_post_attributes) do

data/spec/acceptance/transient_attributes_spec.rb

@@ -89,3 +89,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,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
-  prerelease: 6
+  version: 3.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Josh Clayton
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-03-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70291930464900 !ruby/object:Gem::Requirement
+  requirement: &70112674654360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70291930464900
+  version_requirements: *70112674654360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70291930463360 !ruby/object:Gem::Requirement
+  requirement: &70112674653480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70291930463360
+  version_requirements: *70112674653480
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70291930461720 !ruby/object:Gem::Requirement
+  requirement: &70112674652580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70291930461720
+  version_requirements: *70112674652580
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70291930461040 !ruby/object:Gem::Requirement
+  requirement: &70112674652200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291930461040
+  version_requirements: *70112674652200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70291930459800 !ruby/object:Gem::Requirement
+  requirement: &70112674651740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291930459800
+  version_requirements: *70112674651740
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70291930458700 !ruby/object:Gem::Requirement
+  requirement: &70112674651320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291930458700
+  version_requirements: *70112674651320
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70291930330920 !ruby/object:Gem::Requirement
+  requirement: &70112674650900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291930330920
+  version_requirements: *70112674650900
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70291930329740 !ruby/object:Gem::Requirement
+  requirement: &70112674650480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291930329740
+  version_requirements: *70112674650480
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70291930328760 !ruby/object:Gem::Requirement
+  requirement: &70112674649980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *70291930328760
+  version_requirements: *70112674649980
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70291930327820 !ruby/object:Gem::Requirement
+  requirement: &70112674646080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291930327820
+  version_requirements: *70112674646080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70291930326540 !ruby/object:Gem::Requirement
+  requirement: &70112674644200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291930326540
+  version_requirements: *70112674644200
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70291930325800 !ruby/object:Gem::Requirement
+  requirement: &70112674643660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291930325800
+  version_requirements: *70112674643660
 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."
@@ -209,7 +209,6 @@ files:
 - lib/factory_girl/find_definitions.rb
 - lib/factory_girl/null_factory.rb
 - lib/factory_girl/null_object.rb
-- lib/factory_girl/rails2.rb
 - lib/factory_girl/registry.rb
 - lib/factory_girl/reload.rb
 - lib/factory_girl/sequence.rb
@@ -248,6 +247,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
@@ -307,12 +307,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: factory_girl provides a framework and DSL for defining and using model instance
@@ -350,6 +350,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

data/lib/factory_girl/rails2.rb

@@ -1,8 +0,0 @@
-Rails.configuration.after_initialize do
-  FactoryGirl.definition_file_paths = [
-    File.join(Rails.root, 'factories'),
-    File.join(Rails.root, 'test', 'factories'),
-    File.join(Rails.root, 'spec', 'factories')
-  ]
-  FactoryGirl.find_definitions
-end