factory_girl_rails 4.2.1 → 4.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3f8599789699a822929a317bc82c18e53126a4d7
+  data.tar.gz: 0a7b99c91f111419557818326ad798355dcc0ff9
+SHA512:
+  metadata.gz: 91998a0b8a59743ddd576186cd51785c9a313a6e3369db9664a066000ce39be832ec5e3ba58e98d59af28c51b28307b4a89882ee8544807cf21347e3277c9154
+  data.tar.gz: 1bec093d99711c34888ee1fef8665a04f1bd92263fe0dfa60fd99e459d93005f8446702694ac6a05c1a58e35bad7ca9afb36a760c5d55ad5baa37f394f2ff11a

data/.travis.yml

@@ -1,6 +1,6 @@
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-19mode
 before_install:
   - gem update --system
@@ -9,7 +9,6 @@ before_install:
 jdk:
   - openjdk6
 gemfile:
-  - gemfiles/rails3.0.gemfile
   - gemfiles/rails3.1.gemfile
   - gemfiles/rails3.2.gemfile
 branches:

data/Appraisals

@@ -1,13 +1,3 @@
-appraise "rails3.0" do
-  gem "rails", "3.0.20"
-  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"
-end
-
 appraise "rails3.1" do
   gem "rails", "3.1.10"
   gem "sass-rails"

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec

data/NEWS

@@ -0,0 +1,9 @@
+4.2.1 (February 8, 2013)
+  Fix bug when configuring FG and RSpec fixture directory
+  Remove debugging
+  Require factory_girl_rails explicitly in generator
+
+4.2.0 (January 25, 2013)
+  Add appraisal and get test suite working reliably with turn gem
+  Support MiniTest
+  Allow a custom directory for factories to be specified

data/README.md

@@ -1,16 +1,16 @@
 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 is a fixtures replacement with a straightforward definition
+`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
+factories for the same class (`user`, `admin_user`, and so on), including factory
 inheritance.
 
 Rails
 -----
 
-factory_girl_rails provides Rails integration for factory_girl. All
+`factory_girl_rails` provides Rails integration for `factory_girl`. All
 Rails-specific features are only compatible with Rails 3.
 
 Currently, automatic factory definition loading is the only Rails-specific feature.
@@ -27,25 +27,31 @@ Gem:
 Configuration
 -------------
 
-Add factory_girl_rails to your Gemfile:
+Add `factory_girl_rails` to your Gemfile:
 
     gem 'factory_girl_rails'
 
-Optionally, to have rails generators automatically generate factories instead
-of fixtures, add the following to your application.rb file:
+Generators for factories will automatically substitute fixture (and maybe any other
+`fixture_replacement` you set). If you want disable this feature, add the
+following to your application.rb file:
 
     config.generators do |g|
-      g.fixture_replacement :factory_girl
+      g.factory_girl false
     end
 
-`fixture_replacement :factory_girl` takes an option `:suffix => 'some_suffix'`
-to generate factories as "modelname_some_suffix.rb"
+Default factories directory is `test/factories`, or `spec/factories` if
+`test_framework` generator is set to `:rspec`; change this behavior with:
 
-Cucumber Integration
---------------------
+    config.generators do |g|
+      g.factory_girl dir: 'custom/dir/for/factories'
+    end
 
-factory_girl ships with step definitions for Cucumber integration. For more information, see the GETTING_STARTED file in the factory_girl repo.
+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.
 
+`factory_girl` takes an option `suffix: 'some_suffix'`
+to generate factories as "modelname_some_suffix.rb"
 
 More Information
 ----------------

data/factory_girl_rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = %q{factory_girl_rails}
-  s.version     = '4.2.1'
+  s.version     = '4.3.0'
   s.authors     = ["Joe Ferris"]
   s.email       = %q{jferris@thoughtbot.com}
   s.homepage    = "http://github.com/thoughtbot/factory_girl_rails"
@@ -14,9 +14,10 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- Appraisals {spec,features,gemfiles}/*`.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.2.0')
+  s.add_runtime_dependency('factory_girl', '~> 4.3.0')
 
   s.add_development_dependency('appraisal', '~> 0.5.0')
   s.add_development_dependency('rake')

data/features/fixture_replacement_config.feature

@@ -77,3 +77,16 @@ Feature:
     But the following files should not exist:
       | spec/fixtures/users.yml |
     And the file "test/models/user_test.rb" should contain "MiniTest::Rails::ActiveSupport::TestCase"
