factory_girl 2.0.0.beta2 → 2.0.0.beta3

data/Appraisals

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

data/CONTRIBUTION_GUIDELINES.md

@@ -1,9 +1,9 @@
-We're using [GitHub](http://github.com/thoughtbot/factory_girl/tree/master), and we've been getting any combination of github pull requests, patches, emails, etc.  We need to normalize this workflow to make sure we don't miss any fixes.
+Contributing to factory_girl:
 
-* Make sure you're accessing the source from the [official repository](http://github.com/thoughtbot/factory_girl/tree/master).
-* Please make a branch for each separate contribution.  We can cherry pick your commits, but pulling from a branch is easier.
-* If you're submitting patches, please cut each fix or feature into a separate patch.
-* There should be an [issue](http://github.com/thoughtbot/factory_girl/issues) for any submission.  If you've found a bug and want to fix it, open a new ticket at the same time.
-* Please <b>don't send pull requests</b>  Just update the issue with the url for your fix when it's ready.  The github pull requests pretty much get dropped on the floor until someone with commit rights notices them in the mailbox.
+1. Fork the [official repository](http://github.com/thoughtbot/factory_girl/tree/master).
+2. Make your changes in a topic branch.
+3. Send a pull request.
+
+Notes:
 * Contributions without tests won't be accepted.
-* Please don't submit patches or branches that update the Gem version.
+* Please don't update the Gem version.

data/GETTING_STARTED.md

@@ -13,14 +13,14 @@ Each factory has a name and a set of attributes. The name is used to guess the c
         last_name  'Doe'
         admin false
       end
-  
+
       # This will use the User class (Admin would have been guessed)
       factory :admin, :class => User do
         first_name 'Admin'
         last_name  'User'
         admin true
       end
-  
+
       # The same, but using a string instead of class constant
       factory :admin, :class => 'user' do
         first_name 'Admin'
@@ -48,13 +48,13 @@ factory_girl supports several different build strategies: build, create, attribu
 
     # Returns a User instance that's not saved
     user = FactoryGirl.build(:user)
-  
+
     # Returns a saved User instance
     user = FactoryGirl.create(:user)
-  
+
     # Returns a hash of attributes that can be used to build a User instance:
     attrs = FactoryGirl.attributes_for(:user)
-  
+
     # Returns an object with all defined attributes stubbed out:
     stub = FactoryGirl.stub(:user)
 
@@ -143,7 +143,7 @@ You can easily create multiple factories for the same class without repeating co
       # the 'title' attribute is required for all posts
       title 'A title'
     end
-  
+
     factory :approved_post, :parent => :post do
       approved true
       # the 'approver' association is required for an approved post
@@ -164,10 +164,10 @@ Factory.next:
         "person#{n}@example.com"
       end
     end
-  
+
     Factory.next :email
     # => "person1@example.com"
-  
+
     Factory.next :email
     # => "person2@example.com"
 
@@ -190,6 +190,18 @@ a particular factory:
       sequence(:email) {|n| "person#{n}@example.com" }
     end
 
+You can also override the initial value:
+
+    factory :user do
+      sequence(:email, 1000) {|n| "person#{n}@example.com" }
+    end
+
+Without a block, the value will increment itself, starting at its initial value:
+
+    factory :post do
+      sequence(:position)
+    end
+
 Callbacks
 ---------
 
@@ -226,6 +238,19 @@ Calling FactoryGirl.create will invoke both after_build and after_create callbac
 
 Also, like standard attributes, child factories will inherit (and can also define) callbacks from their parent factory.
 
+Building or Creating Multiple Records
+-------------------------------------
+
+Sometimes, you'll want to create or build multiple instances of a factory at once.
+
+    built_users   = FactoryGirl.build_list(:user, 25)
+    created_users = FactoryGirl.create_list(:user, 25)
+
+These methods will build or create a specific amount of factories and return them as an array.
+To set the attributes for each of the factories, you can pass in a hash as you normally would.
+
+    twenty_year_olds = FactoryGirl.build_list(:user, 25, :date_of_birth => 20.years.ago)
+
 Alternate Syntaxes
 ------------------
 
@@ -234,13 +259,13 @@ Users' tastes for syntax vary dramatically, but most users are looking for a com
     require 'factory_girl/syntax/blueprint'
     require 'factory_girl/syntax/make'
     require 'factory_girl/syntax/sham'
-  
+
     Sham.email {|n| "#{n}@example.com" }
-  
+
     User.blueprint do
       name  { 'Billy Bob' }
       email { Sham.email }
     end
-  
+
     User.make(:name => 'Johnny')
 

data/Gemfile

@@ -1,12 +1,12 @@
 source "http://rubygems.org"
-gem "cucumber"
+gem "cucumber", "~> 1.0.0"
 gem "rake"
 gem "rspec", "~> 2.0"
 gem "rcov"
 gem "activerecord", :require => false
 gem "rr"
 gem "sqlite3-ruby", :require => false
-gem "appraisal"
+gem "appraisal", "~> 0.3.5"
 gem "yard"
 gem "bluecloth"
 

data/Gemfile.lock

@@ -11,36 +11,43 @@ GEM
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
     activesupport (3.0.1)
-    appraisal (0.1)
+    appraisal (0.3.5)
+      aruba (~> 0.3.6)
       bundler
       rake
     arel (1.0.1)
       activesupport (~> 3.0.0)
+    aruba (0.3.7)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.5)
+      rspec (>= 2.6.0)
     bluecloth (2.0.9)
     builder (2.1.2)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (1.0.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.1)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    gherkin (2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
+    ffi (1.0.9)
+    gherkin (2.4.1)
+      json (>= 1.4.6)
     i18n (0.4.2)
-    json (1.4.6)
-    rake (0.8.7)
+    json (1.5.3)
+    rake (0.9.2)
     rcov (0.9.9)
     rr (1.0.2)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.6.0)
     sqlite3-ruby (1.3.2)
     term-ansicolor (1.0.5)
     tzinfo (0.3.23)
@@ -51,9 +58,9 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord
-  appraisal
+  appraisal (~> 0.3.5)
   bluecloth
-  cucumber
+  cucumber (~> 1.0.0)
   rake
   rcov
   rr

data/README.md

@@ -11,7 +11,7 @@ Documentation
 
 You should find the documentation for your version of factory_girl on [Rubygems](http://rubygems.org/gems/factory_girl).
 
-See {file:GETTING_STARTED.md} for information on defining and using factories.
+See [GETTING_STARTED.md](http://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md) for information on defining and using factories.
 
 Download
 --------
@@ -32,7 +32,7 @@ More Information
 Contributing
 ------------
 
-Please read the contribution guidelines before submitting patches or pull requests.
+Please see the [contribution guidelines](http://github.com/thoughtbot/factory_girl/blob/master/CONTRIBUTION_GUIDELINES.md).
 
 Credits
 -------

data/Rakefile

@@ -11,13 +11,13 @@ require 'yard'
 
 desc 'Default: run the specs and features.'
 task :default => 'spec:unit' do
-  system("rake -s appraisal spec:acceptance features;")
+  system("bundle exec rake -s appraisal spec:acceptance features;")
 end
 
 namespace :spec do
   desc "Run unit specs"
   RSpec::Core::RakeTask.new('unit') do |t|
-    t.pattern = 'spec/factory_girl/**/*_spec.rb'
+    t.pattern = 'spec/{*_spec.rb,factory_girl/**/*_spec.rb}'
   end
 
   desc "Run acceptance specs"

data/features/factory_girl_steps.feature

@@ -149,3 +149,36 @@ Feature: Use step definitions generated by factories
       | category_group_id |
       | 456               |
 
+  Scenario: factory name and attributes should not be case sensitive
+    Given the following category exists:
+      | name    | category group |
+      | fiction | Name: books    |
+    Then there should be 1 category
+    Given the following Category exists:
+      | name    | category group |
+      | science | Name: books    |
+    Then there should be 2 categories
+
+  Scenario: factory name and attributes should not be case sensitive
+    Given a user exists
+    Then there should be 1 user
+    Given a User exists
+    Then there should be 2 Users
+
+  Scenario: factory name and attributes should not be case sensitive
+    Given 3 users exist
+    Then there should be 3 users
+    Given 3 Users exist
+    Then there should be 6 Users
+
+  Scenario: factory name and attributes should not be case sensitive
+    Given a category exists with a name of "fiction"
+    Then there should be 1 category
+    Given a Category exists with a name of "science"
+    Then there should be 2 Categories
+
+  Scenario: factory name and attributes should not be case sensitive
+    Given 3 categories exist with a name of "fiction"
+    Then there should be 3 categories
+    Given 3 Categories exist with a name of "science"
+    Then there should be 6 Categories

data/features/support/factories.rb

@@ -48,29 +48,36 @@ end
 class NonActiveRecord
 end
 
-Factory.define :user do |f|
-end
+FactoryGirl.define do
+  # To make sure the step defs work with an email
+  sequence :email do |n|
+    "email#{n}@example.com"
+  end
 
-Factory.define :admin_user, :parent => :user do |f|
-  f.admin true
-end
+  factory :user do
+  end
 
-Factory.define :category do |f|
-  f.name "programming"
-  f.association :category_group
-end
+  factory :admin_user, :parent => :user do
+    admin true
+  end
 
-Factory.define :category_group do |f|
-  f.name "tecnhology"
-end
+  factory :category do
+    name "programming"
+    category_group
+  end
 
-Factory.define :post do |f|
-  f.association :author, :factory => :user
-  f.association :category
-end
+  factory :category_group do
+    name "tecnhology"
+  end
 
-# This is here to ensure that factory step definitions don't raise for a non-AR factory
-Factory.define :non_active_record do |f|
+  factory :post do
+    association :author, :factory => :user
+    category
+  end
+
+  # This is here to ensure that factory step definitions don't raise for a non-AR factory
+  factory :non_active_record do
+  end
 end
 
 require 'factory_girl/step_definitions'

data/lib/factory_girl.rb

@@ -10,6 +10,8 @@ require 'factory_girl/attribute/static'
 require 'factory_girl/attribute/dynamic'
 require 'factory_girl/attribute/association'
 require 'factory_girl/attribute/callback'
+require 'factory_girl/attribute/sequence'
+require 'factory_girl/attribute/implicit'
 require 'factory_girl/sequence'
 require 'factory_girl/aliases'
 require 'factory_girl/definition_proxy'
@@ -24,3 +26,28 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 2
   require 'factory_girl/rails2'
 end
 
+module FactoryGirl
+  def self.factories
+    @factories ||= Registry.new
+  end
+
+  def self.register_factory(factory)
+    factories.add(factory)
+  end
+
+  def self.factory_by_name(name)
+    factories.find(name)
+  end
+
+  def self.sequences
+    @sequences ||= Registry.new
+  end
+
+  def self.register_sequence(sequence)
+    sequences.add(sequence)
+  end
+
+  def self.sequence_by_name(name)
+    sequences.find(name)
+  end
+end

data/lib/factory_girl/attribute.rb

@@ -24,6 +24,10 @@ module FactoryGirl
 
     def add_to(proxy)
     end
+
+    def association?
+      false
+    end
   end
 
 end

data/lib/factory_girl/attribute/association.rb

@@ -14,6 +14,10 @@ module FactoryGirl
       def add_to(proxy)
         proxy.associate(name, @factory, @overrides)
       end
+
+      def association?
+        true
+      end
     end
 
   end

data/lib/factory_girl/attribute/dynamic.rb

@@ -8,7 +8,7 @@ module FactoryGirl
       end
 
       def add_to(proxy)
-        value = @block.arity == 1 ? @block.call(proxy) : proxy.instance_eval(&@block)
+        value = @block.arity == 1 ? @block.call(proxy) : proxy.instance_exec(&@block)
         if FactoryGirl::Sequence === value
           raise SequenceAbuseError
         end

data/lib/factory_girl/attribute/implicit.rb

@@ -0,0 +1,36 @@
+module FactoryGirl
+  class Attribute
+
+    class Implicit < Attribute
+      def initialize(name)
+        super(name)
+      end
+
+      def add_to(proxy)
+        implementation.add_to(proxy)
+      end
+
+      def association?
+        implementation.association?
+      end
+
+      def factory
+        name
+      end
+
+      private
+
+      def implementation
+        @implementation ||= resolve_name
+      end
+
+      def resolve_name
+        if FactoryGirl.factories.registered?(name)
+          Attribute::Association.new(name, name, {})
+        else
+          Attribute::Sequence.new(name, name)
+        end
+      end
+    end
+  end
+end