factory_girl 3.0.0 → 3.1.0

data/features/step_definitions/factory_girl_steps.rb

@@ -12,7 +12,7 @@ When /^"([^"]*)" is added to Factory Girl's file definitions path$/ do |file_nam
 
   append_file_to_factory_girl_definitions_path(new_factory_file)
 
-  When %{I find definitions}
+  step %{I find definitions}
 end
 
 When /^"([^"]*)" is added to Factory Girl's file definitions path as an absolute path$/ do |file_name|
@@ -20,7 +20,7 @@ When /^"([^"]*)" is added to Factory Girl's file definitions path as an absolute
 
   append_file_to_factory_girl_definitions_path(new_factory_file)
 
-  When %{I find definitions}
+  step %{I find definitions}
 end
 
 When /^I create a "([^"]*)" instance from Factory Girl$/ do |factory_name|
@@ -31,7 +31,7 @@ Given /^these super users exist:$/ do |table|
   headers = table.headers + ["admin"]
   rows    = table.rows.map { |row| row + [true] }
   new_table = Cucumber::Ast::Table.new([headers] + rows)
-  Given %{the following person exists:}, new_table
+  step %{the following person exists:}, new_table
 end
 
 When /^I find definitions$/ do

data/features/support/factories.rb

@@ -73,6 +73,23 @@ class SimpleColumn
   end
 end
 
+class NamedAttributeModel
+  def self.attribute_names
+    %w(title)
+  end
+
+  attr_accessor :title
+
+  def save!
+    @@count ||= 0
+    @@count += 1
+  end
+
+  def self.count
+    @@count
+  end
+end
+
 FactoryGirl.define do
   # To make sure the step defs work with an email
   sequence :email do |n|
@@ -113,6 +130,9 @@ FactoryGirl.define do
   # This is here to make FG work with ORMs that have `columns => [:name, :admin, :etc]` on the class (Neo4j)
   factory :simple_column do
   end
+
+  factory :named_attribute_model do
+  end
 end
 
 require 'factory_girl/step_definitions'

data/gemfiles/3.0.gemfile.lock

@@ -1,82 +1,85 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.0.0)
+    factory_girl (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.9)
-    appraisal (0.3.8)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.4.1)
       bundler
       rake
-    arel (2.0.10)
-    aruba (0.3.7)
-      childprocess (>= 0.1.9)
-      cucumber (>= 0.10.5)
-      rspec (>= 2.6.0)
-    bluecloth (2.1.0)
-    bourne (1.0)
-      mocha (= 0.9.8)
-    builder (2.1.2)
-    childprocess (0.1.9)
+    arel (3.0.2)
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
+    bluecloth (2.2.0)
+    bourne (1.1.2)
+      mocha (= 0.10.5)
+    builder (3.0.0)
+    childprocess (0.3.1)
       ffi (~> 1.0.6)
-    cucumber (1.0.0)
+    cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
+      gherkin (~> 2.9.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
-    ffi (1.0.9)
-    gherkin (2.4.1)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    gherkin (2.9.3)
       json (>= 1.4.6)
-    i18n (0.5.0)
-    json (1.5.3)
-    mocha (0.9.8)
-      rake
-    multi_json (1.1.0)
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    i18n (0.6.0)
+    json (1.6.6)
+    metaclass (0.0.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.2.0)
+    rake (0.9.2.2)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     simplecov (0.6.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sqlite3 (1.3.3)
+    sqlite3 (1.3.5)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    term-ansicolor (1.0.5)
+    term-ansicolor (1.0.7)
     timecop (0.3.5)
-    tzinfo (0.3.28)
-    yard (0.7.2)
+    tzinfo (0.3.32)
+    yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.0)
-  appraisal (~> 0.3.8)
+  appraisal (~> 0.4)
   aruba
   bluecloth
   bourne
-  cucumber (~> 1.0.0)
+  cucumber (~> 1.1)
   factory_girl!
   mocha
   rspec (~> 2.0)

data/gemfiles/3.1.gemfile.lock

@@ -1,91 +1,85 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.0.0)
+    factory_girl (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.1.0)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    appraisal (0.3.8)
+    appraisal (0.4.1)
       bundler
       rake
