factory_girl 3.0.0 → 3.1.0

data/lib/factory_girl.rb

@@ -64,6 +64,6 @@ module FactoryGirl
   end
 
   def self.callback_names
-    [:after_build, :after_create, :after_stub].freeze
+    [:after_build, :after_create, :after_stub, :before_create].freeze
   end
 end

data/lib/factory_girl/definition_proxy.rb

@@ -108,8 +108,8 @@ module FactoryGirl
     #   end
     #
     # Except that no globally available sequence will be defined.
-    def sequence(name, start_value = 1, &block)
-      sequence = Sequence.new(name, start_value, &block)
+    def sequence(name, *args, &block)
+      sequence = Sequence.new(name, *args, &block)
       add_attribute(name) { sequence.next }
     end
 

data/lib/factory_girl/evaluator.rb

@@ -22,9 +22,8 @@ module FactoryGirl
       @overrides         = overrides
       @cached_attributes = overrides
 
-      singleton = class << self; self end
       @overrides.each do |name, value|
-        singleton.send :define_method, name, lambda { value }
+        singleton_class.send :define_method, name, lambda { value }
       end
 
       @build_strategy.add_observer(CallbackRunner.new(self.class.callbacks, self))

data/lib/factory_girl/sequence.rb

@@ -5,10 +5,13 @@ module FactoryGirl
   class Sequence
     attr_reader :name
 
-    def initialize(name, value = 1, &proc) #:nodoc:
-      @name  = name
-      @proc  = proc
-      @value = value
+    def initialize(name, *args, &proc) #:nodoc:
+      @name    = name
+      @proc    = proc
+
+      options  = args.extract_options!
+      @value   = args.first || 1
+      @aliases = options[:aliases] || []
     end
 
     def next
@@ -18,7 +21,7 @@ module FactoryGirl
     end
 
     def names
-      [@name]
+      [@name] + @aliases
     end
   end
 end

data/lib/factory_girl/step_definitions.rb

@@ -97,6 +97,16 @@ World(FactoryGirlStepHelpers)
 FactoryGirl.factories.each do |factory|
   factory.compile
   factory.human_names.each do |human_name|
