factory_girl 4.4.0 → 4.5.0

data/gemfiles/3.2.gemfile

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

data/gemfiles/3.2.gemfile.lock

@@ -1,11 +1,11 @@
 PATH
-  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  remote: ../
   specs:
-    factory_girl (4.4.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.15)
       activesupport (= 3.2.15)
@@ -18,9 +18,10 @@ GEM
     activesupport (3.2.15)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    appraisal (0.5.2)
+    appraisal (1.0.0)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (3.0.2)
     aruba (0.5.3)
       childprocess (>= 0.3.6)
@@ -31,21 +32,27 @@ GEM
     builder (3.0.4)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.5)
+    cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.7)
-      multi_json (~> 1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
     diff-lcs (1.1.3)
+    docile (1.1.3)
     ffi (1.9.3)
-    gherkin (2.11.8)
+    ffi (1.9.3-java)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    gherkin (2.12.2-java)
       multi_json (~> 1.3)
-    i18n (0.6.5)
-    metaclass (0.0.1)
+    i18n (0.6.9)
+    metaclass (0.0.4)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    rake (10.1.0)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    rake (10.3.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -54,24 +61,27 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     sqlite3 (1.3.8)
-    timecop (0.6.3)
-    tzinfo (0.3.38)
+    thor (0.19.1)
+    timecop (0.7.1)
+    tzinfo (0.3.39)
     yard (0.8.7.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.2.15)
-  appraisal (~> 0.5.1)
+  appraisal (~> 1.0.0)
   aruba
   bourne
-  cucumber (~> 1.2.1)
+  cucumber (~> 1.3.15)
   factory_girl!
   mocha (>= 0.12.8)
   rspec (~> 2.12.0)

data/gemfiles/4.0.gemfile

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

data/gemfiles/4.0.gemfile.lock

@@ -1,61 +1,63 @@
 PATH
-  remote: ..
+  remote: ../
   specs:
-    factory_girl (4.4.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (4.0.1)
-      activesupport (= 4.0.1)
+    activemodel (4.0.5)
+      activesupport (= 4.0.5)
       builder (~> 3.1.0)
-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
+    activerecord (4.0.5)
+      activemodel (= 4.0.5)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.1)
+      activesupport (= 4.0.5)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.1)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.5)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    appraisal (0.5.2)
+    appraisal (1.0.0)
       bundler
       rake
-    arel (4.0.1)
+      thor (>= 0.14.0)
+    arel (4.0.2)
     aruba (0.5.3)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    atomic (1.1.14)
-    atomic (1.1.14-java)
     bourne (1.5.0)
       mocha (>= 0.13.2, < 0.15)
     builder (3.1.4)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.5)
