pickle 0.2.4 → 0.2.5

data/History.txt

@@ -1,9 +1,17 @@
+== 0.2.5 - 17 Mar 2010
+
+* 2 improvements
+  * Bugfix for find_models_via_table (failing to find models was not causing an error) [Chris Flipse]
+  * find_models_via_table & create_models_via_table return the found/created models [Chris Flipse, Ian White]
+
+
 == 0.2.4 - 9 Mar 2010
 
 * 1 major improvement
   * Finding models via a table now works in the same way as creating models via a table (0.2.3), you
     can create pickle refs
 
+
 == 0.2.3 - 9 Mar 2010
 
 * 1 major improvement

data/README.rdoc

@@ -68,6 +68,7 @@ The following people have made Pickle better:
 * {Michael Moen}[http://github.com/UnderpantsGnome]
 * {Myron Marston}[http://github.com/myronmarston]
 * {Stephan Hagemann}[http://github.com/xing]
+* {Chris Flipse}[http://github.com/cflipse]
 
 == Get Started
 

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/features/step_definitions/pickle_steps.rb

@@ -27,7 +27,7 @@ end
 
 # find models with a table
 Then(/^the following #{capture_plural_factory} should exists?:?$/) do |plural_factory, table|
-  find_models_from_table(plural_factory, table)
+  find_models_from_table(plural_factory, table).should_not be_any(&:nil?)
 end
 
 # find exactly n models

data/lib/pickle/session.rb

@@ -31,7 +31,7 @@ module Pickle
     # if a column exists in the table which matches the singular factory name, this is used as the pickle ref
     def create_models_from_table(plural_factory, table)
       factory = plural_factory.singularize
-      table.hashes.each do |hash|
+      table.hashes.map do |hash|
         pickle_ref = factory + (hash[factory] ? " \"#{hash.delete(factory)}\"" : "")
         create_model(pickle_ref, hash)
       end
@@ -61,7 +61,7 @@ module Pickle
     # if a column exists in the table which matches the singular factory name, this is used as the pickle ref
     def find_models_from_table(plural_factory, table)
       factory = plural_factory.singularize
-      table.hashes.each do |hash|
+      table.hashes.map do |hash|
         pickle_ref = factory + (hash[factory] ? " \"#{hash.delete(factory)}\"" : "")
         find_model(pickle_ref, hash)
       end
@@ -172,4 +172,4 @@ module Pickle
       models_by_index(factory) << record
     end
   end
-end
+end

data/pickle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pickle}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian White"]
-  s.date = %q{2010-03-09}
+  s.date = %q{2010-03-17}
   s.description = %q{Easy model creation and reference in your cucumber features}
   s.email = %q{ian.w.white@gmail.com}
   s.extra_rdoc_files = [

data/rails_generators/pickle/templates/pickle_steps.rb

@@ -27,7 +27,7 @@ end
 
 # find models with a table
 Then(/^the following #{capture_plural_factory} should exists?:?$/) do |plural_factory, table|
-  find_models_from_table(plural_factory, table)
+  find_models_from_table(plural_factory, table).should_not be_any(&:nil?)
 end
 
 # find exactly n models

data/spec/lib/pickle_session_spec.rb

@@ -213,16 +213,16 @@ describe Pickle::Session do
         @table = mock(:hashes => [{'name' => 'Fred'}, {'name' => 'Betty'}])
       end
       
-      it "#create_models_from_table(<plural factory>, <table>) should call create_model for each of the table hashes with plain factory name" do
-        should_receive(:create_model).with("user", 'name' => "Fred").once.ordered
-        should_receive(:create_model).with("user", 'name' => "Betty").once.ordered
-        create_models_from_table("users", @table)
+      it "#create_models_from_table(<plural factory>, <table>) should call create_model for each of the table hashes with plain factory name and return the models" do
+        should_receive(:create_model).with("user", 'name' => "Fred").once.ordered.and_return(:fred)
+        should_receive(:create_model).with("user", 'name' => "Betty").once.ordered.and_return(:betty)
+        create_models_from_table("users", @table).should == [:fred, :betty]
       end
       
-      it "#find_models_from_table(<plural factory>, <table>) should call find_model for each of the table hashes with plain factory name" do
-        should_receive(:find_model).with("user", 'name' => "Fred").once.ordered
-        should_receive(:find_model).with("user", 'name' => "Betty").once.ordered
-        find_models_from_table("users", @table)
+      it "#find_models_from_table(<plural factory>, <table>) should call find_model for each of the table hashes with plain factory name and return the models" do
+        should_receive(:find_model).with("user", 'name' => "Fred").once.ordered.and_return(:fred)
+        should_receive(:find_model).with("user", 'name' => "Betty").once.ordered.and_return(:betty)
+        find_models_from_table("users", @table).should == [:fred, :betty]
       end
     end
     
@@ -232,15 +232,15 @@ describe Pickle::Session do
       end
       
       it "#create_models_from_table(<plural factory>, <table>) should call create_model for each of the table hashes with labelled pickle ref" do
-        should_receive(:create_model).with("user \"fred\"", 'name' => "Fred").once.ordered
-        should_receive(:create_model).with("user \"betty\"", 'name' => "Betty").once.ordered
-        create_models_from_table("users", @table)
+        should_receive(:create_model).with("user \"fred\"", 'name' => "Fred").once.ordered.and_return(:fred)
+        should_receive(:create_model).with("user \"betty\"", 'name' => "Betty").once.ordered.and_return(:betty)
+        create_models_from_table("users", @table).should == [:fred, :betty]
       end
       
       it "#find_models_from_table(<plural factory>, <table>) should call find_model for each of the table hashes with labelled pickle ref" do
-        should_receive(:find_model).with("user \"fred\"", 'name' => "Fred").once.ordered
-        should_receive(:find_model).with("user \"betty\"", 'name' => "Betty").once.ordered
-        find_models_from_table("users", @table)
+        should_receive(:find_model).with("user \"fred\"", 'name' => "Fred").once.ordered.and_return(:fred)
+        should_receive(:find_model).with("user \"betty\"", 'name' => "Betty").once.ordered.and_return(:betty)
+        find_models_from_table("users", @table).should == [:fred, :betty]
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Ian White
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +00:00
+date: 2010-03-17 00:00:00 +00:00
 default_executable: 
 dependencies: []