factory_girl 2.5.1 → 2.5.2

data/Appraisals

@@ -1,8 +1,3 @@
-appraise "2.1" do
-  gem "test-unit", "~> 2.3.0", :platforms => [:mri_19]
-  gem "activerecord", "~> 2.1"
-end
-
 appraise "2.3" do
   gem "activerecord", "~> 2.3"
 end

data/Changelog

@@ -1,3 +1,9 @@
+2.5.2 (February 10, 2012)
+  Fix step definitions to use associations defined in parent factories
+  Add inline trait support to (build|create)_list
+  Update ActiveSupport dependency to >= 2.3.9, which introduced
+    class_attribute
+
 2.5.1 (February 3, 2012)
   Fix attribute evaluation when the attribute isn't defined in the factory but
     is a private method on Object

data/GETTING_STARTED.md

@@ -480,6 +480,24 @@ FactoryGirl.create(:user, :admin, :male, :name => "Jon Snow")
 
 This ability works with `build`, `build_stubbed`, `attributes_for`, and `create`.
 
+`create_list` and `build_list` methods are supported as well. Just remember to pass
+the number of instances to create/build as second parameter, as documented in the
+"Building or Creating Multiple Records" section of this file.
+
+```ruby
+factory :user do
+  name "Friendly User"
+
+  trait :admin do
+    admin true
+  end
+end
+
+# creates 3 admin users with gender "Male" and name "Jon Snow"
+FactoryGirl.create_list(:user, 3, :admin, :male, :name => "Jon Snow")
+```
+
+
 Callbacks
 ---------
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    factory_girl (2.5.1)
-      activesupport
+    factory_girl (2.5.2)
+      activesupport (>= 2.3.9)
 
 GEM
   remote: http://rubygems.org/

data/factory_girl.gemspec

