pickle 0.3.4 → 0.3.5

data/.gitignore

@@ -3,3 +3,4 @@ doc/*
 .yardoc
 pickle-email*
 cucumber_test_app
+.bundle

data/Gemfile

@@ -0,0 +1,20 @@
+source "http://rubygems.org"
+
+gem "yard"
+gem "rake"
+gem "cucumber", ">=0.8"
+gem "rspec"
+
+group :test do
+  gem "rspec-rails"
+  gem "rails", "~>2.3"
+  gem "cucumber-rails", ">=0.3.2"
+  gem "factory_girl"
+  gem "machinist"
+  gem "jeweler"
+  gem "rcov"
+  gem "database_cleaner"
+  gem "capybara"
+  gem "webrat"
+  gem "sqlite3-ruby"
+end

data/Gemfile.lock

@@ -0,0 +1,98 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.8)
+      actionpack (= 2.3.8)
+    actionpack (2.3.8)
+      activesupport (= 2.3.8)
+      rack (~> 1.1.0)
+    activerecord (2.3.8)
+      activesupport (= 2.3.8)
+    activeresource (2.3.8)
+      activesupport (= 2.3.8)
+    activesupport (2.3.8)
+    builder (2.1.2)
+    capybara (0.3.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.3)
+    cucumber (0.8.5)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.1.4)
+      json_pure (~> 1.4.3)
+      term-ansicolor (~> 1.0.4)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    culerity (0.2.10)
+    database_cleaner (0.5.2)
+    diff-lcs (1.1.2)
+    factory_girl (1.3.2)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gemcutter (0.6.1)
+    gherkin (2.1.5)
+      trollop (~> 1.16.2)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    machinist (1.0.6)
+    mime-types (1.16)
+    nokogiri (1.4.3.1)
+    rack (1.1.0)
+    rack-test (0.5.4)
+      rack (>= 1.0)
+    rails (2.3.8)
+      actionmailer (= 2.3.8)
+      actionpack (= 2.3.8)
+      activerecord (= 2.3.8)
+      activeresource (= 2.3.8)
+      activesupport (= 2.3.8)
+      rake (>= 0.8.3)
+    rake (0.8.7)
+    rcov (0.9.8)
+    rspec (1.3.0)
+    rspec-rails (1.3.2)
+      rack (>= 1.0.0)
+      rspec (>= 1.3.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.0.27)
+      ffi (>= 0.6.1)
+      json_pure
+      rubyzip
+    sqlite3-ruby (1.3.1)
+    term-ansicolor (1.0.5)
+    trollop (1.16.2)
+    webrat (0.7.1)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    yard (0.5.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara
+  cucumber (>= 0.8)
+  cucumber-rails (>= 0.3.2)
+  database_cleaner
+  factory_girl
+  jeweler
+  machinist
+  rails (~> 2.3)
+  rake
+  rcov
+  rspec
+  rspec-rails
+  sqlite3-ruby
+  webrat
+  yard

data/History.txt

@@ -1,3 +1,14 @@
+== 0.3.5
+
+* 3 improvements
+  * bundler is used for setting up development dependencies
+  * gemspec specifies dependencies for using pickle
+  * Machinist 2 compatability [giddie]
+
+* 1 bugfix
+  * find_models now works with a factory name with spaces in it [#27]
+  
+
 == 0.3.4
 
 * 2 minor improvements

data/README.rdoc

@@ -316,18 +316,23 @@ can build up composite objects with ease
 
 == Run the tests
 
+To get all the dependencies required for developing pickle, do the following
+
+  bundle install
+
 To run the specs do:
 
-  rake spec
+  bundle exec rake spec
 
 To run the features (rails 2.3 only ATM):
 
-  rake cucumber
+  bundle exec rake cucumber
 
 == Contributors
 
 The following people have made Pickle better:
 
+* {Paul Gideon Dann}[http://github.com/giddie]
 * {Tom Meier}[http://github.com/tommeier]
 * {Sean Hussey}[http://github.com/seanhussey]
 * Brian Rose & Kevin Olsen

data/Rakefile.d/{jeweller.rake → jeweler.rake}

@@ -9,6 +9,10 @@ Jeweler::Tasks.new do |s|
   s.email = "ian.w.white@gmail.com"
   s.homepage = "http://github.com/ianwhite/pickle/tree"
   s.authors = ["Ian White"]
+  s.add_dependency('rspec', ">=1.3")
+  s.add_dependency('cucumber', ">=0.8")
+  s.add_dependency('yard')
+  s.add_dependency('rake')
 end
 
 Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/pickle/adapter.rb

@@ -90,7 +90,11 @@ module Pickle
       end
 
       def create(attrs = {})
-        @klass.send(:make, @blueprint, attrs)
+        if @klass.respond_to?('make!')
+          @klass.send(:make!, @blueprint, attrs)
+        else
+          @klass.send(:make, @blueprint, attrs)
+        end
       end
     end
 

data/lib/pickle/session.rb

@@ -58,6 +58,8 @@ module Pickle
     end
     
     def find_models(factory, fields = nil)
+      factory = pickle_parser.canonical(factory)
+      
       models_by_index(factory).clear
 
       model_class = pickle_config.factories[factory].klass

data/pickle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pickle}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian White"]
-  s.date = %q{2010-08-06}
+  s.date = %q{2010-08-12}
   s.description = %q{Easy model creation and reference in your cucumber features}
   s.email = %q{ian.w.white@gmail.com}
   s.extra_rdoc_files = [
@@ -17,12 +17,14 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "History.txt",
      "License.txt",
      "README.rdoc",
      "Rakefile",
      "Rakefile.d/cucumber.rake",
-     "Rakefile.d/jeweller.rake",
+     "Rakefile.d/jeweler.rake",
      "Rakefile.d/rcov.rake",
      "Rakefile.d/rspec.rake",
      "Rakefile.d/yard.rake",
@@ -110,9 +112,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rspec>, [">= 1.3"])
+      s.add_runtime_dependency(%q<cucumber>, [">= 0.8"])
+      s.add_runtime_dependency(%q<yard>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
     else
+      s.add_dependency(%q<rspec>, [">= 1.3"])
+      s.add_dependency(%q<cucumber>, [">= 0.8"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rspec>, [">= 1.3"])
+    s.add_dependency(%q<cucumber>, [">= 0.8"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
   end
 end
 

data/spec/pickle/session_spec.rb

@@ -267,7 +267,7 @@ describe Pickle::Session do
     end
 
     it "should call User.find :all, :conditions => {'hair' => 'pink'}" do
-      find_models('user', 'hair: "pink"')
+      find_models('user', 'hair: "pink"').should == [user]
     end
 
     describe "after find," do
@@ -275,6 +275,12 @@ describe Pickle::Session do
 
       it_should_behave_like "after storing a single user"
     end
+    
+    it "should cope with spaces in the factory name (ie. it should make it canonical)" do
+      pickle_parser.stub!(:canonical).and_return('user')
+      pickle_parser.should_receive(:canonical).with('u ser').and_return('user')
+      find_models('u ser', 'hair: "pink"').should == [user]
+    end
   end
 
   describe 'creating \'a super admin: "fred"\', then \'a user: "shirl"\', \'then 1 super_admin\' (super_admin is factory that returns users)' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pickle
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Ian White
@@ -15,10 +15,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 +01:00
+date: 2010-08-12 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: Easy model creation and reference in your cucumber features
 email: ian.w.white@gmail.com
 executables: []
@@ -29,12 +86,14 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - History.txt
 - License.txt
 - README.rdoc
 - Rakefile
 - Rakefile.d/cucumber.rake
-- Rakefile.d/jeweller.rake
+- Rakefile.d/jeweler.rake
 - Rakefile.d/rcov.rake
 - Rakefile.d/rspec.rake
 - Rakefile.d/yard.rake