factory_girl 4.2.0 → 4.8.1

data/gemfiles/4.0.gemfile.lock

@@ -1,95 +1,105 @@
-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
+  remote: ../
   specs:
-    factory_girl (4.2.0)
+    factory_girl (4.8.1)
       activesupport (>= 3.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activerecord-deprecated_finders (0.0.2)
-    appraisal (0.5.1)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.13)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (2.1.0)
       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)
+      thor (>= 0.14.0)
+    arel (4.0.2)
+    aruba (0.14.2)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
     builder (3.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.2.1)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    contracts (0.16.0)
+    cucumber (1.3.20)
       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)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    ffi (1.9.18)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    i18n (0.8.6)
+    json (2.1.0)
+    minitest (4.7.5)
+    multi_json (1.12.2)
+    multi_test (0.1.2)
+    rake (12.1.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    tzinfo (0.3.53)
+    yard (0.9.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord!
-  appraisal (~> 0.5.1)
+  activerecord (~> 4.0.13)
+  activerecord-jdbcsqlite3-adapter
+  appraisal (~> 2.1.0)
   aruba
-  bourne
-  cucumber (~> 1.2.1)
+  cucumber (~> 1.3.15)
   factory_girl!
-  mocha (>= 0.12.8)
-  rspec (~> 2.12.0)
+  jdbc-sqlite3
+  rspec (~> 3.0)
+  rspec-its (~> 1.0)
   simplecov
-  sqlite3
+  sqlite3 (~> 1.3.10)
   timecop
   yard
+
+BUNDLED WITH
+   1.15.4

data/gemfiles/4.1.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "jdbc-sqlite3", :platforms => :jruby
+gem "sqlite3", "~> 1.3.10", :platforms => :ruby
+gem "activerecord", "~> 4.1.14"
+
+gemspec :path => "../"

data/gemfiles/4.1.gemfile.lock

@@ -0,0 +1,104 @@
+PATH
+  remote: ../
+  specs:
+    factory_girl (4.8.1)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.1.16)
+      activesupport (= 4.1.16)
+      builder (~> 3.1)
+    activerecord (4.1.16)
+      activemodel (= 4.1.16)
+      activesupport (= 4.1.16)
+      arel (~> 5.0.0)
+    activesupport (4.1.16)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (5.0.1.20140414130214)
+    aruba (0.14.2)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    builder (3.2.3)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    contracts (0.16.0)
+    cucumber (1.3.20)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    ffi (1.9.18)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    i18n (0.8.6)
+    json (1.8.6)
+    minitest (5.10.3)
+    multi_json (1.12.2)
+    multi_test (0.1.2)
+    rake (12.1.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    yard (0.9.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.1.14)
+  activerecord-jdbcsqlite3-adapter
+  appraisal (~> 2.1.0)
+  aruba
+  cucumber (~> 1.3.15)
+  factory_girl!
+  jdbc-sqlite3
+  rspec (~> 3.0)
+  rspec-its (~> 1.0)
+  simplecov
+  sqlite3 (~> 1.3.10)
+  timecop
+  yard
+
+BUNDLED WITH
+   1.15.4

data/gemfiles/4.2.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "jdbc-sqlite3", :platforms => :jruby
+gem "sqlite3", "~> 1.3.10", :platforms => :ruby
+gem "activerecord", "~> 4.2.5.1"
+
+gemspec :path => "../"

data/gemfiles/4.2.gemfile.lock

@@ -0,0 +1,104 @@
+PATH
+  remote: ../
+  specs:
+    factory_girl (4.8.1)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.5.2)
+      activesupport (= 4.2.5.2)
+      builder (~> 3.1)
+    activerecord (4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
+      arel (~> 6.0)
+    activesupport (4.2.5.2)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.4)
+    aruba (0.14.2)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    builder (3.2.3)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    contracts (0.16.0)
+    cucumber (1.3.20)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    ffi (1.9.18)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    i18n (0.8.6)
+    json (1.8.6)
+    minitest (5.10.3)
+    multi_json (1.12.2)
+    multi_test (0.1.2)
+    rake (12.1.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    yard (0.9.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.2.5.1)
+  activerecord-jdbcsqlite3-adapter
+  appraisal (~> 2.1.0)
+  aruba
+  cucumber (~> 1.3.15)
+  factory_girl!
+  jdbc-sqlite3
+  rspec (~> 3.0)
+  rspec-its (~> 1.0)
+  simplecov
+  sqlite3 (~> 1.3.10)
+  timecop
+  yard
+
+BUNDLED WITH
+   1.15.4

data/gemfiles/5.0.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "jdbc-sqlite3", :platforms => :jruby
+gem "sqlite3", "~> 1.3.10", :platforms => :ruby
+gem "activerecord", "~> 5.0.0"
+
+gemspec :path => "../"

data/gemfiles/5.0.gemfile.lock

@@ -0,0 +1,103 @@
+PATH
+  remote: ../
+  specs:
+    factory_girl (4.8.1)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.6)
+      activesupport (= 5.0.6)
+    activerecord (5.0.6)
+      activemodel (= 5.0.6)
+      activesupport (= 5.0.6)
+      arel (~> 7.0)
+    activesupport (5.0.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.1.4)
+    aruba (0.14.2)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    builder (3.2.3)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    concurrent-ruby (1.0.5)
+    contracts (0.16.0)
+    cucumber (1.3.20)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    ffi (1.9.18)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    i18n (0.8.6)
+    json (2.1.0)
+    minitest (5.10.3)
+    multi_json (1.12.2)
+    multi_test (0.1.2)
+    rake (12.1.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    yard (0.9.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.0.0)
+  activerecord-jdbcsqlite3-adapter
+  appraisal (~> 2.1.0)
+  aruba
+  cucumber (~> 1.3.15)
+  factory_girl!
+  jdbc-sqlite3
+  rspec (~> 3.0)
+  rspec-its (~> 1.0)
+  simplecov
+  sqlite3 (~> 1.3.10)
+  timecop
+  yard
+
+BUNDLED WITH
+   1.15.4

data/lib/factory_girl/attribute/dynamic.rb

@@ -11,7 +11,10 @@ module FactoryGirl
         block = @block
 
         -> {
-          value = block.arity == 1 ? block.call(self) : instance_exec(&block)
+          value = case block.arity
+                  when 1, -1 then instance_exec(self, &block)
+                  else instance_exec(&block)
+                  end
           raise SequenceAbuseError if FactoryGirl::Sequence === value
           value
         }

data/lib/factory_girl/attribute_assigner.rb

@@ -13,7 +13,7 @@ module FactoryGirl
       @evaluator.instance = build_class_instance
       build_class_instance.tap do |instance|
         attributes_to_set_on_instance.each do |attribute|
-          instance.send("#{attribute}=", get(attribute))
+          instance.public_send("#{attribute}=", get(attribute))
           @attribute_names_assigned << attribute
         end
       end
@@ -89,9 +89,9 @@ module FactoryGirl
     end
 
     def alias_names_to_ignore
-      @attribute_list.non_ignored.map do |attribute|
-        override_names.map {|override| attribute.name if attribute.alias_for?(override) && attribute.name != override && !ignored_attribute_names.include?(override) }
-      end.flatten.compact
+      @attribute_list.non_ignored.flat_map do |attribute|
+        override_names.map { |override| attribute.name if attribute.alias_for?(override) && attribute.name != override && !ignored_attribute_names.include?(override) }
+      end.compact
     end
   end
 end

data/lib/factory_girl/attribute_list.rb

@@ -36,7 +36,7 @@ module FactoryGirl
     end
 
     def apply_attributes(attributes_to_apply)
-      attributes_to_apply.each {|attribute| add_attribute(attribute) }
+      attributes_to_apply.each { |attribute| add_attribute(attribute) }
     end
 
     private

data/lib/factory_girl/callback.rb

@@ -10,7 +10,7 @@ module FactoryGirl
 
     def run(instance, evaluator)
       case block.arity
-      when 1 then syntax_runner.instance_exec(instance, &block)
+      when 1, -1 then syntax_runner.instance_exec(instance, &block)
       when 2 then syntax_runner.instance_exec(instance, evaluator, &block)
       else        syntax_runner.instance_exec(&block)
       end

data/lib/factory_girl/callbacks_observer.rb

@@ -15,7 +15,7 @@ module FactoryGirl
     private
 
     def callbacks_by_name(name)
-      @callbacks.select {|callback| callback.name == name }
+      @callbacks.select { |callback| callback.name == name }
     end
   end
 end

data/lib/factory_girl/configuration.rb

@@ -3,6 +3,8 @@ module FactoryGirl
   class Configuration
     attr_reader :factories, :sequences, :traits, :strategies, :callback_names
 
+    attr_accessor :allow_class_lookup, :use_parent_strategy
+
     def initialize
       @factories      = Decorator::DisallowsDuplicatesRegistry.new(Registry.new('Factory'))
       @sequences      = Decorator::DisallowsDuplicatesRegistry.new(Registry.new('Sequence'))
@@ -11,11 +13,14 @@ module FactoryGirl
       @callback_names = Set.new
       @definition     = Definition.new
 
-      to_create {|instance| instance.save! }
+      @allow_class_lookup = true
+
+      to_create { |instance| instance.save! }
       initialize_with { new }
     end
 
-    delegate :to_create, :skip_create, :constructor, to: :@definition
+    delegate :to_create, :skip_create, :constructor, :before, :after,
+      :callback, :callbacks, to: :@definition
 
     def initialize_with(&block)
       @definition.define_constructor(&block)

data/lib/factory_girl/declaration_list.rb

@@ -35,11 +35,11 @@ module FactoryGirl
     private
 
     def delete_declaration(declaration)
-      @declarations.delete_if {|decl| decl.name == declaration.name }
+      @declarations.delete_if { |decl| decl.name == declaration.name }
     end
 
     def to_attributes
-      @declarations.inject([]) {|result, declaration| result += declaration.to_attributes }
+      @declarations.inject([]) { |result, declaration| result += declaration.to_attributes }
     end
 
     def overridable?

data/lib/factory_girl/decorator/attribute_hash.rb

@@ -7,9 +7,8 @@ module FactoryGirl
       end
 
       def attributes
-        @attributes.inject({}) do |result, attribute_name|
+        @attributes.each_with_object({}) do |attribute_name, result|
           result[attribute_name] = send(attribute_name)
-          result
         end
       end
     end

data/lib/factory_girl/decorator/class_key_hash.rb

@@ -18,7 +18,8 @@ module FactoryGirl
       def symbolized_key(key)
         if key.respond_to?(:to_sym)
           key.to_sym
-        else
+        elsif FactoryGirl.allow_class_lookup
+          ActiveSupport::Deprecation.warn "Looking up factories by class is deprecated and will be removed in 5.0. Use symbols instead and set FactoryGirl.allow_class_lookup = false", caller
           key.to_s.underscore.to_sym
         end
       end

data/lib/factory_girl/decorator.rb

@@ -10,8 +10,8 @@ module FactoryGirl
       @component.send(name, *args, &block)
     end
 
-    def send(symbol, *args)
-      __send__(symbol, *args)
+    def send(symbol, *args, &block)
+      __send__(symbol, *args, &block)
     end
 
     def self.const_missing(name)