@@ -0,0 +1,37 @@
+$LOAD_PATH << File.expand_path("../lib", __FILE__)
+require 'factory_girl/version'
+
+Gem::Specification.new do |s|
+  s.name        = %q{factory_girl}
+  s.version     = FactoryGirl::VERSION
+  s.summary     = %q{factory_girl provides a framework and DSL for defining and
+                      using model instance factories.}
+  s.description = %q{factory_girl provides a framework and DSL for defining and
+                      using factories - less error-prone, more explicit, and
+                      all-around easier to work with than fixtures.}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- Appraisals {spec,features,gemfiles}/*`.split("\n")
+
+  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.homepage = "https://github.com/thoughtbot/factory_girl"
+
+  s.add_dependency("activesupport", ">= 2.3.9")
+
+  s.add_development_dependency("rspec",    "~> 2.0")
+  s.add_development_dependency("cucumber", "~> 1.0.0")
+  s.add_development_dependency("timecop")
+  s.add_development_dependency("rcov")
+  s.add_development_dependency("aruba")
+  s.add_development_dependency("mocha")
+  s.add_development_dependency("bourne")
+  s.add_development_dependency("appraisal", "~> 0.3.8")
+  s.add_development_dependency("sqlite3-ruby")
+  s.add_development_dependency("yard")
+  s.add_development_dependency("bluecloth")
+end
+

data/features/factory_girl_steps.feature

@@ -60,6 +60,14 @@ Feature: Use step definitions generated by factories
       | a title | 123       |
     And there should be 1 user
 
+  Scenario: create a titled post with a new author (inherited association)
+    Given the following titled post exists:
+      | Title               | Author  |
+      | A Post with a Title | ID: 123 |
+    Then I should find the following for the last post:
+      | title               | author_id |
+      | A Post with a Title | 123       |
+
   Scenario: create post with and without a category association
     Given the following users exist:
       | ID  | Name |

data/features/support/factories.rb

@@ -99,6 +99,10 @@ FactoryGirl.define do
     category
   end
 
+  factory :titled_post, :parent => :post do
+    title 'A Post with a Title'
+  end
+
   factory :tag do
     post
   end

data/gemfiles/2.1.gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
     factory_girl (2.5.1)
-      activesupport
+      activesupport (>= 2.3.9)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/2.3.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.1)
-      activesupport
+    factory_girl (2.5.2)
+      activesupport (>= 2.3.9)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/3.0.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.1)
-      activesupport
+    factory_girl (2.5.2)
+      activesupport (>= 2.3.9)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/3.1.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.1)
-      activesupport
+    factory_girl (2.5.2)
+      activesupport (>= 2.3.9)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/3.2.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.1)
-      activesupport
+    factory_girl (2.5.2)
+      activesupport (>= 2.3.9)
 
 GEM
   remote: http://rubygems.org/

data/lib/factory_girl.rb

@@ -1,5 +1,6 @@
 require "active_support/core_ext/module/delegation"
 
+require 'factory_girl/errors'
 require 'factory_girl/proxy'
 require 'factory_girl/registry'
 require 'factory_girl/null_factory'
@@ -29,24 +30,6 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 2
 end
 
 module FactoryGirl
-  # Raised when a factory is defined that attempts to instantiate itself.
-  class AssociationDefinitionError < RuntimeError; end
-
-  # Raised when a callback is defined that has an invalid name
-  class InvalidCallbackNameError < RuntimeError; end
-
-  # Raised when a factory is defined with the same name as a previously-defined factory.
-  class DuplicateDefinitionError < RuntimeError; end
-
-  # Raised when calling Factory.sequence from a dynamic attribute block
-  class SequenceAbuseError < RuntimeError; end
-
-  # Raised when defining an invalid attribute:
-  # * Defining an attribute which has a name ending in "="
-  # * Defining an attribute with both a static and lazy value
-  # * Defining an attribute twice in the same factory
-  class AttributeDefinitionError < RuntimeError; end
-
   def self.factories
     @factories ||= Registry.new("Factory")
   end

data/lib/factory_girl/errors.rb

@@ -0,0 +1,19 @@
+module FactoryGirl
+  # Raised when a factory is defined that attempts to instantiate itself.
+  class AssociationDefinitionError < RuntimeError; end
+
+  # Raised when a callback is defined that has an invalid name
+  class InvalidCallbackNameError < RuntimeError; end
+
+  # Raised when a factory is defined with the same name as a previously-defined factory.
+  class DuplicateDefinitionError < RuntimeError; end
+
+  # Raised when calling Factory.sequence from a dynamic attribute block
+  class SequenceAbuseError < RuntimeError; end
+
+  # Raised when defining an invalid attribute:
+  # * Defining an attribute which has a name ending in "="
+  # * Defining an attribute with both a static and lazy value
+  # * Defining an attribute twice in the same factory
+  class AttributeDefinitionError < RuntimeError; end
+end

data/lib/factory_girl/factory.rb

@@ -53,7 +53,7 @@ module FactoryGirl
     end
 
     def associations
-      attributes.associations
+      evaluator_class.attribute_list.associations
     end
 
     # Names for this factory, including aliases.

data/lib/factory_girl/syntax/methods.rb

@@ -90,14 +90,15 @@ module FactoryGirl
       #   The name of the factory to be used.
       # * amount: +Integer+
       #   number of instances to be built.
-      # * overrides: +Hash+
-      #   Attributes to overwrite for each instance.
+      # * traits_and_overrides: +Array+
+      #   [+*Array+] Traits to be applied
+      #   [+Hash+] Attributes to overwrite for this instance.
       #
       # Returns: +Array+
       # An array of instances of the class this factory generates, with generated attributes
       # assigned.
-      def build_list(name, amount, overrides = {})
-        amount.times.map { build(name, overrides) }
+      def build_list(name, amount, *traits_and_overrides)
+        amount.times.map { build(name, *traits_and_overrides) }
       end
 
       # Creates and returns multiple instances from this factory as an array. Attributes can be
@@ -108,14 +109,15 @@ module FactoryGirl
       #   The name of the factory to be used.
       # * amount: +Integer+
       #   number of instances to be created.
-      # * overrides: +Hash+
-      #   Attributes to overwrite for each instance.
+      # * traits_and_overrides: +Array+
+      #   [+*Array+] Traits to be applied
+      #   [+Hash+] Attributes to overwrite for this instance.
       #
       # Returns: +Array+
       # An array of instances of the class this factory generates, with generated attributes
       # assigned.
-      def create_list(name, amount, overrides = {})
-        amount.times.map { create(name, overrides) }
+      def create_list(name, amount, *traits_and_overrides)
+        amount.times.map { create(name, *traits_and_overrides) }
       end
 
       # Generates and returns the next value in a sequence.

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.5.1"
+  VERSION = "2.5.2"
 end
 

data/spec/acceptance/traits_spec.rb

@@ -262,6 +262,32 @@ describe "traits added via proxy" do
     its(:admin) { should be_true }
     its(:name)  { should == "Jack" }
   end
+
+  context "adding traits in create_list" do
+    subject { FactoryGirl.create_list(:user, 2, :admin, :great, :name => "Joe") }
+
+    its(:length) { should == 2 }
+
+    it "creates all the records" do
+      subject.each do |record|
+        record.admin.should be_true
+        record.name.should == "JOE"
+      end
+    end
+  end
+
+  context "adding traits in build_list" do
+    subject { FactoryGirl.build_list(:user, 2, :admin, :great, :name => "Joe") }
+
+    its(:length) { should == 2 }
+
+    it "builds all the records" do
+      subject.each do |record|
+        record.admin.should be_true
+        record.name.should == "Joe"
+      end
+    end
+  end
 end
 
 describe "traits and dynamic attributes that are applied simultaneously" do

data/spec/factory_girl/factory_spec.rb

@@ -48,6 +48,20 @@ describe FactoryGirl::Factory do
     factory.associations.size.should == 3
   end
 
+  it "includes associations from the parent factory" do
+    association_on_parent = FactoryGirl::Declaration::Association.new(:association_on_parent, {})
+    association_on_child  = FactoryGirl::Declaration::Association.new(:association_on_child, {})
+
+    factory = FactoryGirl::Factory.new(:post)
+    factory.declare_attribute(association_on_parent)
+    FactoryGirl.register_factory(factory)
+
+    child_factory = FactoryGirl::Factory.new(:child_post, :parent => :post)
+    child_factory.declare_attribute(association_on_child)
+
+    child_factory.associations.map(&:name).should == [:association_on_parent, :association_on_child]
+  end
+
   describe "when overriding generated attributes with a hash" do
     before do
       @name  = :name

data/spec/support/matchers/delegate.rb

@@ -21,7 +21,7 @@ RSpec::Matchers.define :delegate do |delegated_method|
     stubbed_target = stub('stubbed_target', method_on_target => return_value)
     @instance.stubs(@target_method => stubbed_target)
     begin
-      @instance.send(delegated_method, *@args).should == return_value
+      @instance.send(delegated_method, *@args) == return_value
     rescue NoMethodError
       false
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70093884307140 !ruby/object:Gem::Requirement
+  requirement: &70105304973080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.9
   type: :runtime
   prerelease: false
-  version_requirements: *70093884307140
+  version_requirements: *70105304973080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70093884306400 !ruby/object:Gem::Requirement
+  requirement: &70105304972240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70093884306400
+  version_requirements: *70105304972240
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70093884305300 !ruby/object:Gem::Requirement
+  requirement: &70105304971500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70093884305300
+  version_requirements: *70105304971500
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70093884304160 !ruby/object:Gem::Requirement
+  requirement: &70105304971040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093884304160
+  version_requirements: *70105304971040
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70093884302020 !ruby/object:Gem::Requirement
+  requirement: &70105304970440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093884302020
+  version_requirements: *70105304970440
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70093884285960 !ruby/object:Gem::Requirement
+  requirement: &70105304969860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093884285960
+  version_requirements: *70105304969860
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70093884291240 !ruby/object:Gem::Requirement
+  requirement: &70105304969160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093884291240
+  version_requirements: *70105304969160
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70093884290600 !ruby/object:Gem::Requirement
+  requirement: &70105304968440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093884290600
+  version_requirements: *70105304968440
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70093884288880 !ruby/object:Gem::Requirement
+  requirement: &70105304967680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *70093884288880
+  version_requirements: *70105304967680
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70093884288420 !ruby/object:Gem::Requirement
+  requirement: &70105304967200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093884288420
+  version_requirements: *70105304967200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70093884287780 !ruby/object:Gem::Requirement
+  requirement: &70105304966580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093884287780
+  version_requirements: *70105304966580
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70093884286820 !ruby/object:Gem::Requirement
+  requirement: &70105304966000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,9 +142,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093884286820
-description: ! "factory_girl provides a framework and DSL for defining and\n                       using
-  factories - less error-prone, more explicit, and\n                       all-around
+  version_requirements: *70105304966000
+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
 executables: []
@@ -156,6 +156,7 @@ files:
 - .rspec
 - .travis.yml
 - .yardopts
+- Appraisals
 - CONTRIBUTION_GUIDELINES.md
 - Changelog
 - GETTING_STARTED.md
@@ -164,6 +165,24 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- cucumber.yml
+- factory_girl.gemspec
+- features/factory_girl_steps.feature
+- features/find_definitions.feature
+- features/step_definitions/database_steps.rb
+- features/step_definitions/factory_girl_steps.rb
+- features/support/env.rb
+- features/support/factories.rb
+- gemfiles/2.1.gemfile
+- gemfiles/2.1.gemfile.lock
+- gemfiles/2.3.gemfile
+- gemfiles/2.3.gemfile.lock
+- gemfiles/3.0.gemfile
+- gemfiles/3.0.gemfile.lock
+- gemfiles/3.1.gemfile
+- gemfiles/3.1.gemfile.lock
+- gemfiles/3.2.gemfile
+- gemfiles/3.2.gemfile.lock
 - lib/factory_girl.rb
 - lib/factory_girl/aliases.rb
 - lib/factory_girl/attribute.rb
@@ -183,6 +202,7 @@ files:
 - lib/factory_girl/definition.rb
 - lib/factory_girl/definition_proxy.rb
 - lib/factory_girl/deprecated.rb
+- lib/factory_girl/errors.rb
 - lib/factory_girl/evaluator.rb
 - lib/factory_girl/evaluator_class_definer.rb
 - lib/factory_girl/factory.rb
@@ -209,24 +229,6 @@ files:
 - lib/factory_girl/syntax/vintage.rb
 - lib/factory_girl/trait.rb
 - lib/factory_girl/version.rb
-- Appraisals
-- cucumber.yml
-- features/factory_girl_steps.feature
-- features/find_definitions.feature
-- features/step_definitions/database_steps.rb
-- features/step_definitions/factory_girl_steps.rb
-- features/support/env.rb
-- features/support/factories.rb
-- gemfiles/2.1.gemfile
-- gemfiles/2.1.gemfile.lock
-- gemfiles/2.3.gemfile
-- gemfiles/2.3.gemfile.lock
-- gemfiles/3.0.gemfile
-- gemfiles/3.0.gemfile.lock
-- gemfiles/3.1.gemfile
-- gemfiles/3.1.gemfile.lock
-- gemfiles/3.2.gemfile
-- gemfiles/3.2.gemfile.lock
 - spec/acceptance/aliases_spec.rb
 - spec/acceptance/attribute_aliases_spec.rb
 - spec/acceptance/attribute_existing_on_object_spec.rb
@@ -317,7 +319,6 @@ summary: factory_girl provides a framework and DSL for defining and using model
   factories.
 test_files:
 - Appraisals
-- cucumber.yml
 - features/factory_girl_steps.feature
 - features/find_definitions.feature
 - features/step_definitions/database_steps.rb