factory_girl_rails 4.4.1 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01887919091f51f514aa6c448e01412c3192ce93
-  data.tar.gz: a06ee1b5517f18339e9710daf5789f23b04d94db
+  metadata.gz: 501700716b0d0a25dc9aeb99c35b1f85964bde77
+  data.tar.gz: 5b07b7d3b1f472f8ea85d1ea63ad9dd0d91a232c
 SHA512:
-  metadata.gz: a4d39a6978b84daf6ba5b99ae1cb665b5e1343a727a03813cb78014ac8546341cb12502bac4cbafee89e341e6a51cfc99dfa81e741ed2694115714414b9095ce
-  data.tar.gz: 45b3c4dd78a974521b74dbcb730626747d96ee9f0f58c2d8da6ad110f13750255fcb65ef32a30b90ed74a529ad32b663463e456cc3efa3afa5718f66ee5544c6
+  metadata.gz: 4261217f6d01aabccf3de6f61fd613434cf9c3694d2f6d4ed5a9f321890857644fb268bb32542a903091003b18373020e58e8f2d48a760bf110c659904b35bc1
+  data.tar.gz: 36c64ec1a1a9f3fc079fa925a8155b0872d17ddf9fedf4e937baae457d2b7ccf98fd3eeb0b6bf06b0acf9b77d5ba9471fa6548e1900d321040b04164450788da

data/.gitignore

@@ -1,9 +1,9 @@
 *.swp
