pickle 0.4.7 → 0.4.8

data/Gemfile.lock.development

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pickle (0.4.7)
+    pickle (0.4.8)
       cucumber (>= 0.8)
       rake
 
@@ -9,104 +9,101 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
-      mail (~> 2.2.15)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      arel (~> 2.0.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)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
-    arel (2.0.9)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
+    arel (2.0.10)
     builder (2.1.2)
-    capybara (0.4.1.2)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
+    capybara (1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.8)
-    childprocess (0.1.8)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.1.9)
       ffi (~> 1.0.6)
-    cucumber (0.10.2)
+    cucumber (1.0.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.5)
+      gherkin (~> 2.4.5)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    cucumber-rails (0.4.0)
-      cucumber (>= 0.10.1)
-      nokogiri (>= 1.4.4)
-      rack-test (>= 0.5.7)
-    culerity (0.2.15)
-    database_cleaner (0.6.6)
+    cucumber-rails (1.0.2)
+      capybara (>= 1.0.0)
+      cucumber (~> 1.0.0)
+      nokogiri (>= 1.4.6)
+    database_cleaner (0.6.7)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     factory_girl (1.3.3)
-    ffi (1.0.7)
-      rake (>= 0.8.7)
-    gherkin (2.3.5)
+    ffi (1.0.9)
+    gherkin (2.4.5)
       json (>= 1.4.6)
     git (1.2.5)
     i18n (0.5.0)
-    json (1.5.1)
-    json_pure (1.5.1)
+    json (1.5.3)
+    json_pure (1.5.3)
     machinist (1.0.6)
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    nokogiri (1.4.4)
+    nokogiri (1.5.0)
     polyglot (0.3.1)
-    rack (1.2.2)
+    rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
       bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.2)
     rcov (0.9.9)
+    rdoc (3.8)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
       rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
+    rspec-core (2.5.2)
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
@@ -116,8 +113,8 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.5.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.4)
-      childprocess (>= 0.1.7)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
@@ -128,10 +125,10 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.25)
-    xpath (0.1.3)
+    tzinfo (0.3.29)
+    xpath (0.1.4)
       nokogiri (~> 1.3)
-    yard (0.6.5)
+    yard (0.7.2)
 
 PLATFORMS
   ruby

data/History.txt

@@ -1,3 +1,10 @@
+== 0.4.8
+
+* 2 minor improvements
+  * Support factory_girl v1 and v2 API [Ari Epstein]
+  * Dev deps updated to latest cucumber & cucumber-rails, and test for factory_girl 2 [Ian White]
+
+
 == 0.4.7
 
 * 2 minor improvements

data/README.rdoc

@@ -458,6 +458,7 @@ To run the specs & features do:
 
 The following people have made Pickle better:
 
