factory_girl 4.1.0 → 4.2.0

data/gemfiles/3.2.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "activerecord", "~> 3.2.0"
+gem "activerecord", "~> 3.2.11"
 
 gemspec :path=>"../"

data/gemfiles/3.2.gemfile.lock

@@ -1,36 +1,35 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (4.1.0)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.7)
-      activesupport (= 3.2.7)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.7)
-      activemodel (= 3.2.7)
-      activesupport (= 3.2.7)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.7)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    appraisal (0.4.1)
+    appraisal (0.5.1)
       bundler
       rake
     arel (3.0.2)
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
-      ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
-    builder (3.0.0)
-    childprocess (0.3.4)
+      rspec-expectations (>= 2.7.0)
+    bourne (1.3.0)
+      mocha (= 0.13.0)
+    builder (3.0.4)
+    childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
     cucumber (1.2.1)
       builder (>= 2.1.2)
@@ -38,53 +37,46 @@ GEM
       gherkin (~> 2.11.0)
       json (>= 1.4.6)
     diff-lcs (1.1.3)
-    ffi (1.1.3)
-    ffi (1.1.3-java)
-    gherkin (2.11.1)
+    ffi (1.3.1)
+    gherkin (2.11.5)
       json (>= 1.4.6)
-    gherkin (2.11.1-java)
-      json (>= 1.4.6)
-    i18n (0.6.0)
-    json (1.7.4)
-    json (1.7.4-java)
+    i18n (0.6.1)
+    json (1.7.6)
     metaclass (0.0.1)
-    mocha (0.10.5)
+    mocha (0.13.0)
       metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    multi_json (1.5.0)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    simplecov (0.6.4)
+    rspec-mocks (2.12.1)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sqlite3 (1.3.6)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    timecop (0.4.4)
-    tzinfo (0.3.33)
-    yard (0.8.2.1)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3 (1.3.7)
+    timecop (0.5.9)
+    tzinfo (0.3.35)
+    yard (0.8.3)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.2.0)
-  appraisal (~> 0.4)
+  activerecord (~> 3.2.11)
+  appraisal (~> 0.5.1)
   aruba
   bourne
-  cucumber (~> 1.1)
+  cucumber (~> 1.2.1)
   factory_girl!
-  mocha
-  rspec (~> 2.0)
+  mocha (>= 0.12.8)
+  rspec (~> 2.12.0)
   simplecov
-  sqlite3-ruby
+  sqlite3
   timecop
   yard

data/gemfiles/4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", :github=>"rails/rails"
+
+gemspec :path=>"../"

data/gemfiles/4.0.gemfile.lock