-    arel (2.2.1)
-    aruba (0.4.5)
-      bcat (>= 0.6.1)
-      childprocess (>= 0.1.9)
-      cucumber (>= 0.10.7)
-      rdiscount (>= 1.6.8)
-      rspec (>= 2.6.0)
-    bcat (0.6.1)
-      rack (~> 1.0)
-    bcrypt-ruby (3.0.0)
-    bluecloth (2.1.0)
-    bourne (1.0)
-      mocha (= 0.9.8)
+    arel (3.0.2)
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
+    bluecloth (2.2.0)
+    bourne (1.1.2)
+      mocha (= 0.10.5)
     builder (3.0.0)
-    childprocess (0.2.1)
+    childprocess (0.3.1)
       ffi (~> 1.0.6)
-    cucumber (1.0.2)
+    cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.5)
+      gherkin (~> 2.9.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
+      term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
-    ffi (1.0.9)
-    gherkin (2.4.16)
+    ffi (1.0.11)
+    gherkin (2.9.3)
       json (>= 1.4.6)
     i18n (0.6.0)
-    json (1.5.4)
-    mocha (0.9.8)
-      rake
-    multi_json (1.0.3)
-    rack (1.3.2)
-    rake (0.9.2)
-    rdiscount (1.6.8)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    json (1.6.6)
+    metaclass (0.0.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.2.0)
+    rake (0.9.2.2)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     simplecov (0.6.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.5)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    term-ansicolor (1.0.6)
+    term-ansicolor (1.0.7)
     timecop (0.3.5)
-    tzinfo (0.3.29)
-    yard (0.7.2)
+    tzinfo (0.3.32)
+    yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.1)
-  appraisal (~> 0.3.8)
+  appraisal (~> 0.4)
   aruba
   bluecloth
   bourne
-  cucumber (~> 1.0.0)
+  cucumber (~> 1.1)
   factory_girl!
   mocha
   rspec (~> 2.0)

data/gemfiles/3.2.gemfile.lock

@@ -1,67 +1,63 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.0.0)
+    factory_girl (3.1.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-      arel (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.0)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    appraisal (0.3.8)
+    appraisal (0.4.1)
       bundler
       rake
-    arel (3.0.0)
-    aruba (0.4.6)
-      bcat (>= 0.6.1)
-      childprocess (>= 0.2.0)
-      cucumber (>= 1.0.2)
-      rdiscount (>= 1.6.8)
-      rspec (>= 2.6.0)
-    bcat (0.6.2)
-      rack (~> 1.0)
+    arel (3.0.2)
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
     bluecloth (2.2.0)
-    bourne (1.0)
-      mocha (= 0.9.8)
+    bourne (1.1.2)
+      mocha (= 0.10.5)
     builder (3.0.0)
-    childprocess (0.3.0)
+    childprocess (0.3.1)
       ffi (~> 1.0.6)
-    cucumber (1.0.6)
+    cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.18)
+      gherkin (~> 2.9.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     ffi (1.0.11)
-    gherkin (2.4.21)
+    gherkin (2.9.3)
       json (>= 1.4.6)
     i18n (0.6.0)
-    json (1.6.5)
-    mocha (0.9.8)
-      rake
-    multi_json (1.0.4)
-    rack (1.4.0)
+    json (1.6.6)
+    metaclass (0.0.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.2.0)
     rake (0.9.2.2)
-    rdiscount (1.6.8)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     simplecov (0.6.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
@@ -71,19 +67,19 @@ GEM
       sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.7)
     timecop (0.3.5)
-    tzinfo (0.3.31)
-    yard (0.7.4)
+    tzinfo (0.3.32)
+    yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.2)
-  appraisal (~> 0.3.8)
+  appraisal (~> 0.4)
   aruba
   bluecloth
   bourne
-  cucumber (~> 1.0.0)
+  cucumber (~> 1.1)
   factory_girl!
   mocha
   rspec (~> 2.0)