factory_girl 4.7.0 → 4.8.0

data/gemfiles/5.0.gemfile

@@ -5,6 +5,6 @@ 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.beta2"
+gem "activerecord", "~> 5.0.0"
 
 gemspec :path => "../"

data/gemfiles/5.0.gemfile.lock

@@ -1,28 +1,21 @@
 PATH
   remote: ../
   specs:
-    factory_girl (4.7.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.0.beta2)
-      activesupport (= 5.0.0.beta2)
-    activerecord (5.0.0.beta2)
-      activemodel (= 5.0.0.beta2)
-      activesupport (= 5.0.0.beta2)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
       arel (~> 7.0)
-    activerecord-jdbc-adapter (1.3.19)
-      activerecord (>= 2.2)
-    activerecord-jdbcsqlite3-adapter (1.3.19)
-      activerecord-jdbc-adapter (~> 1.3.19)
-      jdbc-sqlite3 (>= 3.7.2, < 3.9)
-    activesupport (5.0.0.beta2)
-      concurrent-ruby (~> 1.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      method_source
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     appraisal (2.1.0)
@@ -30,7 +23,7 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (7.0.0)
-    aruba (0.13.0)
+    aruba (0.14.1)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
@@ -42,9 +35,8 @@ GEM
     builder (3.2.2)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    concurrent-ruby (1.0.0)
-    concurrent-ruby (1.0.0-java)
-    contracts (0.13.0)
+    concurrent-ruby (1.0.2)
+    contracts (0.14.0)
     cucumber (1.3.20)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -54,28 +46,22 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     ffi (1.9.10)
-    ffi (1.9.10-java)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    gherkin (2.12.2-java)
-      multi_json (~> 1.3)
     i18n (0.7.0)
-    jdbc-sqlite3 (3.8.11.2)
     json (1.8.3)
-    json (1.8.3-java)
     metaclass (0.0.4)
-    method_source (0.8.2)
-    minitest (5.8.4)
+    minitest (5.9.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multi_test (0.1.2)
-    rake (10.5.0)
+    rake (11.2.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.2)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -95,18 +81,16 @@ GEM
     sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
-    timecop (0.8.0)
+    timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     yard (0.8.7.6)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5.0.0.beta2)
+  activerecord (~> 5.0.0)
   activerecord-jdbcsqlite3-adapter
   appraisal (~> 2.1.0)
   aruba
@@ -123,4 +107,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.11.2
+   1.13.6

data/lib/factory_girl.rb

@@ -68,10 +68,23 @@ module FactoryGirl
   end
 
   class << self
-    delegate :factories, :sequences, :traits, :callbacks, :strategies, :callback_names,
-      :to_create, :skip_create, :initialize_with, :constructor,
-      :duplicate_attribute_assignment_from_initialize_with, :duplicate_attribute_assignment_from_initialize_with=,
-      :allow_class_lookup, :allow_class_lookup=, to: :configuration
+    delegate :factories,
+             :sequences,
+             :traits,
+             :callbacks,
+             :strategies,
+             :callback_names,
+             :to_create,
+             :skip_create,
+             :initialize_with,
+             :constructor,
+             :duplicate_attribute_assignment_from_initialize_with,
+             :duplicate_attribute_assignment_from_initialize_with=,
+             :allow_class_lookup,
+             :allow_class_lookup=,
+             :use_parent_strategy,
+             :use_parent_strategy=,
+             to: :configuration
   end
 
   def self.register_factory(factory)

data/lib/factory_girl/configuration.rb

@@ -3,7 +3,7 @@ module FactoryGirl
   class Configuration
     attr_reader :factories, :sequences, :traits, :strategies, :callback_names
 
-    attr_accessor :allow_class_lookup
+    attr_accessor :allow_class_lookup, :use_parent_strategy
 
     def initialize
       @factories      = Decorator::DisallowsDuplicatesRegistry.new(Registry.new('Factory'))

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/definition.rb

@@ -125,17 +125,12 @@ module FactoryGirl
 
     def aggregate_from_traits_and_self(method_name, &block)
       compile
-      [].tap do |list|
-        base_traits.each do |trait|
-          list << trait.send(method_name)
-        end
-
-        list << instance_exec(&block)
 
-        additional_traits.each do |trait|
-          list << trait.send(method_name)
-        end
-      end.flatten.compact
+      [
+        base_traits.map(&method_name),
+        instance_exec(&block),
+        additional_traits.map(&method_name),
+      ].flatten.compact
     end
   end
 end

data/lib/factory_girl/evaluator.rb

@@ -23,7 +23,9 @@ module FactoryGirl
 
     def association(factory_name, *traits_and_overrides)
       overrides = traits_and_overrides.extract_options!
-      strategy_override = overrides.fetch(:strategy) { :create }
+      strategy_override = overrides.fetch(:strategy) do
+        FactoryGirl.use_parent_strategy ? @build_strategy.class : :create
+      end
 
       traits_and_overrides += [overrides.except(:strategy)]
 

data/lib/factory_girl/linter.rb

@@ -84,7 +84,7 @@ module FactoryGirl
 
     def error_message
       lines = invalid_factories.map do |_factory, exceptions|
-        exceptions.map &:message
+        exceptions.map(&:message)
       end.flatten
 
       <<-ERROR_MESSAGE.strip

data/lib/factory_girl/strategy/stub.rb

@@ -3,6 +3,31 @@ module FactoryGirl
     class Stub
       @@next_id = 1000
 
+      DISABLED_PERSISTENCE_METHODS = [
+        :connection,
+        :decrement!,
+        :decrement,
+        :delete,
+        :destroy!,
+        :destroy,
+        :destroyed?,
+        :increment!,
+        :increment,
+        :reload,
+        :save!,
+        :save,
+        :toggle!,
+        :toggle,
+        :touch,
+        :update!,
+        :update,
+        :update_attribute,
+        :update_attributes!,
+        :update_attributes,
+        :update_column,
+        :update_columns,
+      ].freeze
+
       def association(runner)
         runner.run(:build_stubbed)
       end
@@ -33,36 +58,10 @@ module FactoryGirl
             id.nil?
           end
 
-          def save(*args)
-            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#save(#{args.join(",")})"
-          end
-
-          def destroy(*args)
-            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#destroy(#{args.join(",")})"
-          end
-
-          def connection
-            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#connection()"
-          end
-
-          def reload(*args)
-            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#reload()"
-          end
-
-          def update_attribute(*args)
-            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#update_attribute(#{args.join(",")})"
-          end
-
-          def update_column(*args)
-            raise "stubbed models are not allowed to access the database - #{self.class.to_s}#update_column(#{args.join(",")})"
-          end
-
-          def increment!(*args)
-            raise "stubbed models are not allowed to access the database - #{self.class}#increment!(#{args.join(',')})"
-          end
-
-          def decrement!(*args)
-            raise "stubbed models are not allowed to access the database - #{self.class}#decrement!(#{args.join(',')})"
+          DISABLED_PERSISTENCE_METHODS.each do |write_method|
+            define_singleton_method(write_method) do |*args|
+              raise "stubbed models are not allowed to access the database - #{self.class}##{write_method}(#{args.join(",")})"
+            end
           end
         end
 
@@ -76,6 +75,18 @@ module FactoryGirl
             end
           end
         end
+
+        has_updated_at = result_instance.respond_to?(:updated_at)
+        updated_at_no_default = has_updated_at && !result_instance.updated_at
+        result_instance_missing_updated_at = !has_updated_at
+
+        if updated_at_no_default || result_instance_missing_updated_at
+          result_instance.instance_eval do
+            def updated_at
+              @updated_at ||= Time.current
+            end
+          end
+        end
       end
 
       def clear_changed_attributes_on_result(result_instance)

data/lib/factory_girl/strategy_syntax_method_registrar.rb

@@ -25,6 +25,10 @@ module FactoryGirl
       strategy_name = @strategy_name
 
       define_syntax_method("#{strategy_name}_list") do |name, amount, *traits_and_overrides, &block|
+        unless amount.respond_to?(:times)
+          raise ArgumentError, "count missing for #{strategy_name}_list"
+        end
+
         amount.times.map { send(strategy_name, name, *traits_and_overrides, &block) }
       end
     end

data/lib/factory_girl/syntax/methods.rb

@@ -69,13 +69,13 @@ module FactoryGirl
 
       # @!method strategy_method
       # @!visibility private
-      # @param [Symbol] name name of the factory to build
+      # @param [Symbol] name the name of the factory to build
       # @param [Array<Symbol, Symbol, Hash>] traits_and_overrides splat args traits and a hash of overrides
       # @param [Proc] block block to be executed
 
       # @!method strategy_method_list
       # @!visibility private
-      # @param [Symbol] name name of the factory to execute
+      # @param [Symbol] name the name of the factory to execute
       # @param [Integer] amount the number of instances to execute
       # @param [Array<Symbol, Symbol, Hash>] traits_and_overrides splat args traits and a hash of overrides
 
@@ -90,6 +90,22 @@ module FactoryGirl
       def generate(name)
         FactoryGirl.sequence_by_name(name).next
       end
+
+      # Generates and returns the list of values in a sequence.
+      #
+      # Arguments:
+      #   name: (Symbol)
+      #     The name of the sequence that a value should be generated for.
+      #   count: (Fixnum)
+      #     Count of values
+      #
+      # Returns:
+      #   The next value in the sequence. (Object)
+      def generate_list(name, count)
+        (1..count).map do
+          FactoryGirl.sequence_by_name(name).next
+        end
+      end
     end
   end
 end

data/lib/factory_girl/version.rb

@@ -1,3 +1,3 @@
 module FactoryGirl
-  VERSION = '4.7.0'.freeze
+  VERSION = '4.8.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
 platform: ruby
 authors:
 - Josh Clayton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -202,6 +202,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- NAME.md
 - NEWS
 - README.md
 - Rakefile
@@ -290,10 +291,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: factory_girl provides a framework and DSL for defining and using model instance
   factories.
 test_files: []
-has_rdoc: