factory_girl 2.0.2 → 2.0.3

data/README.md

@@ -1,5 +1,4 @@
-factory_girl
-============
+# factory_girl [![Build Status](http://travis-ci.org/thoughtbot/factory_girl.png)](http://travis-ci.org/thoughtbot/factory_girl)
 
 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.
 

data/features/find_definitions.feature

@@ -3,7 +3,7 @@ Feature: Factory girl can find factory definitions correctly
     Given a file named "awesome_factories.rb" with:
     """
     FactoryGirl.define do
-      factory :awesome_category, :parent => :category do
+      factory :awesome_category, :class => Category do
         name "awesome!!!"
       end
     end
@@ -18,13 +18,13 @@ Feature: Factory girl can find factory definitions correctly
     Given a file named "awesome_factories.rb" with:
     """
     FactoryGirl.define do
-      factory :awesome_category, :parent => :category do
+      factory :another_awesome_category, :class => Category do
         name "awesome!!!"
       end
     end
     """
     When "awesome_factories.rb" is added to Factory Girl's file definitions path as an absolute path
-    And I create a "awesome_category" instance from Factory Girl
+    And I create a "another_awesome_category" instance from Factory Girl
     Then I should find the following for the last category:
       | name       |
       | awesome!!! |
@@ -33,7 +33,7 @@ Feature: Factory girl can find factory definitions correctly
     Given a file named "nested/great_factories.rb" with:
     """
     FactoryGirl.define do
-      factory :great_category, :parent => :category do
+      factory :great_category, :class => Category do
         name "great!!!"
       end
     end
@@ -43,3 +43,20 @@ Feature: Factory girl can find factory definitions correctly
     Then I should find the following for the last category:
       | name     |
       | great!!! |
+
+  Scenario: Find definitions after clearing loaded factories
+    Given a file named "nested/swell_factories.rb" with:
+    """
+    FactoryGirl.define do
+      factory :swell_category, :class => Category do
+        name "swell!!!"
+      end
+    end
+    """
+    When "nested" is added to Factory Girl's file definitions path
+    And I clear out the factories
+    And I find definitions
+    And I create a "swell_category" instance from Factory Girl
+    Then I should find the following for the last category:
+      | name     |
+      | swell!!! |

data/features/step_definitions/factory_girl_steps.rb

@@ -1,16 +1,26 @@
+module FactoryGirlDefinitionsHelper
+  def append_file_to_factory_girl_definitions_path(path_to_file)
+    FactoryGirl.definition_file_paths ||= []
+    FactoryGirl.definition_file_paths << path_to_file
+  end
+end
+
+World(FactoryGirlDefinitionsHelper)
+
 When /^"([^"]*)" is added to Factory Girl's file definitions path$/ do |file_name|
   new_factory_file = File.join(current_dir, file_name.gsub(".rb", ""))
-  FactoryGirl.definition_file_paths ||= []
-  FactoryGirl.definition_file_paths << new_factory_file
-  FactoryGirl.find_definitions
+
+  append_file_to_factory_girl_definitions_path(new_factory_file)
+
+  When %{I find definitions}
 end
 
 When /^"([^"]*)" is added to Factory Girl's file definitions path as an absolute path$/ do |file_name|
   new_factory_file = File.expand_path(File.join(current_dir, file_name.gsub(".rb", "")))
 
-  FactoryGirl.definition_file_paths ||= []
-  FactoryGirl.definition_file_paths << new_factory_file
-  FactoryGirl.find_definitions
+  append_file_to_factory_girl_definitions_path(new_factory_file)
+
+  When %{I find definitions}
 end
 
 When /^I create a "([^"]*)" instance from Factory Girl$/ do |factory_name|
@@ -23,3 +33,11 @@ Given /^these super users exist:$/ do |table|
   new_table = Cucumber::Ast::Table.new([headers] + rows)
   Given %{the following person exists:}, new_table
 end