+
+  Scenario: Disable Factory Girl generator
+    When I configure the factories as:
+      """
+      config.generators do |g|
+        g.factory_girl false
+      end
+      """
+    And I run `bundle install` with a clean environment
+    And I run `bundle exec rails generate model User name:string` with a clean environment
+    Then the following files should not exist:
+      | test/factories/users.rb |
+      | spec/factories/users.rb |

data/gemfiles/rails3.1.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "rails", "3.1.10"
 gem "sass-rails"

data/gemfiles/rails3.1.gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
   specs:
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.3.0)
+      factory_girl (~> 4.3.0)
       railties (>= 3.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.1.10)
       actionpack (= 3.1.10)
@@ -63,7 +63,7 @@ GEM
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (4.2.0)
+    factory_girl (4.3.0)
       activesupport (>= 3.0.0)
     ffi (1.3.1)
     gherkin (2.11.6)

data/gemfiles/rails3.2.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "rails", "3.2.11"
 gem "sass-rails"

data/gemfiles/rails3.2.gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
   specs:
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.3.0)
+      factory_girl (~> 4.3.0)
       railties (>= 3.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.2.11)
       actionpack (= 3.2.11)
@@ -62,7 +62,7 @@ GEM
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (4.2.0)
+    factory_girl (4.3.0)
       activesupport (>= 3.0.0)
     ffi (1.3.1)
     gherkin (2.11.6)

data/lib/factory_girl_rails.rb

@@ -1,2 +1,4 @@
 require 'factory_girl_rails/railtie'
 
+module FactoryGirlRails
+end

data/lib/factory_girl_rails/generator.rb

@@ -0,0 +1,43 @@
+require 'factory_girl_rails/generators/rspec_generator'
+require 'factory_girl_rails/generators/non_rspec_generator'
+require 'factory_girl_rails/generators/null_generator'
+
+module FactoryGirlRails
+  class Generator
+    def initialize(config)
+      @generators = if config.respond_to?(:app_generators)
+                      config.app_generators
+                    else
+                      config.generators
+                    end
+    end
+
+    def run
+      generator.new(@generators).run
+    end
+
+    def generator
+      if factory_girl_disabled?
+        Generators::NullGenerator
+      else
+        if test_framework == :rspec
+          Generators::RSpecGenerator
+        else
+          Generators::NonRSpecGenerator
+        end
+      end
+    end
+
+    def test_framework
+      rails_options[:test_framework]
+    end
+
+    def factory_girl_disabled?
+      rails_options[:factory_girl] == false
+    end
+
+    def rails_options
+      @generators.options[:rails]
+    end
+  end
+end

data/lib/factory_girl_rails/generators/non_rspec_generator.rb

@@ -0,0 +1,19 @@
+module FactoryGirlRails
+  module Generators
+    class NonRSpecGenerator
+      def initialize(generators)
+        @generators = generators
+      end
+
+      def run
+        @generators.test_framework test_framework, fixture: false, fixture_replacement: :factory_girl
+      end
+
+      private
+
+      def test_framework
+        @generators.options[:rails][:test_framework]
+      end
+    end
+  end
+end

data/lib/factory_girl_rails/generators/null_generator.rb

@@ -0,0 +1,11 @@
+module FactoryGirlRails
+  module Generators
+    class NullGenerator
+      def initialize(generators)
+      end
+
+      def run
+      end
+    end
+  end
+end

data/lib/factory_girl_rails/generators/rspec_generator.rb

@@ -0,0 +1,23 @@
+module FactoryGirlRails
+  module Generators
+    class RSpecGenerator
+      def initialize(generators)
+        @generators = generators
+      end
+
+      def run
+        @generators.fixture_replacement fixture_replacement_setting, dir: factory_girl_directory
+      end
+
+      private
+
+      def fixture_replacement_setting
+        @generators.options[:rails][:fixture_replacement] || :factory_girl
+      end
+
+      def factory_girl_directory
+        @generators.options.fetch(:factory_girl, { dir: 'spec/factories' })[:dir]
+      end
+    end
+  end
+end

data/lib/factory_girl_rails/railtie.rb

@@ -1,24 +1,12 @@
 require 'factory_girl'
+require 'factory_girl_rails/generator'
 require 'rails'
 
 module FactoryGirl
   class Railtie < Rails::Railtie
 
     initializer "factory_girl.set_fixture_replacement" do
-      generators = config.respond_to?(:app_generators) ? config.app_generators : config.generators
-      rails_options = generators.options[:rails]
-
-      if rails_options[:test_framework] == :rspec
-        factory_girl_dir = generators.options.fetch(:factory_girl, { :dir => 'spec/factories' })[:dir]
-
-        if rails_options.has_key?(:fixture_replacement)
-          generators.fixture_replacement rails_options[:fixture_replacement], :dir => factory_girl_dir
-        else
-          generators.fixture_replacement :factory_girl, :dir => factory_girl_dir
-        end
-      else
-        generators.test_framework rails_options[:test_framework], :fixture => false, :fixture_replacement => :factory_girl
-      end
+      FactoryGirlRails::Generator.new(config).run
     end
 
     initializer "factory_girl.set_factory_paths" do

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl_rails
 version: !ruby/object:Gem::Version
