factory_girl 4.5.0 → 4.7.0

data/Gemfile.lock

@@ -1,85 +1,102 @@
 PATH
   remote: .
   specs:
-    factory_girl (4.5.0)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    appraisal (1.0.0)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
+      builder (~> 3.1)
+    activerecord (4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
+      arel (~> 6.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 (4.2.5.1)
+      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 (4.0.2)
-    aruba (0.5.3)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    atomic (1.1.10)
-    atomic (1.1.10-java)
-    bourne (1.5.0)
-      mocha (>= 0.13.2, < 0.15)
-    builder (3.1.4)
-    childprocess (0.3.9)
+    arel (6.0.3)
+    aruba (0.13.0)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    bourne (1.6.0)
+      mocha (~> 1.1)
+    builder (3.2.2)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.15)
+    contracts (0.13.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.1)
-    diff-lcs (1.1.3)
-    ffi (1.9.0)
-    ffi (1.9.0-java)
+      multi_test (>= 0.1.2)
+    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.6.4)
-    metaclass (0.0.1)
-    minitest (4.7.5)
-    mocha (0.14.0)
+    i18n (0.7.0)
+    jdbc-sqlite3 (3.8.11.2)
+    json (1.8.3)
+    json (1.8.3-java)
+    metaclass (0.0.4)
+    minitest (5.8.4)
+    mocha (1.1.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.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sqlite3 (1.3.8)
+    multi_json (1.11.2)
+    multi_test (0.1.2)
+    rake (10.5.0)
+    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-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    simplecov (0.11.2)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sqlite3 (1.3.11)
     thor (0.19.1)
-    thread_safe (0.1.2)
-      atomic
-    thread_safe (0.1.2-java)
-      atomic
-    timecop (0.6.2.2)
-    tzinfo (0.3.37)
-    yard (0.8.7)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
+    timecop (0.8.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   java
@@ -87,14 +104,20 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 3.0.0)
-  appraisal (~> 1.0.0)
+  activerecord-jdbcsqlite3-adapter
+  appraisal (~> 2.1.0)
   aruba
   bourne
   cucumber (~> 1.3.15)
   factory_girl!
+  jdbc-sqlite3
   mocha (>= 0.12.8)
-  rspec (~> 2.12.0)
+  rspec (~> 3.0)
+  rspec-its (~> 1.0)
   simplecov
-  sqlite3
+  sqlite3 (~> 1.3.10)
   timecop
   yard
+
+BUNDLED WITH
+   1.11.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2014 Joe Ferris and thoughtbot, inc.
+Copyright (c) 2008-2016 Joe Ferris and thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS

@@ -1,3 +1,14 @@
+4.7.0 (April 1, 2016)
+  Improve documentation
+  Improve instrumentation payload to include traits, overrides, and the factory itself
+  Allow linting of traits
+  Deprecate factory lookup by class name in preparation for 5.0
+  Improve internal performance by using flat_map instead of map and compact
+  Improve handling of dirty attributes after building a stubbed object
+  Reduce warnings from redefining methods
+
+4.6.0 (skipped)
+
 4.5.0 (October 17, 2014)
   Improve FactoryGirl.lint by including exception and message in output
   Allow selective linting
@@ -113,7 +124,7 @@
 
 2.6.3 (March 9, 2012)
   Fix issue with traits not being present the first time a factory is accessed
-  Update available Cucumber step definitions to not require a trialing colon
+  Update available Cucumber step definitions to not require a trailing colon
     when building a table of attributes to instantiate records with
 
 2.6.2 (March 9, 2012)

data/README.md

@@ -1,4 +1,4 @@
-# factory_girl [![Build Status](https://secure.travis-ci.org/thoughtbot/factory_girl.png)](http://travis-ci.org/thoughtbot/factory_girl?branch=master) [![Dependency Status](https://gemnasium.com/thoughtbot/factory_girl.png)](https://gemnasium.com/thoughtbot/factory_girl) [![Code Climate](https://codeclimate.com/github/thoughtbot/factory_girl.png)](https://codeclimate.com/github/thoughtbot/factory_girl)
+# factory_girl [![Build Status](https://travis-ci.org/thoughtbot/factory_girl.svg)](http://travis-ci.org/thoughtbot/factory_girl?branch=master) [![Dependency Status](https://gemnasium.com/thoughtbot/factory_girl.svg)](https://gemnasium.com/thoughtbot/factory_girl) [![Code Climate](https://img.shields.io/codeclimate/github/thoughtbot/factory_girl.svg)](https://codeclimate.com/github/thoughtbot/factory_girl)
 
 factory_girl is a fixtures replacement with a straightforward definition syntax, support for multiple build strategies (saved instances, unsaved instances, attribute hashes, and stubbed objects), and support for multiple factories for the same class (user, admin_user, and so on), including factory inheritance.
 
@@ -10,7 +10,10 @@ Documentation
 
 You should find the documentation for your version of factory_girl on [Rubygems](https://rubygems.org/gems/factory_girl).
 
-See [GETTING_STARTED] for information on defining and using factories.
+See [GETTING_STARTED] for information on defining and using factories. We also
+have [a detailed introductory video][], available for free on Upcase.
+
+[a detailed introductory video]: https://upcase.com/videos/factory-girl?utm_source=github&utm_medium=open-source&utm_campaign=factory-girl
 
 Install
 --------
@@ -49,20 +52,28 @@ Contributing
 
 Please see [CONTRIBUTING.md](https://github.com/thoughtbot/factory_girl/blob/master/CONTRIBUTING.md).
 
-Credits
--------
-
 factory_girl was originally written by Joe Ferris and is now maintained by Josh
 Clayton. Many improvements and bugfixes were contributed by the [open source
 community](https://github.com/thoughtbot/factory_girl/graphs/contributors).
 
-![thoughtbot](http://thoughtbot.com/assets/tm/logo.png)
+License
+-------
+
+factory_girl is Copyright © 2008-2016 Joe Ferris and thoughtbot. It is free
+software, and may be redistributed under the terms specified in the
+[LICENSE](/LICENSE) file.
+
+About thoughtbot
+----------------
 
-factory_girl is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community)
+![thoughtbot](https://thoughtbot.com/logo.png)
 
+factory_girl is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
-License
--------
+We love open source software!
+See [our other projects][community] or
+[hire us][hire] to design, develop, and grow your product.
 
-factory_girl is Copyright © 2008-2014 Joe Ferris and thoughtbot. It is free software, and may be redistributed under the terms specified in the [LICENSE](https://github.com/thoughtbot/factory_girl/blob/master/LICENSE) file.
+[community]: https://thoughtbot.com/community?utm_source=github
+[hire]: https://thoughtbot.com?utm_source=github

data/Rakefile

@@ -9,9 +9,7 @@ require 'cucumber/rake/task'
 Bundler::GemHelper.install_tasks
 
 desc 'Default: run the specs and features.'
-task :default do
-  system("bundle exec rake -s appraisal spec:unit spec:acceptance features;")
-end
+task default: %w(spec:unit spec:acceptance features)
 
 namespace :spec do
   desc "Run unit specs"

data/factory_girl.gemspec

@@ -10,10 +10,9 @@ Gem::Specification.new do |s|
                       using factories - less error-prone, more explicit, and
                       all-around easier to work with than fixtures.}
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- Appraisals {spec,features,gemfiles}/*`.split("\n")
+  s.files         = `git ls-files`.split("\n").reject { |f| f.match(%r{^(spec|features)/}) }
 
-  s.require_paths = ['lib']
+  s.require_path = 'lib'
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
 
   s.authors = ["Josh Clayton", "Joe Ferris"]
@@ -23,24 +22,17 @@ Gem::Specification.new do |s|
 
   s.add_dependency("activesupport", ">= 3.0.0")
 
-  s.add_development_dependency("rspec",    "~> 2.12.0")
+  s.add_development_dependency("rspec",    "~> 3.0")
+  s.add_development_dependency("rspec-its", "~> 1.0")
   s.add_development_dependency("cucumber", "~> 1.3.15")
   s.add_development_dependency("timecop")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("aruba")
   s.add_development_dependency("mocha", ">= 0.12.8")
   s.add_development_dependency("bourne")
-  s.add_development_dependency("appraisal", "~> 1.0.0")
+  s.add_development_dependency("appraisal", "~> 2.1.0")
   s.add_development_dependency("activerecord", ">= 3.0.0")
-
-  if RUBY_PLATFORM == "java"
-    s.add_development_dependency("activerecord-jdbcsqlite3-adapter")
-    s.add_development_dependency("jdbc-sqlite3")
-  else
-    s.add_development_dependency("sqlite3")
-  end
-
   s.add_development_dependency("yard")
+
   s.license = "MIT"
 end
-

data/gemfiles/3.2.gemfile

@@ -2,6 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.2.15"
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "jdbc-sqlite3", :platforms => :jruby
+gem "sqlite3", "~> 1.3.10", :platforms => :ruby
+gem "activerecord", :git => "https://github.com/rails/rails.git", :branch => "3-2-stable"
 
 gemspec :path => "../"

data/gemfiles/3.2.gemfile.lock

@@ -1,91 +1,123 @@
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: 9892626579d1c62c367e5344a1d1642708340f88
+  branch: 3-2-stable
+  specs:
+    activemodel (3.2.22.1)
+      activesupport (= 3.2.22.1)
+      builder (~> 3.0.0)
+    activerecord (3.2.22.1)
+      activemodel (= 3.2.22.1)
+      activesupport (= 3.2.22.1)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.22.1)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+
 PATH
   remote: ../
   specs:
-    factory_girl (4.5.0)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.15)
-      activesupport (= 3.2.15)
-      builder (~> 3.0.0)
-    activerecord (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    appraisal (1.0.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)
+    appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (3.0.2)
-    aruba (0.5.3)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    bourne (1.5.0)
-      mocha (>= 0.13.2, < 0.15)
+    arel (3.0.3)
+    aruba (0.13.0)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    bourne (1.6.0)
+      mocha (~> 1.1)
     builder (3.0.4)
-    childprocess (0.3.9)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.15)
+    contracts (0.13.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.1)
-    diff-lcs (1.1.3)
-    docile (1.1.3)
-    ffi (1.9.3)
-    ffi (1.9.3-java)
+      multi_test (>= 0.1.2)
+    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.6.9)
+    i18n (0.7.0)
+    jdbc-sqlite3 (3.8.11.2)
+    json (1.8.3)
+    json (1.8.3-java)
     metaclass (0.0.4)
-    mocha (0.14.0)
+    mocha (1.1.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)
+    multi_json (1.11.2)
+    multi_test (0.1.2)
+    rake (10.5.0)
+    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-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sqlite3 (1.3.8)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sqlite3 (1.3.11)
     thor (0.19.1)
-    timecop (0.7.1)
-    tzinfo (0.3.39)
-    yard (0.8.7.3)
+    timecop (0.8.0)
+    tzinfo (0.3.46)
+    yard (0.8.7.6)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.2.15)
-  appraisal (~> 1.0.0)
+  activerecord!
+  activerecord-jdbcsqlite3-adapter
+  appraisal (~> 2.1.0)
   aruba
   bourne
   cucumber (~> 1.3.15)
   factory_girl!
+  jdbc-sqlite3
   mocha (>= 0.12.8)
-  rspec (~> 2.12.0)
+  rspec (~> 3.0)
+  rspec-its (~> 1.0)
   simplecov
-  sqlite3
+  sqlite3 (~> 1.3.10)
   timecop
   yard
+
+BUNDLED WITH
+   1.11.2