pickle 0.2.3 → 0.2.4

data/History.txt

@@ -1,3 +1,9 @@
+== 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/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2009 Ian White - ian.w.white@gmail.com
+Copyright (c) 2008-2010 Ian White - ian.w.white@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/features/pickle/create_from_active_record.feature

@@ -58,9 +58,10 @@ Feature: I can easily create models from my blueprints
         | Jack |
         | Pete |
       And the following users should exist:
-        | status |
-        | alone  |
-        | dead   |
+        | user    | status |
+        | lonely  | alone  |
+        | rotting | dead   |
       And the 1st user should be the user: "Jack"
       And the 2nd user should be the user: "Pete"
-      
+      And the user: "lonely" should be the user: "Jack"
+      And the user: "rotting" should be the user: "Pete"

data/features/step_definitions/pickle_steps.rb

@@ -27,8 +27,7 @@ end
 
 # find models with a table
 Then(/^the following #{capture_plural_factory} should exists?:?$/) do |plural_factory, table|
-  name = plural_factory.singularize
-  table.hashes.each { |hash| find_model!(name, hash)}
+  find_models_from_table(plural_factory, table)
 end
 
 # find exactly n models

data/lib/pickle/session.rb

@@ -32,8 +32,7 @@ module Pickle
     def create_models_from_table(plural_factory, table)
       factory = plural_factory.singularize
       table.hashes.each do |hash|
-        pickle_ref = factory
-        pickle_ref += ' "' + hash.delete(factory) + '"' if hash[factory] 
+        pickle_ref = factory + (hash[factory] ? " \"#{hash.delete(factory)}\"" : "")
         create_model(pickle_ref, hash)
       end
     end
@@ -58,7 +57,16 @@ module Pickle
       records = model_class.find(:all, :conditions => convert_models_to_attributes(model_class, parse_fields(fields)))
       records.each {|record| store_model(factory, nil, record)}
     end
-      
+    
+    # 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|
+        pickle_ref = factory + (hash[factory] ? " \"#{hash.delete(factory)}\"" : "")
+        find_model(pickle_ref, hash)
+      end
+    end
+    
     # return the original model stored by create_model or find_model
     def created_model(name)
       factory, name_or_index = *parse_model(name)

data/pickle.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pickle}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian White"]

data/rails_generators/pickle/templates/pickle_steps.rb

@@ -27,8 +27,7 @@ end
 
 # find models with a table
 Then(/^the following #{capture_plural_factory} should exists?:?$/) do |plural_factory, table|
-  name = plural_factory.singularize
-  table.hashes.each { |hash| find_model!(name, hash)}
+  find_models_from_table(plural_factory, table)
 end
 
 # find exactly n models

data/spec/lib/pickle_session_spec.rb

@@ -207,17 +207,23 @@ describe Pickle::Session do
     end
   end
   
-  describe "#create_models_from_table(plural_factory, table)" do
+  describe "create and find using plural_factory and table" do
     context "when given a table without a matching pickle ref column" do
       before do
         @table = mock(:hashes => [{'name' => 'Fred'}, {'name' => 'Betty'}])
       end
       
-      it "should call create_model for each of the table hashes with plain factory name" do
+      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)
       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)
+      end
     end
     
     context "when given a table with a matching pickle ref column" do
@@ -225,11 +231,17 @@ describe Pickle::Session do
         @table = mock(:hashes => [{'user' => "fred", 'name' => 'Fred'}, {'user' => "betty", 'name' => 'Betty'}])
       end
       
-      it "should call create_model for each of the table hashes with labelled pickle ref" do
+      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)
       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)
+      end
     end
   end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Ian White