+
+When /^I clear out the factories$/ do
+  FactoryGirl.factories.clear
+end
+
+When /^I find definitions$/ do
+  FactoryGirl.find_definitions
+end

data/lib/factory_girl/attribute.rb

@@ -8,6 +8,7 @@ module FactoryGirl
   end
 
   class Attribute #:nodoc:
+    include Comparable
 
     attr_reader :name
 
@@ -28,6 +29,16 @@ module FactoryGirl
     def association?
       false
     end
+
+    def priority
+      1
+    end
+
+    def <=>(another)
+      return nil unless another.is_a? Attribute
+      self.priority <=> another.priority
+    end
+
   end
 
 end

data/lib/factory_girl/attribute/static.rb

@@ -11,7 +11,10 @@ module FactoryGirl
       def add_to(proxy)
         proxy.set(name, @value)
       end
-    end
 
+      def priority
+        0
+      end
+    end
   end
 end

data/lib/factory_girl/definition_proxy.rb

@@ -79,6 +79,8 @@ module FactoryGirl
     def method_missing(name, *args, &block)
       if args.empty? && block.nil?
         @factory.define_attribute(Attribute::Implicit.new(name))
+      elsif args.first.is_a?(Hash) && args.first.has_key?(:factory)
+        association(name, *args)
       else
         add_attribute(name, *args, &block)
       end

data/lib/factory_girl/factory.rb

@@ -49,7 +49,9 @@ module FactoryGirl
           new_attributes << attribute.clone
         end
       end
-      @attributes.unshift *new_attributes
+
+      @attributes += new_attributes
+      @attributes.sort!
     end
 
     def define_attribute(attribute)

data/lib/factory_girl/find_definitions.rb

@@ -10,14 +10,14 @@ module FactoryGirl
   self.definition_file_paths = %w(factories test/factories spec/factories)
 
   def self.find_definitions #:nodoc:
-    definition_file_paths.each do |path|
-      path = File.expand_path(path)
+    absolute_definition_file_paths = definition_file_paths.map {|path| File.expand_path(path) }
 
-      require("#{path}.rb") if File.exists?("#{path}.rb")
+    absolute_definition_file_paths.uniq.each do |path|
+      load("#{path}.rb") if File.exists?("#{path}.rb")
 
       if File.directory? path
         Dir[File.join(path, '**', '*.rb')].sort.each do |file|
-          require file
+          load file
         end
       end
     end

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end
 

data/spec/acceptance/attribute_aliases_spec.rb

@@ -3,23 +3,44 @@ require 'acceptance/acceptance_helper'
 
 describe "attribute aliases" do
   before do
-    define_model('User')
+    define_model('User', :name => :string, :age => :integer)
 
     define_model('Post', :user_id => :integer) do
       belongs_to :user
     end
 
     FactoryGirl.define do
-      factory :user
+      factory :user do
+        factory :user_with_name do
+          name "John Doe"
+        end
+      end
 
       factory :post do
         user
       end
+
+      factory :post_with_named_user, :class => Post do
+        user :factory => :user_with_name, :age => 20
+      end
     end
   end
 
-  it "doesn't assign both an association and its foreign key" do
-    FactoryGirl.build(:post, :user_id => 1).user_id.should == 1
+  context "assigning an association by foreign key" do
+    subject { FactoryGirl.build(:post, :user_id => 1) }
+
+    it "doesn't assign both an association and its foreign key" do
+      subject.user_id.should == 1
+    end
+  end
+
+  context "assigning an association by passing factory" do
+    subject { FactoryGirl.create(:post_with_named_user).user }
+
+    it "assigns attributes correctly" do
+      subject.name.should == "John Doe"
+      subject.age.should == 20
+    end
   end
 end
 

data/spec/acceptance/parent_spec.rb

@@ -8,11 +8,11 @@ describe "an instance generated by a factory that inherits from another factory"
     FactoryGirl.define do
       factory :user do
         name  "John"
