pickle 0.2.2 → 0.2.3

data/History.txt

@@ -1,3 +1,18 @@
+== 0.2.3 - 9 Mar 2010
+
+* 1 major improvement
+  * You can now use pickle refs in tables.  If you add a column which is the single factory name, the
+    contents of the column will be used as the pickle ref.  [Stephan Hagemann]
+    e.g.
+      Given the following users exist:
+        | user | name        | status |
+        | jack | Jack Spratt | alone  |
+        | pete | Pete Sprong | dead   |
+  
+* 1 minor improvement
+  * Fix bug in error message for when pickle ref can't be found [Myron Marston]
+
+
 == 0.2.2 - 25 Feb 2010
 
 * 3 improvements

data/README.rdoc

@@ -66,6 +66,8 @@ The following people have made Pickle better:
 * {Tobi Knaup}[http://github.com/guenter]
 * {Michael MacDonald}[http://github.com/schlick]
 * {Michael Moen}[http://github.com/UnderpantsGnome]
+* {Myron Marston}[http://github.com/myronmarston]
+* {Stephan Hagemann}[http://github.com/xing]
 
 == Get Started
 
@@ -198,6 +200,17 @@ You can use other models, booleans, numerics, and strings as fields
 
   Then 2 people should exist with father: person "fred"
   
+"Then the following <b>models</b> exist". This allows the creation of multiple models
+using a table syntax. Using a column with the singularized name of the model creates a referenceable model. E.g.
+
+  Then the following users exist:
+    | name   | activated |
+    | Freddy | false     |
+
+  Then the following users exist:
+    | user | name   | activated |
+    | Fred | Freddy | false     |
+  
 ===== Asserting associations
 
 One-to-one assocs: "Then <b>a model</b> should be <b>other model</b>'s <b>association</b>", e.g.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/features/pickle/create_from_active_record.feature

@@ -34,9 +34,9 @@ Feature: I can easily create models from my blueprints
     
   Scenario: create and find using tables
     Given the following users exist:
-      | name       | status                   |
-      | Jim        | married                  |
-      | Ethel      | in a relationship with x |
+      | name  | status                   |
+      | Jim   | married                  |
+      | Ethel | in a relationship with x |
     Then the following users should exist:
       | name  |
       | Jim   |
@@ -46,4 +46,21 @@ Feature: I can easily create models from my blueprints
       | married                  |
       | in a relationship with x |
     And the 1st user should be the 3rd user
-    And the 2nd user should be the last user
+    And the 2nd user should be the last user
+    
+    Scenario: create and find using tables with referencable names
+      Given the following users exist:
+        | user | name | status |
+        | Jack | Jack | alone  |
+        | Pete | Pete | dead   |
+      Then the following users should exist:
+        | name |
+        | Jack |
+        | Pete |
+      And the following users should exist:
+        | status |
+        | alone  |
+        | dead   |
+      And the 1st user should be the user: "Jack"
+      And the 2nd user should be the user: "Pete"
+      

data/features/step_definitions/pickle_steps.rb

@@ -12,8 +12,7 @@ end
 
 # create models from a table
 Given(/^the following #{capture_plural_factory} exists?:?$/) do |plural_factory, table|
-  name = plural_factory.singularize
-  table.hashes.each { |hash| create_model(name, hash) }
+  create_models_from_table(plural_factory, table)
 end
 
 # find a model

data/lib/pickle/session.rb

@@ -20,13 +20,23 @@ module Pickle
       end
     end
     
-    def create_model(a_model_name, fields = nil)
-      factory, label = *parse_model(a_model_name)
+    def create_model(pickle_ref, fields = nil)
+      factory, label = *parse_model(pickle_ref)
       raise ArgumentError, "Can't create with an ordinal (e.g. 1st user)" if label.is_a?(Integer)
       fields = fields.is_a?(Hash) ? parse_hash(fields) : parse_fields(fields)
       record = pickle_config.factories[factory].create(fields)
       store_model(factory, label, record)
     end
+    
+    # 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|
+        pickle_ref = factory
+        pickle_ref += ' "' + hash.delete(factory) + '"' if hash[factory] 
+        create_model(pickle_ref, hash)
+      end
+    end
 
     def find_model(a_model_name, fields = nil)
       factory, name = *parse_model(a_model_name)
@@ -39,7 +49,7 @@ module Pickle
     end
     
     def find_model!(a_model_name, fields = nil)
-      find_model(a_model_name, fields) or raise "Can't find pickle model: '#{name}' in this scenario"
+      find_model(a_model_name, fields) or raise "Can't find pickle model: '#{a_model_name}' in this scenario"
     end
     
     def find_models(factory, fields = nil)

data/pickle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pickle}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian White"]
-  s.date = %q{2010-02-27}
+  s.date = %q{2010-03-09}
   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

@@ -12,8 +12,7 @@ end
 
 # create models from a table
 Given(/^the following #{capture_plural_factory} exists?:?$/) do |plural_factory, table|
-  name = plural_factory.singularize
-  table.hashes.each { |hash| create_model(name, hash) }
+  create_models_from_table(plural_factory, table)
 end
 
 # find a model

data/spec/lib/pickle_session_spec.rb

@@ -207,6 +207,32 @@ describe Pickle::Session do
     end
   end
   
+  describe "#create_models_from_table(plural_factory, 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
+        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
+    end
+    
+    context "when given a table with a matching pickle ref column" do
+      before 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
+        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
+    end
+  end
+  
   describe "#find_model!" do
     it "should call find_model" do
       should_receive(:find_model).with('name', 'fields').and_return(mock('User'))
@@ -215,7 +241,7 @@ describe Pickle::Session do
 
     it "should call raise error if find_model returns nil" do
       should_receive(:find_model).with('name', 'fields').and_return(nil)
-      lambda { find_model!('name', 'fields') }.should raise_error
+      lambda { find_model!('name', 'fields') }.should raise_error(RuntimeError, "Can't find pickle model: 'name' in this scenario")
     end
   end
   

metadata

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