-test.db
-factory_girl_rails-*.gem
-tmp
-rdoc
+.bundle
+gemfiles/*.lock
 coverage
+factory_girl_rails-*.gem
 pkg
-.bundle
-Gemfile.lock
+rdoc
+test.db
+tmp

data/.travis.yml

@@ -1,16 +1,20 @@
+language: ruby
+cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2
   - jruby-19mode
-before_install:
-  - gem update --system
-  - gem install turn --version 0.8.2
-  - gem install turn --version 0.8.3
 jdk:
   - openjdk6
-gemfile:
-  - gemfiles/rails3.1.gemfile
-  - gemfiles/rails3.2.gemfile
 branches:
   only:
     - master
+install:
+  - "travis_retry bundle install"
+  - "bundle exec appraisal generate"
+  - "travis_retry bundle exec appraisal install"
+gemfile:
+  - gemfiles/rails3.2.gemfile
+  - gemfiles/rails4.0.gemfile
+  - gemfiles/rails4.1.gemfile

data/Appraisals

@@ -1,25 +1,16 @@
-appraise "rails3.1" do
-  gem "rails", "3.1.10"
-  gem "sass-rails"
-  gem "coffee-rails"
-  gem "uglifier"
-  gem "sqlite3", ">= 1.3.4", platforms: :mri
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
-  gem "minitest-rails"
-  gem "therubyrhino"
-  gem "jquery-rails"
-  gem "rspec-rails"
+# These are the versions of Rails we want to test against.
+appraise 'rails3.2' do
+  gem 'rails', '~> 3.2.18'
+  gem 'sass-rails'
 end
 
-appraise "rails3.2" do
-  gem "rails", "3.2.11"
-  gem "sass-rails"
-  gem "coffee-rails"
-  gem "uglifier"
-  gem "sqlite3", ">= 1.3.4", platforms: :mri
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
-  gem "minitest-rails"
-  gem "therubyrhino"
-  gem "jquery-rails"
-  gem "rspec-rails"
+appraise 'rails4.0' do
+  gem 'rails', '~> 4.0.5'
+  gem 'sass-rails'
+end
+
+appraise 'rails4.1' do
+  gem 'rails', '~> 4.1.1'
+  gem 'sass-rails', '~> 4.0.3'
+  gem 'spring'
 end

data/CONTRIBUTING.md

@@ -1,38 +1,36 @@
-We love pull requests. Here's a quick guide:
+# Contributing
 
-1. Fork the repo.
+We love pull requests. Here's a quick guide.
 
-2. Run the tests. We only take pull requests with passing tests, and it's great
-to know that you have a clean slate: `bundle && rake`
+Fork, then clone the repo:
 
-3. Add a test for your change. Only refactoring and documentation changes
-require no new tests. If you are adding functionality or fixing a bug, we need
-a test!
+    git clone git@github.com:your-username/factory_girl_rails.git
 
-4. Make the test pass.
+Set up your machine:
 
-5. Push to your fork and submit a pull request.
+    ./bin/setup
 
+Make sure the tests pass:
 
-At this point you're waiting on us. We like to at least comment on, if not
-accept, pull requests within three business days (and, typically, one business
-day). We may suggest some changes or improvements or alternatives.
+    rake
 
-Some things that will increase the chance that your pull request is accepted,
-taken straight from the Ruby on Rails guide:
+Make your change. Add tests for your change. Make the tests pass:
 
-* Use Rails idioms and helpers
-* Include tests that fail without your code, and pass with it
-* Update the documentation, the surrounding one, examples elsewhere, guides,
-  whatever is affected by your contribution
+    rake
 
-Syntax:
+Push to your fork and [submit a pull request][pr].
 
-* Two spaces, no tabs.
-* No trailing whitespace. Blank lines should not have any space.
-* Prefer &&/|| over and/or.
-* MyClass.my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-* a = b and not a=b.
-* Follow the conventions you see used in the source already.
+[pr]: https://github.com/thoughtbot/factory_girl_rails/compare/
 
-And in case we didn't emphasize it enough: we love tests!
+At this point you're waiting on us. We like to at least comment on pull requests
+within three business days (and, typically, one business day). We may suggest
+some changes or improvements or alternatives.
+
+Some things that will increase the chance that your pull request is accepted:
+
+* Write tests.
+* Follow our [style guide][style].
+* Write a [good commit message][commit].
+
+[style]: https://github.com/thoughtbot/guides/tree/master/style
+[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

data/Gemfile

@@ -1,3 +1,20 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
+
+gem 'appraisal'
+gem 'aruba'
+gem 'coffee-rails'
+gem 'cucumber'
+gem 'jquery-rails'
+gem 'rake'
+gem 'rspec-rails'
+gem 'uglifier'
+
+if RUBY_PLATFORM == 'java'
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jdbc-sqlite3'
+  gem 'therubyrhino'
+else
+  gem 'sqlite3'
+end

data/Gemfile.lock

@@ -0,0 +1,112 @@
+PATH
+  remote: .
+  specs:
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.1.1)
+      actionview (= 4.1.1)
+      activesupport (= 4.1.1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    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)
+    aruba (0.5.4)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.2.2)
+    childprocess (0.5.3)
+      ffi (~> 1.0, >= 1.0.11)
+    coffee-rails (4.0.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.0)
+    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.2.5)
+    erubis (2.7.0)
+    execjs (2.0.2)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    ffi (1.9.3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    i18n (0.6.9)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    minitest (5.3.4)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    railties (4.1.1)
+      actionpack (= 4.1.1)
+      activesupport (= 4.1.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.3.2)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.3)
+    tzinfo (1.2.0)
+      thread_safe (~> 0.1)
+    uglifier (2.5.0)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  aruba
+  coffee-rails
+  cucumber
+  factory_girl_rails!
+  jquery-rails
+  rake
+  rspec-rails
+  sqlite3
+  uglifier

data/README.md

@@ -1,73 +1,74 @@
-factory_girl [![Build Status](https://secure.travis-ci.org/thoughtbot/factory_girl_rails.png)](http://travis-ci.org/thoughtbot/factory_girl_rails?branch=master)
-============
+# factory_girl_rails [![Build Status][ci-image]][ci] [![Code Climate][grade-image]][grade]
 
-`factory_girl` is a fixtures replacement with a straightforward definition
+[factory_girl][fg] 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.
 
-Rails
------
+## Rails
 
-`factory_girl_rails` provides Rails integration for `factory_girl`. All
-Rails-specific features are only compatible with Rails 3.
+factory_girl_rails provides Rails integration for [factory_girl][fg].
 
 Currently, automatic factory definition loading is the only Rails-specific feature.
 
-Download
---------
+Supported Rails versions are listed in [`Appraisals`](Appraisals). Supported
+Ruby versions are listed in [`.travis.yml`](.travis.yml).
 
-Github: http://github.com/thoughtbot/factory_girl_rails/tree/master
+## Download
+
+Github: http://github.com/thoughtbot/factory_girl_rails
 
 Gem:
 
     gem install factory_girl_rails
 
-Configuration
--------------
+## Configuration
 
 Add `factory_girl_rails` to your Gemfile:
 
-    gem 'factory_girl_rails'
+```ruby
+gem 'factory_girl_rails'
+```
 
 Generators for factories will automatically substitute fixture (and maybe any other
 `fixture_replacement` you set). If you want to disable this feature, add the
 following to your application.rb file:
 
-    config.generators do |g|
-      g.factory_girl false
-    end
+```ruby
+config.generators do |g|
+  g.factory_girl false
+end
+```
 
 Default factories directory is `test/factories`, or `spec/factories` if
 `test_framework` generator is set to `:rspec`; change this behavior with:
 
-    config.generators do |g|
-      g.factory_girl dir: 'custom/dir/for/factories'
-    end
-
-If you use `factory_girl` for fixture replacement, ensure that
-`factory_girl_rails` is available in the development group. If it's not, Rails
-will generate standard yml files instead of factory files.
+```ruby
+config.generators do |g|
+  g.factory_girl dir: 'custom/dir/for/factories'
+end
+```
 
-`factory_girl` takes an option `suffix: 'some_suffix'`
-to generate factories as "modelname_some_suffix.rb"
+If you use factory_girl for fixture replacement, ensure that
+factory_girl_rails is available in the development group. If it's not, Rails
+will generate standard .yml files instead of factory files.
 
-More Information
-----------------
+factory_girl takes an option `suffix: 'some_suffix'` to generate factories as
+`modelname_some_suffix.rb`.
 
-factory_girl: http://github.com/thoughtbot/factory_girl/tree/master
+If you use factory_girl for fixture replacement and already have a
+`factories.rb` file in the directory that contains your tests,
+factory_girl_rails will insert new factory definitions at the top of
+`factories.rb`.
 
+## Contributing
 
-Contributing
-------------
+Please see [CONTRIBUTING.md](CONTRIBUTING.md).
 
-Please see CONTRIBUTING.md for details.
+## Credits
 
-Credits
--------
-
-factory_girl was originally written by Joe Ferris.
+[factory_girl][fg] was originally written by Joe Ferris.
 
 ![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
 
@@ -75,7 +76,14 @@ factory_girl is maintained and funded by [thoughtbot, inc](http://thoughtbot.com
 
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
-License
--------
+## License
+
+factory_girl_rails is Copyright © 2008-2014 Joe Ferris and thoughtbot. It is free
+software, and may be redistributed under the terms specified in the
+[LICENSE]() file.
 
-factory_girl is Copyright © 2008-2013 Joe Ferris and thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+[fg]: https://github.com/thoughtbot/factory_girl
+[ci]: http://travis-ci.org/thoughtbot/factory_girl_rails?branch=master
+[ci-image]: https://secure.travis-ci.org/thoughtbot/factory_girl_rails.png
+[grade]: https://codeclimate.com/github/thoughtbot/factory_girl_rails
+[grade-image]: https://codeclimate.com/github/thoughtbot/factory_girl_rails.png

data/bin/setup

@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# Run this script immediately after cloning the codebase.
+
+# Exit if any subcommand fails
+set -e
+
+# Set up Ruby dependencies via Bundler
+bundle install
+
+# Add binstubs to PATH in ~/.zshenv like this:
+#   export PATH=".git/safe/../../bin:$PATH"
+mkdir -p .git/safe
+
+# Set up Appraisal to help us test against multiple Rails versions
+bundle exec appraisal install

data/factory_girl_rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = %q{factory_girl_rails}
-  s.version     = '4.4.1'
+  s.version     = '4.5.0'
   s.authors     = ["Joe Ferris"]
   s.email       = %q{jferris@thoughtbot.com}
   s.homepage    = "http://github.com/thoughtbot/factory_girl_rails"
@@ -11,17 +11,11 @@ Gem::Specification.new do |s|
     loading)}
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- Appraisals {spec,features,gemfiles}/*`.split("\n")
+  s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.license       = "MIT"
 
   s.add_runtime_dependency('railties', '>= 3.0.0')
-  s.add_runtime_dependency('factory_girl', '~> 4.4.0')
-
-  s.add_development_dependency('appraisal', '~> 0.5.0')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 2.11.0')
-  s.add_development_dependency('cucumber', '~> 1.2.1')
-  s.add_development_dependency('aruba', '~> 0.5.1')
+  s.add_runtime_dependency('factory_girl', '~> 4.5.0')
 end