-        email "john@example.com"
+        email { "#{name.downcase}@example.com" }
 
         factory :admin do
+          name "admin"
           admin true
-          email "admin@example.com"
         end
 
         factory :guest do
@@ -28,16 +28,18 @@ describe "an instance generated by a factory that inherits from another factory"
     its(:email) { should == "john@example.com" }
   end
 
-  describe "the child class" do
+  describe "the child class redefining parent's static method used by a dynamic method" do
     subject     { FactoryGirl.create(:admin) }
     it          { should be_kind_of(User) }
     it          { should be_admin }
-    its(:name)  { should == "John" }
+    its(:name)  { should == "admin" }
     its(:email) { should == "admin@example.com" }
   end
 
-  describe "the child class with parent attribute" do
+  describe "the child class redefining parent's dynamic method" do
     subject     { FactoryGirl.create(:guest) }
+    it          { should_not be_admin }
+    its(:name)  { should == "John" }
     its(:email) { should eql "John-guest@example.com" }
   end
 end

data/spec/factory_girl/attribute_spec.rb

@@ -31,4 +31,13 @@ describe FactoryGirl::Attribute do
   it "should convert names to symbols" do
     FactoryGirl::Attribute.new('name').name.should == :name
   end
+
+  it "should return nil when is compared with a non-attribute object" do
+    (@attr <=> "foo").should == nil
+  end
+
+  it "should use priority to perform comparisons" do
+    attr2 = FactoryGirl::Attribute.new('name')
+    (@attr <=> attr2).should == 0
+  end
 end

data/spec/factory_girl/definition_proxy_spec.rb

@@ -135,6 +135,18 @@ describe FactoryGirl::DefinitionProxy do
     factory.attributes.should include(attr)
   end
 
+  it "adds an association when passed an undefined method with a hash including :factory key" do
+    name = :author
+    factory_name = :user
+    overrides = { :first_name => 'Ben' }
+    args = { :factory => factory_name }.merge(overrides)
+    attr = 'attribute'
+    stub(attr).name { name }
+    mock(FactoryGirl::Attribute::Association).new(name, factory_name, overrides) { attr }
+    subject.send(name, args)
+    factory.attributes.should include(attr)
+  end
+
   it "delegates to_create" do
     result = 'expected'
     mock(factory).to_create { result }

data/spec/factory_girl/find_definitions_spec.rb

@@ -2,20 +2,20 @@ require 'spec_helper'
 
 share_examples_for "finds definitions" do
   before do
-    stub(FactoryGirl).require
+    stub(FactoryGirl).load
     FactoryGirl.find_definitions
   end
   subject { FactoryGirl }
 end
 
-RSpec::Matchers.define :require_definitions_from do |file|
+RSpec::Matchers.define :load_definitions_from do |file|
   match do |given|
-    @has_received = have_received.method_missing(:require, File.expand_path(file))
+    @has_received = have_received.method_missing(:load, File.expand_path(file))
     @has_received.matches?(given)
   end
 
   description do
-    "require definitions from #{file}"
+    "load definitions from #{file}"
   end
 
   failure_message_for_should do
@@ -47,7 +47,7 @@ describe "definition loading" do
   describe "with factories.rb" do
     in_directory_with_files 'factories.rb'
     it_should_behave_like "finds definitions" do
-      it { should require_definitions_from('factories.rb') }
+      it { should load_definitions_from('factories.rb') }
     end
   end
 
@@ -55,14 +55,14 @@ describe "definition loading" do
     describe "with a factories file under #{dir}" do
       in_directory_with_files File.join(dir, 'factories.rb')
       it_should_behave_like "finds definitions" do
-        it { should require_definitions_from("#{dir}/factories.rb") }
+        it { should load_definitions_from("#{dir}/factories.rb") }
       end
     end
 
     describe "with a factories file under #{dir}/factories" do
       in_directory_with_files File.join(dir, 'factories', 'post_factory.rb')
       it_should_behave_like "finds definitions" do