+    cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.7)
-      multi_json (~> 1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
     diff-lcs (1.1.3)
+    docile (1.1.3)
     ffi (1.9.3)
     ffi (1.9.3-java)
-    gherkin (2.11.8)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
-    gherkin (2.11.8-java)
+    gherkin (2.12.2-java)
       multi_json (~> 1.3)
-    i18n (0.6.5)
-    metaclass (0.0.1)
+    i18n (0.6.9)
+    metaclass (0.0.4)
     minitest (4.7.5)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    rake (10.1.0)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    rake (10.3.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -64,17 +66,17 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     sqlite3 (1.3.8)
-    thread_safe (0.1.3)
-      atomic
-    thread_safe (0.1.3-java)
-      atomic
-    timecop (0.6.3)
-    tzinfo (0.3.38)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
+    timecop (0.7.1)
+    tzinfo (0.3.39)
     yard (0.8.7.3)
 
 PLATFORMS
@@ -83,10 +85,10 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 4.0.1)
-  appraisal (~> 0.5.1)
+  appraisal (~> 1.0.0)
   aruba
   bourne
-  cucumber (~> 1.2.1)
+  cucumber (~> 1.3.15)
   factory_girl!
   mocha (>= 0.12.8)
   rspec (~> 2.12.0)

data/gemfiles/4.1.gemfile

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

data/gemfiles/4.1.gemfile.lock

@@ -0,0 +1,93 @@
+PATH
+  remote: ../
+  specs:
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
+      arel (~> 5.0.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (1.0.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (5.0.1.20140414130214)
+    aruba (0.5.4)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    bourne (1.5.0)
+      mocha (>= 0.13.2, < 0.15)
+    builder (3.2.2)
+    childprocess (0.5.3)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.3.15)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    diff-lcs (1.1.3)
+    docile (1.1.3)
+    ffi (1.9.3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    i18n (0.6.9)
+    json (1.8.1)
+    metaclass (0.0.4)
+    minitest (5.3.4)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    rake (10.3.2)
+    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.2)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    timecop (0.7.1)
+    tzinfo (1.2.0)
+      thread_safe (~> 0.1)
+    yard (0.8.7.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.1.1)
+  appraisal (~> 1.0.0)
+  aruba
+  bourne
+  cucumber (~> 1.3.15)
+  factory_girl!
+  mocha (>= 0.12.8)
+  rspec (~> 2.12.0)
+  simplecov
+  sqlite3
+  timecop
+  yard

data/lib/factory_girl.rb

@@ -43,6 +43,7 @@ require 'factory_girl/decorator/class_key_hash'
 require 'factory_girl/decorator/disallows_duplicates_registry'
 require 'factory_girl/decorator/invocation_tracker'
 require 'factory_girl/decorator/new_constructor'
+require 'factory_girl/linter'
 require 'factory_girl/version'
 
 module FactoryGirl
@@ -54,24 +55,8 @@ module FactoryGirl
     @configuration = nil
   end
 
-  def self.lint
-    invalid_factories = FactoryGirl.factories.select do |factory|
-      built_factory = FactoryGirl.build(factory.name)
-
-      if built_factory.respond_to?(:valid?)
-        !built_factory.valid?
-      end
-    end
-
-    if invalid_factories.any?
-      error_message = <<-ERROR_MESSAGE.strip
-The following factories are invalid:
-
-#{invalid_factories.map {|factory| "* #{factory.name}" }.join("\n")}
-      ERROR_MESSAGE
-
-      raise InvalidFactoryError, error_message
-    end
+  def self.lint(factories_to_lint = FactoryGirl.factories)
+    Linter.lint!(factories_to_lint)
   end
 
   class << self

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

data/lib/factory_girl/definition_proxy.rb

@@ -52,6 +52,12 @@ module FactoryGirl
     end
 
     def ignore(&block)
+      ActiveSupport::Deprecation.warn "`#ignore` is deprecated and will be "\
+        "removed in 5.0. Please use `#transient` instead."
+      transient &block
+    end
+
+    def transient(&block)
       proxy = DefinitionProxy.new(@definition, true)
       proxy.instance_eval(&block)
     end

data/lib/factory_girl/find_definitions.rb

@@ -13,7 +13,7 @@ module FactoryGirl
     absolute_definition_file_paths = definition_file_paths.map { |path| File.expand_path(path) }
 
     absolute_definition_file_paths.uniq.each do |path|
-      load("#{path}.rb") if File.exists?("#{path}.rb")
+      load("#{path}.rb") if File.exist?("#{path}.rb")
 
       if File.directory? path
         Dir[File.join(path, '**', '*.rb')].sort.each do |file|

data/lib/factory_girl/linter.rb

@@ -0,0 +1,46 @@
+module FactoryGirl
+  class Linter
+    def self.lint!(factories_to_lint)
+      new(factories_to_lint).lint!
+    end
+
+    def initialize(factories_to_lint)
+      @factories_to_lint = factories_to_lint
+      @invalid_factories = calculate_invalid_factories
+    end
+
+    def lint!
+      if invalid_factories.any?
+        raise InvalidFactoryError, error_message
+      end
+    end
+
+    private
+
+    attr_reader :factories_to_lint, :invalid_factories
+
+    def calculate_invalid_factories
+      factories_to_lint.inject({}) do |result, factory|
+        begin
+          FactoryGirl.create(factory.name)
+        rescue => error
+          result[factory] = error
+        end
+
+        result
+      end
+    end
+
+    def error_message
+      lines = invalid_factories.map do |factory, exception|
+        "* #{factory.name} - #{exception.message} (#{exception.class.name})"
+      end
+
+      <<-ERROR_MESSAGE.strip
+The following factories are invalid:
+
+#{lines.join("\n")}
+      ERROR_MESSAGE
+    end
+  end
+end