factory_girl_sequences 0.1.1 → 4.0.0

data/.travis.yml

@@ -1,8 +1,15 @@
-language: ruby
-script: "bundle exec rake cucumber"
 rvm:
   - 1.9.2
   - 1.9.3
+  - 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.2.gemfile
 branches:
   only:
-    - master
+    - master

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails3.2" do
+  gem "rails", "3.2.12"
+  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 "therubyrhino"
+  gem "jquery-rails"
+  gem "factory_girl_rails"
+end

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 4.0.0 / 2013-02-22
+
+* updated factory_girl version
+* added appraisal
+* rewrite tests
+* created separate reload method
+
 ## 0.1.1 / 2012-10-27
 
 * Updated README
@@ -20,4 +27,4 @@
 ## 0.0.3 / 2012-10-20
 
 * Updated README
-* Added link to the homepage
+* Added link to the homepage

data/Gemfile

@@ -1,3 +1,8 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
+
+gem 'rake'
+gem 'appraisal', '~> 0.5.0'
+gem 'cucumber', '~> 1.2.1'
+gem 'aruba', '~> 0.5.1'

data/README.md

@@ -167,11 +167,9 @@ end
 
 Check out FactoryGirl's [GETTING_STARTED](http://github.com/thoughtbot/factory_girl) for more information.
 
-## Additional notes
+### Spork or tconsole
 
-All sequences are free to use and
-could be changed depending on your needs. Just copy the sequence in your
-project's `test(spec)/factories/sequences.rb` file and modify it.
+For whose of you who are using spork or tconsole, consider adding `FactoryGirlSequences.reload` right after `FactoryGirl.reload`.
 
 ## Contributing
 
@@ -181,3 +179,13 @@ project's `test(spec)/factories/sequences.rb` file and modify it.
 4. Test your changes by running `bundle exec rake cucumber` command
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create new Pull Request
+
+## Credits
+
+Created by [Anton Kalyaev](http://github.com/akalyaev)
+
+Thank you to all our amazing [contributors](http://github.com/akalyaev/factory_girl_sequences/contributors)!
+
+## License
+
+FactoryGirlSequences is Copyright © 2012-2013 Anton Kalyaev. It is free software, and may be redistributed under the terms specified in the [MIT License](http://www.opensource.org/licenses/MIT) file.

data/Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'cucumber/rake/task'
@@ -8,5 +7,17 @@ Cucumber::Rake::Task.new(:cucumber) do |t|
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end
 
-desc "Default: run the cucumber scenarios"
-task :default => :cucumber
+require 'appraisal'
+
+desc 'Run the test suite'
+task :default do |t|
+  if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
+    exec 'rake cucumber'
+  else
+    Rake::Task['appraise'].execute
+  end
+end
+
+task :appraise => ['appraisal:install'] do |t|
+  exec 'rake appraisal'
+end

data/factory_girl_sequences.gemspec

@@ -19,10 +19,6 @@ Gem::Specification.new do |gem|
   gem.rdoc_options      = %w(--line-numbers --inline-source --title factory_girl_sequences --main README.md)
   gem.extra_rdoc_files  = %w(README.md CHANGELOG.md LICENSE)
 
-  gem.add_runtime_dependency('factory_girl', '~> 4.1.0')
-
-  gem.add_development_dependency('rake')
-  gem.add_development_dependency('cucumber', '~> 1.0.0')
-  gem.add_development_dependency('aruba')
-  gem.add_development_dependency('rails', '3.0.7')
+  gem.add_dependency 'factory_girl', '~> 4.0'
+  gem.add_dependency 'activesupport', '>= 3.0.0'
 end

data/features/sequences.feature

@@ -0,0 +1,26 @@
+Feature:
+  I would like Factory Girl Sequences gem to automatically register sequences
+
+  Background:
+    Given I successfully run `bundle exec rails new testapp --skip-bundle`
+    And I cd to "testapp"
+    And I add "factory_girl_rails" as a dependency
+    And I add "factory_girl_sequences" from this project as a dependency
+
+  Scenario: Using Factory Girl Sequences registers predefined sequences
+    And I run `bundle install` with a clean environment
+    And I run `bundle exec rails generate model User name:string` with a clean environment
+    And I run `bundle exec rake db:migrate` with a clean environment
+    When I write to "test/unit/user_test.rb" with:
+      """
+      require 'test_helper'
+
+      class UserTest < ActiveSupport::TestCase
+        test "factory_girl should know name sequence" do
+          user = FactoryGirl.create(:user)
+          assert user.name
+        end
+      end
+      """
+    And I run `bundle exec rake test` with a clean environment
+    Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"

data/features/step_definitions/appraisal.rb

@@ -0,0 +1,3 @@
+When /^I run `([^"]+)` with a clean environment$/ do |command|
+  step %{I successfully run `ruby -e 'system({"BUNDLE_GEMFILE" => nil}, "#{command}")'`}
+end

data/features/step_definitions/rails_steps.rb

@@ -4,4 +4,4 @@ end
 
 When /^I add "([^"]+)" as a dependency$/ do |gem_name|
   append_to_file('Gemfile', %{gem "#{gem_name}"\n})
-end
+end

data/features/support/env.rb

@@ -4,4 +4,11 @@ PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).f
 
 Before do
   @aruba_timeout_seconds = 3600