+    attribute_names_for_model = if factory.build_class.respond_to?(:attribute_names)
+      factory.build_class.attribute_names
+    elsif factory.build_class.respond_to?(:columns)
+      factory.build_class.columns.map do |column|
+        column.respond_to?(:name) ? column.name : column.to_s
+      end
+    else
+      []
+    end
+
     Given /^the following (?:#{human_name}|#{human_name.pluralize}) exists?:?$/i do |table|
       table.hashes.each do |human_hash|
         attributes = convert_human_hash_to_attribute_hash(human_hash, factory.associations)
@@ -112,17 +122,15 @@ FactoryGirl.factories.each do |factory|
       FactoryGirl.create_list(factory.name, count.to_i)
     end
 
-    if factory.build_class.respond_to?(:columns)
-      factory.build_class.columns.each do |column|
-        name = column.respond_to?(:name) ? column.name : column.to_s
-        human_column_name = name.downcase.gsub('_', ' ')
-        Given /^an? #{human_name} exists with an? #{human_column_name} of "([^"]*)"$/i do |value|
-          FactoryGirl.create(factory.name, name => value)
-        end
+    attribute_names_for_model.each do |attribute_name|
+      human_column_name = attribute_name.downcase.gsub('_', ' ')
 
-        Given /^(\d+) #{human_name.pluralize} exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
-          FactoryGirl.create_list(factory.name, count.to_i, name => value)
-        end
+      Given /^an? #{human_name} exists with an? #{human_column_name} of "([^"]*)"$/i do |value|
+        FactoryGirl.create(factory.name, attribute_name => value)
+      end
+
+      Given /^(\d+) #{human_name.pluralize} exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
+        FactoryGirl.create_list(factory.name, count.to_i, attribute_name => value)
       end
     end
   end

data/lib/factory_girl/strategy.rb

@@ -2,6 +2,7 @@ require "factory_girl/strategy/build"
 require "factory_girl/strategy/create"
 require "factory_girl/strategy/attributes_for"
 require "factory_girl/strategy/stub"
+require "factory_girl/strategy/null"
 require "observer"
 
 module FactoryGirl

data/lib/factory_girl/strategy/attributes_for.rb

@@ -2,6 +2,7 @@ module FactoryGirl
   class Strategy #:nodoc:
     class AttributesFor < Strategy #:nodoc:
       def association(runner)
+        runner.run(Strategy::Null)
       end
 
       def result(attribute_assigner, to_create)

data/lib/factory_girl/strategy/create.rb

@@ -8,6 +8,7 @@ module FactoryGirl
       def result(attribute_assigner, to_create)
         attribute_assigner.object.tap do |result_instance|
           run_callbacks(:after_build, result_instance)
+          run_callbacks(:before_create, result_instance)
           to_create[result_instance]
           run_callbacks(:after_create, result_instance)
         end

data/lib/factory_girl/strategy/null.rb

@@ -0,0 +1,11 @@
+module FactoryGirl
+  class Strategy
+    class Null
+      def association(runner)
+      end
+
+      def result(attribute_assigner, to_create)
+      end
+    end
+  end
+end

data/lib/factory_girl/syntax/default.rb

@@ -29,8 +29,8 @@ module FactoryGirl
           end
         end
 
-        def sequence(name, start_value = 1, &block)
-          FactoryGirl.register_sequence(Sequence.new(name, start_value, &block))
+        def sequence(name, *args, &block)
+          FactoryGirl.register_sequence(Sequence.new(name, *args, &block))
         end
 
         def trait(name, &block)

data/lib/factory_girl/syntax/vintage.rb

@@ -1,3 +1,5 @@
+require "active_support/deprecation"
+
 module FactoryGirl
   module Syntax
     module Vintage
@@ -21,7 +23,7 @@ module FactoryGirl
         # Yields: +Factory+
         # The newly created factory.
         def self.define(name, options = {})
-          $stderr.puts "DEPRECATION WARNING: Factory.define is deprecated; use the FactoryGirl.define block syntax to declare your factory."
+          ActiveSupport::Deprecation.warn "Factory.define is deprecated; use the FactoryGirl.define block syntax to declare your factory.", caller
           factory = FactoryGirl::Factory.new(name, options)
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           yield(proxy)
@@ -44,7 +46,7 @@ module FactoryGirl
         #
         #   Factory.sequence(:email) {|n| "somebody_#{n}@example.com" }
         def self.sequence(name, start_value = 1, &block)
-          $stderr.puts "DEPRECATION WARNING: Factory.sequence is deprecated; use the FactoryGirl.define block syntax to declare your sequence."
+          ActiveSupport::Deprecation.warn "Factory.sequence is deprecated; use the FactoryGirl.define block syntax to declare your sequence.", caller
           FactoryGirl.register_sequence(Sequence.new(name, start_value, &block))
         end
 
@@ -57,7 +59,7 @@ module FactoryGirl
         # Returns:
         #   The next value in the sequence. (Object)
         def self.next(name)
-          $stderr.puts "DEPRECATION WARNING: Factory.next is deprecated; use FactoryGirl.generate instead."
+          ActiveSupport::Deprecation.warn "Factory.next is deprecated; use FactoryGirl.generate instead.", caller
           FactoryGirl.generate(name)
         end
 
@@ -86,31 +88,31 @@ module FactoryGirl
         #   # will be used instead.
         #   Factory(:post, user_id: 1)
         def self.alias(pattern, replace)
-          $stderr.puts "DEPRECATION WARNING: Factory.alias is deprecated; use FactoryGirl.aliases << [pattern, replace] instead."
+          ActiveSupport::Deprecation.warn "Factory.alias is deprecated; use FactoryGirl.aliases << [pattern, replace] instead.", caller
           FactoryGirl.aliases << [pattern, replace]
         end
 
         # Alias for FactoryGirl.attributes_for
         def self.attributes_for(name, overrides = {})
-          $stderr.puts "DEPRECATION WARNING: Factory.attributes_for is deprecated; use FactoryGirl.attributes_for instead."
+          ActiveSupport::Deprecation.warn "Factory.attributes_for is deprecated; use FactoryGirl.attributes_for instead.", caller
           FactoryGirl.attributes_for(name, overrides)
         end
 
         # Alias for FactoryGirl.build
         def self.build(name, overrides = {})
-          $stderr.puts "DEPRECATION WARNING: Factory.build is deprecated; use FactoryGirl.build instead."
+          ActiveSupport::Deprecation.warn "Factory.build is deprecated; use FactoryGirl.build instead.", caller
           FactoryGirl.build(name, overrides)
         end
 
         # Alias for FactoryGirl.create
         def self.create(name, overrides = {})
-          $stderr.puts "DEPRECATION WARNING: Factory.create is deprecated; use FactoryGirl.create instead."
+          ActiveSupport::Deprecation.warn "Factory.create is deprecated; use FactoryGirl.create instead.", caller
           FactoryGirl.create(name, overrides)
         end
 
         # Alias for FactoryGirl.build_stubbed.
         def self.stub(name, overrides = {})
-          $stderr.puts "DEPRECATION WARNING: Factory.stub is deprecated; use FactoryGirl.build_stubbed instead."
+          ActiveSupport::Deprecation.warn "Factory.stub is deprecated; use FactoryGirl.build_stubbed instead.", caller
           FactoryGirl.build_stubbed(name, overrides)
         end
       end
@@ -120,7 +122,7 @@ module FactoryGirl
       # Example:
       #   Factory(:user, name: 'Joe')
       def Factory(name, attrs = {})
-        $stderr.puts "DEPRECATION WARNING: Factory(:name) is deprecated; use FactoryGirl.create(:name) instead."
+        ActiveSupport::Deprecation.warn "Factory(:name) is deprecated; use FactoryGirl.create(:name) instead.", caller
         FactoryGirl.create(name, attrs)
       end
     end

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end
 

data/spec/acceptance/sequence_spec.rb

@@ -30,4 +30,32 @@ describe "sequences" do
     another_value.should == 2
     first_value.should_not == another_value
   end
+
+  it "generates aliases for the sequence that reference the same block" do
+    FactoryGirl.define do
+      sequence(:size, aliases: [:count, :length]) {|n| "called-#{n}" }
+    end
+
+    first_value  = generate(:size)
+    second_value = generate(:count)
+    third_value  = generate(:length)
+
+    first_value.should  == "called-1"
+    second_value.should == "called-2"
+    third_value.should  == "called-3"
+  end
+
+  it "generates aliases for the sequence that reference the same block and retains value" do
+    FactoryGirl.define do
+      sequence(:size, "a", aliases: [:count, :length]) {|n| "called-#{n}" }
+    end
+
+    first_value  = generate(:size)
+    second_value = generate(:count)
+    third_value  = generate(:length)
+
+    first_value.should  == "called-a"
+    second_value.should == "called-b"
+    third_value.should  == "called-c"
+  end
 end

data/spec/acceptance/syntax/vintage_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe "vintage syntax" do
   before do
+    ActiveSupport::Deprecation.silenced = true
+
     define_model('User', first_name: :string,
                          last_name:  :string,
                          email:      :string)

data/spec/factory_girl/definition_proxy_spec.rb

@@ -91,7 +91,7 @@ describe FactoryGirl::DefinitionProxy, "#sequence" do
 
   it "creates a new sequence starting at 1" do
     proxy.sequence(:great)
-    FactoryGirl::Sequence.should have_received(:new).with(:great, 1)
+    FactoryGirl::Sequence.should have_received(:new).with(:great)
   end
 
   it "creates a new sequence with an overridden starting vaue" do

data/spec/factory_girl/registry_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe FactoryGirl::Registry do
   let(:aliases)              { [:thing, :widget] }
-  let(:sequence)             { FactoryGirl::Sequence.new(:email) { |n| "somebody#{n}@example.com" } }
   let(:factory)              { FactoryGirl::Factory.new(:object) }
   let(:other_factory)        { FactoryGirl::Factory.new(:string) }
   let(:factory_with_aliases) { FactoryGirl::Factory.new(:string, aliases: aliases) }
@@ -56,11 +55,6 @@ describe FactoryGirl::Registry do
     subject.to_a.should =~ [factory, factory_with_aliases]
   end
 
-  it "registers an sequence" do
-    subject.add(sequence)
-    subject.find(:email).should == sequence
-  end
-
   it "doesn't allow a duplicate name" do
     expect { 2.times { subject.add(factory) } }.
       to raise_error(FactoryGirl::DuplicateDefinitionError, "Factory already registered: object")
@@ -79,3 +73,30 @@ describe FactoryGirl::Registry do
     subject.count.should be_zero
   end
 end
+
+describe FactoryGirl::Registry, "with sequences" do
+  let(:aliases)               { [:sender, :receiver] }
+  let(:sequence)              { FactoryGirl::Sequence.new(:email) { |n| "somebody#{n}@example.com" } }
+  let(:sequence_with_aliases) { FactoryGirl::Sequence.new(:email, aliases: aliases) { |n| "someone_else#{n}@example.com" } }
+  let(:registry_name)         { "Sequence" }
+
+  subject { FactoryGirl::Registry.new(registry_name) }
+
+  it "registers an sequence" do
+    subject.add(sequence)
+    subject.find(:email).should == sequence
+  end
+
+  it "registers a sequence with aliases" do
+    subject.add(sequence_with_aliases)
+
+    subject.find(:email).should    == sequence_with_aliases
+    subject.find(:sender).should   == sequence_with_aliases
+    subject.find(:receiver).should == sequence_with_aliases
+  end
+
+  it "doesn't allow a duplicate name" do
+    expect { 2.times { subject.add(sequence_with_aliases) } }.
+      to raise_error(FactoryGirl::DuplicateDefinitionError, "Sequence already registered: email")
+  end
+end

data/spec/factory_girl/sequence_spec.rb

@@ -25,6 +25,26 @@ describe FactoryGirl::Sequence do
     end
   end
 
+  describe "a sequence with aliases using default value" do
+    subject    { FactoryGirl::Sequence.new(:test, aliases: [:alias, :other]) { |n| "=#{n}" } }
+    its(:next) { should == "=1" }
+
+    describe "when incrementing" do
+      before     { subject.next }
+      its(:next) { should == "=2" }
+    end
+  end
+
+  describe "a sequence with custom value and aliases" do
+    subject    { FactoryGirl::Sequence.new(:test, 3, aliases: [:alias, :other]) { |n| "=#{n}" } }
+    its(:next) { should == "=3" }
+
+    describe "when incrementing" do
+      before     { subject.next }
+      its(:next) { should == "=4" }
+    end
+  end
+
   describe "a basic sequence without a block" do
     subject    { FactoryGirl::Sequence.new(:name) }
     its(:next) { should == 1 }

data/spec/factory_girl/strategy/create_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe FactoryGirl::Strategy::Create do
   it_should_behave_like "strategy with association support", FactoryGirl::Strategy::Create
-  it_should_behave_like "strategy with callbacks", :after_build, :after_create
+  it_should_behave_like "strategy with callbacks", :after_build, :before_create, :after_create
 
   it "runs a custom create block" do
     block_run = false

data/spec/support/shared_examples/strategy.rb

@@ -1,4 +1,5 @@
 shared_examples_for "strategy without association support" do
+  let(:factory)   { stub("associate_factory") }
   let(:attribute) { FactoryGirl::Attribute::Association.new(:user, :user, {}) }
 
   def association_named(name, overrides)
@@ -6,14 +7,14 @@ shared_examples_for "strategy without association support" do
     subject.association(runner)
   end
 
-  it "returns nil when accessing an association" do
-    association_named(:user, {}).should be_nil
+  before do
+    FactoryGirl.stubs(factory_by_name: factory)
+    factory.stubs(:compile)
+    factory.stubs(:run)
   end
 
-  it "does not attempt to look up the factory when accessing the association" do
-    FactoryGirl.stubs(:factory_by_name)
-    association_named(:awesome, {})
-    FactoryGirl.should have_received(:factory_by_name).never
+  it "returns nil when accessing an association" do
+    association_named(:user, {}).should be_nil
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70112674654360 !ruby/object:Gem::Requirement
+  requirement: &70215892807040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70112674654360
+  version_requirements: *70215892807040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70112674653480 !ruby/object:Gem::Requirement
+  requirement: &70215892806560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,21 +33,21 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70112674653480
+  version_requirements: *70215892806560
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70112674652580 !ruby/object:Gem::Requirement
+  requirement: &70215892806060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70112674652580
+  version_requirements: *70215892806060
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70112674652200 !ruby/object:Gem::Requirement
+  requirement: &70215892805660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112674652200
+  version_requirements: *70215892805660
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70112674651740 !ruby/object:Gem::Requirement
+  requirement: &70215892805160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112674651740
+  version_requirements: *70215892805160
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70112674651320 !ruby/object:Gem::Requirement
+  requirement: &70215892804720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112674651320
+  version_requirements: *70215892804720
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70112674650900 !ruby/object:Gem::Requirement
+  requirement: &70215893186120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112674650900
+  version_requirements: *70215893186120
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70112674650480 !ruby/object:Gem::Requirement
+  requirement: &70215893156440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,21 +99,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112674650480
+  version_requirements: *70215893156440
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70112674649980 !ruby/object:Gem::Requirement
+  requirement: &70215893134240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70112674649980
+  version_requirements: *70215893134240
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70112674646080 !ruby/object:Gem::Requirement
+  requirement: &70215893110760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112674646080
+  version_requirements: *70215893110760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70112674644200 !ruby/object:Gem::Requirement
+  requirement: &70215893076860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112674644200
+  version_requirements: *70215893076860
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70112674643660 !ruby/object:Gem::Requirement
+  requirement: &70215893049900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112674643660
+  version_requirements: *70215893049900
 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."
@@ -161,11 +161,11 @@ files:
 - .yardopts
 - Appraisals
 - CONTRIBUTION_GUIDELINES.md
-- Changelog
 - GETTING_STARTED.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- NEWS
 - README.md
 - Rakefile
 - cucumber.yml
@@ -217,6 +217,7 @@ files:
 - lib/factory_girl/strategy/attributes_for.rb
 - lib/factory_girl/strategy/build.rb
 - lib/factory_girl/strategy/create.rb
+- lib/factory_girl/strategy/null.rb
 - lib/factory_girl/strategy/stub.rb
 - lib/factory_girl/strategy_calculator.rb
 - lib/factory_girl/syntax.rb
@@ -312,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: factory_girl provides a framework and DSL for defining and using model instance