+* {Ari Epstein}[http://github.com/aepstein]
 * {Jonathan Hinkle}[http://github.com/hynkle]
 * {Devin Walters and Nick Karpenske}[http://github.com/bendyworks]
 * {Marc Lee}[http://github.com/maleko]

data/lib/pickle/adapter.rb

@@ -106,15 +106,29 @@ module Pickle
     # factory-girl adapter
     class FactoryGirl < Adapter
       def self.factories
-        (::Factory.factories.values rescue []).map {|factory| new(factory)}
+        if defined? ::FactoryGirl
+          factories = []
+          ::FactoryGirl.factories.each {|v| factories << new(v)}
+          factories
+        else
+          (::Factory.factories.values rescue []).map {|factory| new(factory)}
+        end
       end
 
       def initialize(factory)
-        @klass, @name = factory.build_class, factory.factory_name.to_s
+        if defined? ::FactoryGirl
+          @klass, @name = factory.build_class, factory.name.to_s
+        else
+          @klass, @name = factory.build_class, factory.factory_name.to_s
+        end
       end
 
       def create(attrs = {})
-        Factory(@name, attrs)
+        if defined? ::FactoryGirl
+          ::FactoryGirl.create(@name, attrs)
+        else
+          Factory(@name, attrs)
+        end
       end
     end
 

data/lib/pickle/version.rb

@@ -1,3 +1,3 @@
 module Pickle
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/pickle.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email = "ian.w.white@gmail.com"
   s.homepage = "http://github.com/ianwhite/pickle"
 
-  s.rubyforge_project = "orm_adapter"
+  s.rubyforge_project = "pickle"
   s.required_rubygems_version = ">= 1.3.6"
 
   s.files         = `git ls-files`.split("\n")

data/spec/pickle/adapter_spec.rb

@@ -67,23 +67,35 @@ describe Pickle::Adapter do
           end
         end
       end
-
-
     end
 
     describe 'FactoryGirl' do
       before do
         Pickle::Adapter::FactoryGirl.stub!(:model_classes).and_return([@klass1, @klass2, @klass3])
-        @orig_factories, Factory.factories = Factory.factories, {}
-
-        Factory.define(:one, :class => @klass1) {}
-        Factory.define(:two, :class => @klass2) {}
-        @factory1 = Factory.factories[:one]
-        @factory2 = Factory.factories[:two]
+        
+        if defined? ::FactoryGirl
+          @orig_factories = ::FactoryGirl.factories.dup
+          ::FactoryGirl.factories.clear
+          ::FactoryGirl::Syntax::Default::DSL.new.factory(:one, :class => @klass1) {}
+          ::FactoryGirl::Syntax::Default::DSL.new.factory(:two, :class => @klass2) {}
+          @factory1 = ::FactoryGirl.factories[:one]
+          @factory2 = ::FactoryGirl.factories[:two]
+        else
+          @orig_factories, Factory.factories = Factory.factories, {}
+          Factory.define(:one, :class => @klass1) {}
+          Factory.define(:two, :class => @klass2) {}
+          @factory1 = Factory.factories[:one]
+          @factory2 = Factory.factories[:two]
+        end
       end
 
       after do
-        Factory.factories = @orig_factories
+        if defined? ::FactoryGirl
+          ::FactoryGirl.factories.clear
+          @orig_factories.each {|f| ::FactoryGirl.factories.add(f) }
+        else
+          Factory.factories = @orig_factories
+        end
       end
 
       it ".factories should create one for each factory" do
@@ -105,13 +117,15 @@ describe Pickle::Adapter do
           @factory.klass.should == @klass1
         end
 
-        it "#create(attrs) should call Factory(<:key>, attrs)" do
-          Factory.should_receive(:create).with("one", {:key => "val"})
-          @factory.create(:key => "val")
+        unless defined? ::FactoryGirl
+          it "#create(attrs) should call Factory(<:key>, attrs)" do
+            Factory.should_receive(:create).with("one", {:key => "val"})
+            @factory.create(:key => "val")
+          end
         end
       end
     end
-
+    
     describe 'Machinist' do
       before do
         Pickle::Adapter::Machinist.stub!(:model_classes).and_return([@klass1, @klass2, @klass3])

data/spec/pickle/session_spec.rb

@@ -282,10 +282,12 @@ describe Pickle::Session do
   describe 'creating \'a super admin: "fred"\', then \'a user: "shirl"\', \'then 1 super_admin\' (super_admin is factory that returns users)' do
     let(:fred) { mock("fred", :class => user_class, :id => 2) }
     let(:shirl) { mock("shirl", :class => user_class, :id => 3) }
-    let(:noname) { mock("noname", :class => user_class, :is => 4) }
-
-    let(:super_admin_factory) do
-      Pickle::Adapter::FactoryGirl.new(mock(:build_class => user_class, :factory_name => :super_admin))
+    let(:noname) { mock("noname", :class => user_class, :id => 4) }
+    
+    if defined? ::FactoryGirl
+      let(:super_admin_factory) { Pickle::Adapter::FactoryGirl.new(mock(:build_class => user_class, :name => :super_admin)) }
+    else
+      let(:super_admin_factory) { Pickle::Adapter::FactoryGirl.new(mock(:build_class => user_class, :factory_name => :super_admin)) }
     end
 
     before do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pickle
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 4
-  - 7
-  version: 0.4.7
+  - 8
+  version: 0.4.8
 platform: ruby
 authors: 
 - Ian White
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 +00:00
+date: 2011-07-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -350,8 +350,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 
-rubyforge_project: orm_adapter
-rubygems_version: 1.5.1
+rubyforge_project: pickle
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Easy model creation and reference in your cucumber features.