-end
+end
+
+Aruba.configure do |config|
+  config.before_cmd do |cmd|
+    set_env('JRUBY_OPTS', "-X-C #{ENV['JRUBY_OPTS']}") # disable JIT since these processes are so short lived
+    set_env('JAVA_OPTS', "-d32 #{ENV['JAVA_OPTS']}") # force jRuby to use client JVM for faster startup times
+  end
+end if RUBY_PLATFORM == 'java'

data/gemfiles/rails3.2.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "appraisal", "~> 0.5.0"
+gem "cucumber", "~> 1.2.1"
+gem "aruba", "~> 0.5.1"
+gem "rails", "3.2.12"
+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 "therubyrhino"
+gem "jquery-rails"
+gem "factory_girl_rails"
+
+gemspec :path=>"../"

data/gemfiles/rails3.2.gemfile.lock

@@ -0,0 +1,155 @@
+PATH
+  remote: /home/vagrant/projects/funbox/factory_girl_sequences
+  specs:
+    factory_girl_sequences (0.1.1)
+      activesupport (>= 3.0.0)
+      factory_girl (~> 4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
+      mail (~> 2.4.4)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (3.0.2)
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.0.4)
+    childprocess (0.3.8)
+      ffi (~> 1.0, >= 1.0.11)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.4.0)
+    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.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
+      railties (>= 3.0.0)
+    ffi (1.4.0)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (2.2.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.7)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.21)
+    multi_json (1.6.1)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
+      bundler (~> 1.0)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
+    rdoc (3.12.1)
+      json (~> 1.4)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    sass (3.2.5)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.7)
+    therubyrhino (2.0.2)
+      therubyrhino_jar (>= 1.7.3)
+    therubyrhino_jar (1.7.4)
+    thor (0.17.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter (~> 1.2.5)
+  appraisal (~> 0.5.0)
+  aruba (~> 0.5.1)
+  coffee-rails
+  cucumber (~> 1.2.1)
+  factory_girl_rails
+  factory_girl_sequences!
+  jquery-rails
+  rails (= 3.2.12)
+  rake
+  sass-rails
+  sqlite3 (>= 1.3.4)
+  therubyrhino
+  uglifier

data/lib/factory_girl_sequences.rb

@@ -1 +1,2 @@
-require 'factory_girl_sequences/sequences'
+require 'factory_girl_sequences/sequences'
+require 'factory_girl_sequences/reload'

data/lib/factory_girl_sequences/reload.rb

@@ -0,0 +1,5 @@
+module FactoryGirlSequences
+  def self.reload
+    FactoryGirl.register_default_sequences
+  end
+end

data/lib/factory_girl_sequences/sequences.rb

@@ -4,7 +4,7 @@ module FactoryGirl
     # basic types
     register_sequence(Sequence.new(:integer, :aliases => [:checksum]) { |n| n })
     register_sequence(Sequence.new(:string) { |n| "string-#{n}" })
-    register_sequence(Sequence.new(:date) { Date.today })
+    register_sequence(Sequence.new(:date) { Date.current })
     register_sequence(Sequence.new(:datetime) { Time.current })
     register_sequence(Sequence.new(:boolean) { |n| [false, true][n%2] })
 
@@ -29,15 +29,6 @@ module FactoryGirl
     register_sequence(Sequence.new(:subdomain) { |n| "blog#{n}" })
     register_sequence(Sequence.new(:color) { |n| "%06d" % n })
   end
-
-  # FIXME [AK] Monkey-patching here. There should be another way around.
-  def self.reload
-    reset_configuration
-    register_default_strategies
-    register_default_callbacks
-    register_default_sequences
-    find_definitions
-  end
 end
 
-FactoryGirl.register_default_sequences
+FactoryGirl.register_default_sequences

data/lib/factory_girl_sequences/version.rb

@@ -1,3 +1,3 @@
 module FactoryGirlSequences
-  VERSION = "0.1.1"
+  VERSION = "4.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl_sequences
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 4.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,71 +26,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
   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: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 3.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.0
 description: factory_girl_sequences provides a collection of useful FactoryGirl sequences
 email:
 - anton.kalyaev@gmail.com
@@ -104,16 +56,21 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - factory_girl_sequences.gemspec
-- features/register_sequences.feature
+- features/sequences.feature
+- features/step_definitions/appraisal.rb
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
+- gemfiles/rails3.2.gemfile
+- gemfiles/rails3.2.gemfile.lock
 - lib/factory_girl_sequences.rb
+- lib/factory_girl_sequences/reload.rb
 - lib/factory_girl_sequences/sequences.rb
 - lib/factory_girl_sequences/version.rb
 homepage: http://github.com/akalyaev/factory_girl_sequences
@@ -136,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4006842941733718079
+      hash: 2845564833420658873
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4006842941733718079
+      hash: 2845564833420658873
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -153,6 +110,7 @@ signing_key:
 specification_version: 3
 summary: Collection of useful FactoryGirl sequences
 test_files:
-- features/register_sequences.feature
+- features/sequences.feature
+- features/step_definitions/appraisal.rb
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb

data/features/register_sequences.feature

@@ -1,47 +0,0 @@
-Feature: automatically register sequences
-  Background:
-    When I successfully run `bundle exec rails new testapp`
-  And I cd to "testapp"
-  And I add "factory_girl_rails" as a dependency
-  And I add "factory_girl_sequences" from this project as a dependency
-  When I successfully run `bundle install`
-  And I write to "db/migrate/1_create_users.rb" with:
-    """
-    class CreateUsers < ActiveRecord::Migration
-      def self.up
-        create_table :users do |t|
-          t.string :name
-        end
-      end
-    end
-    """
-  When I successfully run `bundle exec rake db:migrate --trace`
-  And I write to "app/models/user.rb" with:
-    """
-    class User < ActiveRecord::Base
-    end
-    """
-
-  @disable-bundler
-  Scenario: generate a rails 3 application and use factory definitions
-  When I write to "test/factories.rb" with:
-    """
-    FactoryGirl.define do
-      factory :user do
-        name
-      end
-    end
-    """
-  When I write to "test/unit/user_test.rb" with:
-    """
-    require 'test_helper'
-
-    class UserTest < ActiveSupport::TestCase
-      test "use sequence" do
-        user = FactoryGirl.create(:user)
-        assert user.name
-      end
-    end
-    """
-  When I successfully run `bundle exec rake test --trace`
-  Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"