-        it { should require_definitions_from("#{dir}/factories/post_factory.rb") }
+        it { should load_definitions_from("#{dir}/factories/post_factory.rb") }
       end
     end
 
@@ -70,8 +70,8 @@ describe "definition loading" do
       in_directory_with_files File.join(dir, 'factories', 'post_factory.rb'),
                               File.join(dir, 'factories', 'person_factory.rb')
       it_should_behave_like "finds definitions" do
-        it { should require_definitions_from("#{dir}/factories/post_factory.rb") }
-        it { should require_definitions_from("#{dir}/factories/person_factory.rb") }
+        it { should load_definitions_from("#{dir}/factories/post_factory.rb") }
+        it { should load_definitions_from("#{dir}/factories/person_factory.rb") }
       end
     end
 
@@ -80,7 +80,7 @@ describe "definition loading" do
                               File.join(dir, 'factories', 'a.rb')
       it "should load the files in the right order" do
         @loaded = []
-        stub(FactoryGirl).require { |a| @loaded << File.split(a)[-1] }
+        stub(FactoryGirl).load { |a| @loaded << File.split(a)[-1] }
         FactoryGirl.find_definitions
         @loaded.should == ["a.rb", "b.rb"]
       end
@@ -91,9 +91,9 @@ describe "definition loading" do
                               File.join(dir, 'factories', 'post_factory.rb'),
                               File.join(dir, 'factories', 'person_factory.rb')
       it_should_behave_like "finds definitions" do
-        it { should require_definitions_from("#{dir}/factories.rb") }
-        it { should require_definitions_from("#{dir}/factories/post_factory.rb") }
-        it { should require_definitions_from("#{dir}/factories/person_factory.rb") }
+        it { should load_definitions_from("#{dir}/factories.rb") }
+        it { should load_definitions_from("#{dir}/factories/post_factory.rb") }
+        it { should load_definitions_from("#{dir}/factories/person_factory.rb") }
       end
     end
 
@@ -101,8 +101,8 @@ describe "definition loading" do
       in_directory_with_files File.join(dir, 'factories', 'subdirectory', 'post_factory.rb'),
                               File.join(dir, 'factories', 'subdirectory', 'person_factory.rb')
       it_should_behave_like "finds definitions" do
-        it { should require_definitions_from("#{dir}/factories/subdirectory/post_factory.rb") }
-        it { should require_definitions_from("#{dir}/factories/subdirectory/person_factory.rb") }
+        it { should load_definitions_from("#{dir}/factories/subdirectory/post_factory.rb") }
+        it { should load_definitions_from("#{dir}/factories/subdirectory/person_factory.rb") }
       end
     end
   end

metadata

@@ -1,117 +1,113 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: factory_girl
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.0.3
   prerelease: 
-  version: 2.0.2
 platform: ruby
-authors: 
+authors:
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-05 00:00:00.000000000 -04:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rcov
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152633400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152633400
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152632980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152632980
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &2152632560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152632560
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2152632040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2152632040
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2152631500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.0.beta3
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2152631500
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &2152631080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2152631080
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2152630620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2152630620
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &2152621520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-description: |-
-  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.
+  prerelease: false
+  version_requirements: *2152621520
+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: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Appraisals
 - Changelog
 - CONTRIBUTION_GUIDELINES.md
@@ -199,34 +195,33 @@ files:
 - features/support/env.rb
 - features/support/factories.rb
 - features/support/test.db
+has_rdoc: true
 homepage: https://github.com/thoughtbot/factory_girl
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: factory_girl provides a framework and DSL for defining and using model instance factories.
-test_files: 
+summary: factory_girl provides a framework and DSL for defining and using model instance
+  factories.
+test_files:
 - spec/acceptance/attribute_aliases_spec.rb
 - spec/acceptance/attributes_for_spec.rb
 - spec/acceptance/build_list_spec.rb