@@ -0,0 +1,95 @@
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: 40e797827935756aacf0463e4b44e1c1c92b0aeb
+  specs:
+    activemodel (4.0.0.beta)
+      activesupport (= 4.0.0.beta)
+      builder (~> 3.1.0)
+    activerecord (4.0.0.beta)
+      activemodel (= 4.0.0.beta)
+      activerecord-deprecated_finders (= 0.0.2)
+      activesupport (= 4.0.0.beta)
+      arel (~> 3.0.2)
+    activesupport (4.0.0.beta)
+      i18n (~> 0.6)
+      minitest (~> 4.1)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.33)
+
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  specs:
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord-deprecated_finders (0.0.2)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (3.0.2)
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    atomic (1.0.1)
+    bourne (1.3.0)
+      mocha (= 0.13.0)
+    builder (3.1.4)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    ffi (1.3.1)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    i18n (0.6.1)
+    json (1.7.6)
+    metaclass (0.0.1)
+    minitest (4.4.0)
+    mocha (0.13.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.5.0)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3 (1.3.7)
+    thread_safe (0.1.0)
+      atomic
+    timecop (0.5.9)
+    tzinfo (0.3.35)
+    yard (0.8.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord!
+  appraisal (~> 0.5.1)
+  aruba
+  bourne
+  cucumber (~> 1.2.1)
+  factory_girl!
+  mocha (>= 0.12.8)
+  rspec (~> 2.12.0)
+  simplecov
+  sqlite3
+  timecop
+  yard

data/lib/factory_girl/definition_hierarchy.rb

@@ -12,6 +12,12 @@ module FactoryGirl
       FactoryGirl.to_create
     end
 
+    def self.build_from_definition(definition)
+      build_to_create(&definition.to_create)
+      build_constructor(&definition.constructor)
+      add_callbacks definition.callbacks
+    end
+
     def self.add_callbacks(callbacks)
       if callbacks.any?
         define_method :callbacks do
@@ -19,6 +25,7 @@ module FactoryGirl
         end
       end
     end
+    private_class_method :add_callbacks
 
     def self.build_constructor(&block)
       if block
@@ -27,6 +34,7 @@ module FactoryGirl
         end
       end
     end
+    private_class_method :build_constructor
 
     def self.build_to_create(&block)
       if block
@@ -35,5 +43,6 @@ module FactoryGirl
         end
       end
     end
+    private_class_method :build_to_create
   end
 end

data/lib/factory_girl/definition_proxy.rb

@@ -108,7 +108,7 @@ module FactoryGirl
     # Except that no globally available sequence will be defined.
     def sequence(name, *args, &block)
       sequence = Sequence.new(name, *args, &block)
-      add_attribute(name) { sequence.next }
+      add_attribute(name) { increment_sequence(sequence) }
     end
 
     # Adds an attribute that builds an association. The associated instance will

data/lib/factory_girl/evaluator.rb

@@ -11,9 +11,10 @@ module FactoryGirl
     end
 
     def initialize(build_strategy, overrides = {})
-      @build_strategy    = build_strategy
-      @overrides         = overrides
+      @build_strategy = build_strategy
+      @overrides = overrides
       @cached_attributes = overrides
+      @instance = nil
 
       @overrides.each do |name, value|
         singleton_class.define_attribute(name) { value }
@@ -42,10 +43,18 @@ module FactoryGirl
       end
     end
 
+    def respond_to_missing?(method_name, include_private = false)
+      @instance.respond_to?(method_name) || SyntaxRunner.new.respond_to?(method_name)
+    end
+
     def __override_names__
       @overrides.keys
     end
 
+    def increment_sequence(sequence)
+      sequence.next(self)
+    end
+
     def self.attribute_list
       AttributeList.new.tap do |list|
         attribute_lists.each do |attribute_list|

data/lib/factory_girl/factory.rb

@@ -121,9 +121,7 @@ module FactoryGirl
     end
 
     def build_hierarchy
-      hierarchy_class.build_to_create &definition.to_create
-      hierarchy_class.build_constructor &definition.constructor
-      hierarchy_class.add_callbacks definition.callbacks
+      hierarchy_class.build_from_definition definition
     end
 
     def callbacks

data/lib/factory_girl/sequence.rb

@@ -19,10 +19,16 @@ module FactoryGirl
       end
     end
 
-    def next
-      @proc ? @proc.call(@value.peek) : @value.peek
+    def next(scope = nil)
+      if @proc && scope
+        scope.instance_exec(value, &@proc)
+      elsif @proc
+        @proc.call(value)
+      else
+        value
+      end
     ensure
-      @value.next
+      increment_value
     end
 
     def names
@@ -31,6 +37,14 @@ module FactoryGirl
 
     private
 
+    def value
+      @value.peek
+    end
+
+    def increment_value
+      @value.next
+    end
+
     class EnumeratorAdapter
       def initialize(value)
         @value = value

data/lib/factory_girl/strategy/stub.rb

@@ -21,7 +21,7 @@ module FactoryGirl
       end
 
       def stub_database_interaction_on_result(result_instance)
-        result_instance.id = next_id
+        result_instance.id ||= next_id
 
         result_instance.instance_eval do
           def persisted?
@@ -63,7 +63,7 @@ module FactoryGirl
         if created_at_missing_default || result_instance_missing_created_at
           result_instance.instance_eval do
             def created_at
-              @created_at ||= Time.now
+              @created_at ||= Time.now.in_time_zone
             end
           end
         end

data/lib/factory_girl/strategy_syntax_method_registrar.rb

@@ -23,8 +23,8 @@ module FactoryGirl
     def define_list_strategy_method
       strategy_name = @strategy_name
 
-      define_syntax_method("#{strategy_name}_list") do |name, amount, *traits_and_overrides|
-        amount.times.map { send(strategy_name, name, *traits_and_overrides) }
+      define_syntax_method("#{strategy_name}_list") do |name, amount, *traits_and_overrides, &block|
+        amount.times.map { send(strategy_name, name, *traits_and_overrides, &block) }
       end
     end
 

data/lib/factory_girl/version.rb

@@ -1,3 +1,3 @@
 module FactoryGirl
-  VERSION = '4.1.0'
+  VERSION = '4.2.0'
 end

data/spec/acceptance/activesupport_instrumentation_spec.rb

@@ -35,7 +35,7 @@ describe "using ActiveSupport::Instrumentation to track factory interaction" do
       FactoryGirl.build(:slow_user)
     end
 
-    time_to_execute.should >= 0.1
+    expect(time_to_execute).to be >= 0.1
   end
 
   it "builds the correct payload" do
@@ -56,7 +56,7 @@ describe "using ActiveSupport::Instrumentation to track factory interaction" do
       FactoryGirl.attributes_for(:slow_user)
     end
 
-    tracked_invocations[:slow_user].should == { build: 2, attributes_for: 1 }
-    tracked_invocations[:user].should == { build: 5, create: 2 }
+    expect(tracked_invocations[:slow_user]).to eq(build: 2, attributes_for: 1)
+    expect(tracked_invocations[:user]).to eq(build: 5, create: 2)
   end
 end

data/spec/acceptance/aliases_spec.rb

@@ -14,6 +14,6 @@ describe "aliases and overrides" do
   end
 
   subject { FactoryGirl.create(:user, one: "override") }
-  its(:one) { should == "override" }
+  its(:one) { should eq "override" }
   its(:two) { should be_nil }
 end

data/spec/acceptance/attribute_aliases_spec.rb

@@ -29,7 +29,7 @@ describe "attribute aliases" 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
+      expect(subject.user_id).to eq 1
     end
   end
 
@@ -37,8 +37,8 @@ describe "attribute aliases" do
     subject { FactoryGirl.create(:post_with_named_user).user }
 
     it "assigns attributes correctly" do
-      subject.name.should == "John Doe"
-      subject.age.should == 20
+      expect(subject.name).to eq "John Doe"
+      expect(subject.age).to eq 20
     end
   end
 end