-  version: 4.2.1
-  prerelease: 
+  version: 4.3.0
 platform: ruby
 authors:
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,13 +104,14 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.1
-description: ! "factory_girl_rails provides integration between\n    factory_girl
-  and rails 3 (currently just automatic factory definition\n    loading)"
+description: |-
+  factory_girl_rails provides integration between
+      factory_girl and rails 3 (currently just automatic factory definition
+      loading)
 email: jferris@thoughtbot.com
 executables: []
 extensions: []
@@ -136,6 +123,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
+- NEWS
 - README.md
 - Rakefile
 - factory_girl_rails.gemspec
@@ -145,40 +133,42 @@ files:
 - features/step_definitions/appraisal.rb
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
-- gemfiles/rails3.0.gemfile
-- gemfiles/rails3.0.gemfile.lock
 - gemfiles/rails3.1.gemfile
 - gemfiles/rails3.1.gemfile.lock
 - gemfiles/rails3.2.gemfile
 - gemfiles/rails3.2.gemfile.lock
 - lib/factory_girl_rails.rb
+- lib/factory_girl_rails/generator.rb
+- lib/factory_girl_rails/generators/non_rspec_generator.rb
+- lib/factory_girl_rails/generators/null_generator.rb
+- lib/factory_girl_rails/generators/rspec_generator.rb
 - lib/factory_girl_rails/railtie.rb
 - lib/generators/factory_girl.rb
 - lib/generators/factory_girl/model/model_generator.rb
 - lib/generators/factory_girl/model/templates/fixtures.erb
 homepage: http://github.com/thoughtbot/factory_girl_rails
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: factory_girl_rails provides integration between factory_girl and rails 3
 test_files:
 - Appraisals
@@ -188,8 +178,6 @@ test_files:
 - features/step_definitions/appraisal.rb
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
-- gemfiles/rails3.0.gemfile
-- gemfiles/rails3.0.gemfile.lock
 - gemfiles/rails3.1.gemfile
 - gemfiles/rails3.1.gemfile.lock
 - gemfiles/rails3.2.gemfile

data/gemfiles/rails3.0.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "3.0.20"
-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"
-
-gemspec :path=>"../"

data/gemfiles/rails3.0.gemfile.lock

@@ -1,139 +0,0 @@
-PATH
-  remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
-  specs:
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
-      railties (>= 3.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.20)
-      actionpack (= 3.0.20)
-      mail (~> 2.2.19)
-    actionpack (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-    activesupport (3.0.20)
-    appraisal (0.5.1)
-      bundler
-      rake
-    arel (2.0.10)
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    builder (2.1.2)
-    childprocess (0.3.7)
-      ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    factory_girl (4.2.0)
-      activesupport (>= 3.0.0)
-    ffi (1.3.1)
-    gherkin (2.11.6)
-      json (>= 1.7.6)
-    i18n (0.5.0)
-    jquery-rails (2.2.0)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.7.6)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.19)
-    minitest (4.4.0)
-    minitest-rails (0.3)
-      minitest (~> 4.0)
-      rails (~> 3.0)
-    polyglot (0.3.3)
-    rack (1.2.7)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.20)
-      actionmailer (= 3.0.20)
-      actionpack (= 3.0.20)
-      activerecord (= 3.0.20)
-      activeresource (= 3.0.20)
-      activesupport (= 3.0.20)
-      bundler (~> 1.0)
-      railties (= 3.0.20)
-    railties (3.0.20)
-      actionpack (= 3.0.20)
-      activesupport (= 3.0.20)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    rspec-rails (2.11.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (~> 2.11.0)
-    sqlite3 (1.3.7)
-    therubyrhino (2.0.2)
-      therubyrhino_jar (>= 1.7.3)
-    therubyrhino_jar (1.7.4)
-    thor (0.14.6)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbcsqlite3-adapter (~> 1.2.5)
-  appraisal (~> 0.5.0)
-  aruba (~> 0.5.1)
-  cucumber (~> 1.2.1)
-  factory_girl_rails!
-  jquery-rails
-  minitest-rails
-  rails (= 3.0.20)
-  rake
-  rspec (~> 2.11.0)
-  rspec-rails
-  sqlite3 (>= 1.3.4)
-  therubyrhino