pickle 0.2.8 → 0.2.9

data/History.txt

@@ -1,8 +1,19 @@
+== 0.2.9 - 27 Apr 2010 (the #railscamp7 release)
+
+* 5 improvements
+  * Fixed problem with verifying model attribute using strings with escaped quotes [Michael MacDonald]
+  * Added handling for positive and negative floats [Michael MacDonald, #railscamp7]
+  * Added handling of ruby integer syntax (e.g. 1_000_000) [Ian White]
+  * Modified the way pickle handles predicates to match rspec [Michael MacDonald, #railscamp7]
+  * Added step to assert size of an association (e.g. Then the user should have 4 friends) [Ian White]
+
+
 == 0.2.8 - 5 Apr 2010
 
 * 1 minor improvement
   * 'Then show me the email' works as expected now [#18]
 
+
 == 0.2.7 - 5 Apr 2010
 
 * 1 minor improvement

data/README.rdoc

@@ -169,6 +169,13 @@ You can refer to other models in the fields
 "Given <b>n models</b> exist with <b>fields</b>", examples:
 
   Given 10 users exist with activated: false
+  
+"Given the following <b>models</b> exist:", examples:
+
+  Given the following users exist
+    | name  | activated |
+    | Fred  | false     |
+    | Ethel | true      |
 
 ==== Then steps
 
@@ -221,13 +228,14 @@ Many-to-one assocs: "Then <b>a model</b> should be [in|one of] <b>other model</b
 ===== Asserting predicate methods
 
 "Then <b>a model</b> should [be|have] [a|an] <b>predicate</b>", e.g.
-
-  Then the user should have a status # => user.status?.should == true
-  Then the car: "batmobile" should be fast # => car.fast?.should == true
+  
+  Then the user should have a status # => user.status.should be_present
+  Then the user should have a stale password # => user.should have_stale_password
+  Then the car: "batmobile" should be fast # => car.should be_fast
   
 "Then <b>a model</b> should not [be|have] [a|an] <b>predicate</b>", e.g.
 
-  Then person: "fred" should not be childless # => fred.childless?.should == false
+  Then person: "fred" should not be childless # => fred.should_not be_childless
   
 === Regexps for use in your own steps
 

data/Rakefile

@@ -30,7 +30,7 @@ end
 namespace :rcov do
   desc "Verify RCov threshold for #{PluginName}"
   RCov::VerifyTask.new(:verify => :rcov) do |t|
-    t.threshold = 98.67
+    t.threshold = 98.29
     t.index_html = File.join(File.dirname(__FILE__), 'doc/coverage/index.html')
   end
 end

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/features/app/app.rb

@@ -29,6 +29,7 @@ ActiveRecord::Migration.suppress_messages do
     create_table :users, :force => true do |t|
       t.string :name, :status, :email
       t.decimal :attitude_score, :precision => 4, :scale => 2
+      t.boolean :has_stale_password, :default => false
     end
   end
 end

data/features/pickle/create_from_active_record.feature

@@ -4,10 +4,13 @@ Feature: I can easily create models from my blueprints
   I want to be able to create models with fields
   So that I can create models quickly and easily in my features
   
+  @wip
   Scenario: I create a user, and see if it looks right
-    Given a user exists with name: "Fred"
+    Given a user exists with name: "Fred", has_stale_password: true
     Then the user should not have a status
-
+    And the user should have a stale password
+    And the user's name should be "Fred"
+    
   Scenario: I create a user, and see if it looks right
     Given a user exists with name: "Fred", status: "crayzee"
     Then a user should exist with name: "Fred"
@@ -21,16 +24,22 @@ Feature: I can easily create models from my blueprints
   
   Scenario: I create positive and negative users
     Given a user exists with name: "Fred", attitude_score: +5.42
-    And another user exists with name: "Ethel", attitude_score: -1.46
-    Then 2 users should exist
+    And another user exists with name: "Ethel", attitude_score: -10
+		And another user exists with name: "Buddha", attitude_score: 2_000_000
+    Then 3 users should exist
     And the 1st user should be a positive person
     And the 2nd user should not be a positive person
-    
+    And the 1st user's attitude_score should be 5.42
+    And the 2nd user's attitude_score should be -10
+		And the 3rd user's attitude_score should be 2_000_000
+  	And the 3rd user's attitude_score should be 2000000
+
   Scenario: I create nil values
     Given a user exists with name: "Fred", attitude_score: nil
     Then 1 users should exist with attitude_score: nil
     And that user should be the first user
     And that user should have no attitude
+    And that user's attitude_score should be nil
     
   Scenario: create and find using tables
     Given the following users exist:

data/features/pickle/create_from_factory_girl.feature

@@ -46,8 +46,12 @@ Feature: I can easily create models from my factories
       | fork         |
       | the 1st fork |
       | the 2nd fork |
+      | the 2nd fork |
     Then the 1st tine should be in the 1st fork's tines
     And the 2nd tine should be in the 2nd fork's tines
+		And the 3rd tine should be in the 2nd fork's tines
+		And the 1st fork should have 1 tines
+		And the 2nd fork should have 2 tines
 
   Scenario: I create fork via a mapping
     Given killah fork exists

data/features/pickle/create_from_machinist.feature

@@ -7,6 +7,7 @@ Feature: I can easily create models from my blueprints
   Scenario: I create a spoon, and see if it looks right
     Given a spoon exists
     Then the spoon should be round
+    And the spoon's round should be true
 
   Scenario: I create a non round spoon, and see if it looks right
     Given a spoon exists with round: false

data/features/step_definitions/pickle_steps.rb

@@ -62,12 +62,20 @@ end
 
 # assert model.predicate? 
 Then(/^#{capture_model} should (?:be|have) (?:an? )?#{capture_predicate}$/) do |name, predicate|
-  model!(name).should send("be_#{predicate.gsub(' ', '_')}")
+  if model!(name).respond_to?("has_#{predicate.gsub(' ', '_')}")
+    model!(name).should send("have_#{predicate.gsub(' ', '_')}")
+  else
+    model!(name).should send("be_#{predicate.gsub(' ', '_')}")
+  end
 end
 
 # assert not model.predicate?
 Then(/^#{capture_model} should not (?:be|have) (?:an? )?#{capture_predicate}$/) do |name, predicate|
-  model!(name).should_not send("be_#{predicate.gsub(' ', '_')}")
+  if model!(name).respond_to?("has_#{predicate.gsub(' ', '_')}")
+    model!(name).should_not send("have_#{predicate.gsub(' ', '_')}")
+  else
+    model!(name).should_not send("be_#{predicate.gsub(' ', '_')}")
+  end
 end
 
 # model.attribute.should eql(value)
@@ -79,9 +87,14 @@ Then(/^#{capture_model}'s (\w+) (should(?: not)?) be #{capture_value}$/) do |nam
   case expected
   when 'nil', 'true', 'false'
     actual_value.send(expectation, send("be_#{expected}"))
-  when /^-?[0-9_]+$/
-    actual_value.send(expectation, eql(expected.to_i))
+  when /^[+-]?[0-9_]+(\.\d+)?$/
+    actual_value.send(expectation, eql(expected.to_f))
   else
-    actual_value.to_s.send(expectation, eql(expected))
+    actual_value.to_s.send(expectation, eql(eval(expected)))
   end
 end
+
+# assert size of association
+Then /^#{capture_model} should have (\d+) (\w+)$/ do |name, size, association|
+  model!(name).send(association).size.should == size.to_i
+end

data/lib/pickle/parser/matchers.rb

@@ -22,7 +22,7 @@ module Pickle
       end
 
       def match_value
-        "(?:\"#{match_quoted}\"|nil|true|false|[+-]?\\d+(?:\\.\\d+)?)"
+        "(?:\"#{match_quoted}\"|nil|true|false|[+-]?[0-9_]+(?:\\.\\d+)?)"
       end
 
       def match_field
@@ -58,7 +58,7 @@ module Pickle
       end
   
       def match_predicate
-        "(?:#{config.predicates.map{|m| m.to_s.sub(/\?$/,'').gsub('_','[_ ]')}.join('|')})"
+        "(?:#{config.predicates.map{|m| m.to_s.sub(/^has_/,'').sub(/\?$/,'').gsub('_','[_ ]')}.join('|')})"
       end
       
       # create capture analogues of match methods

data/pickle.gemspec

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

@@ -62,12 +62,20 @@ end
 
 # assert model.predicate? 
 Then(/^#{capture_model} should (?:be|have) (?:an? )?#{capture_predicate}$/) do |name, predicate|
-  model!(name).should send("be_#{predicate.gsub(' ', '_')}")
+  if model!(name).respond_to?("has_#{predicate.gsub(' ', '_')}")
+    model!(name).should send("have_#{predicate.gsub(' ', '_')}")
+  else
+    model!(name).should send("be_#{predicate.gsub(' ', '_')}")
+  end
 end
 
 # assert not model.predicate?
 Then(/^#{capture_model} should not (?:be|have) (?:an? )?#{capture_predicate}$/) do |name, predicate|
-  model!(name).should_not send("be_#{predicate.gsub(' ', '_')}")
+  if model!(name).respond_to?("has_#{predicate.gsub(' ', '_')}")
+    model!(name).should_not send("have_#{predicate.gsub(' ', '_')}")
+  else
+    model!(name).should_not send("be_#{predicate.gsub(' ', '_')}")
+  end
 end
 
 # model.attribute.should eql(value)
@@ -79,9 +87,14 @@ Then(/^#{capture_model}'s (\w+) (should(?: not)?) be #{capture_value}$/) do |nam
   case expected
   when 'nil', 'true', 'false'
     actual_value.send(expectation, send("be_#{expected}"))
-  when /^-?[0-9_]+$/
-    actual_value.send(expectation, eql(expected.to_i))
+  when /^[+-]?[0-9_]+(\.\d+)?$/
+    actual_value.send(expectation, eql(expected.to_f))
   else
-    actual_value.to_s.send(expectation, eql(expected))
+    actual_value.to_s.send(expectation, eql(eval(expected)))
   end
 end
+
+# assert size of association
+Then /^#{capture_model} should have (\d+) (\w+)$/ do |name, size, association|
+  model!(name).send(association).size.should == size.to_i
+end

data/spec/pickle/email_spec.rb

@@ -102,6 +102,7 @@ describe Pickle::Email do
   
   describe "#save_and_open_emails" do
     before do
+      stub!(:open_in_browser)
       stub!(:emails).and_return(["Contents of Email 1"])
       @now = "2008-01-01".to_time
       Time.stub!(:now).and_return(@now)

data/spec/pickle/parser/matchers_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 describe Pickle::Parser::Matchers do
   include Pickle::Parser::Matchers
 
-  describe "(config: [factories: user, car, fast_car] [predicates: name, status, fancy?, super_fancy?]" do
+  describe "(config: [factories: user, car, fast_car] [predicates: name, status, fancy?, super_fancy?, has_style?, has_super_style?]" do
     def config
       @config ||= Pickle::Config.new do |c|
         c.factories = {
@@ -11,7 +11,7 @@ describe Pickle::Parser::Matchers do
           'car'       => mock('factory'),
           'fast_car'  => mock('factory')
         }
-        c.predicates = %w(name status fancy? super_fancy?)
+        c.predicates = %w(name status fancy? super_fancy? has_style? has_super_style?)
       end
     end
   
@@ -50,8 +50,8 @@ describe Pickle::Parser::Matchers do
       atom_should_match     :match_model, ['a user', '1st fast car', 'the 23rd fast_car', 'the user: "fred flinstone"']
       atom_should_not_match :match_model, ['a giraffe', 'a 1st faster car: "jim"', 'an event created']
   
-      atom_should_match     :match_predicate, ['name', 'status', 'fancy', 'super fancy', 'super_fancy']
-      atom_should_not_match :match_predicate, ['nameo', 'increment', 'not a predicate']
+      atom_should_match     :match_predicate, ['name', 'status', 'fancy', 'super fancy', 'super_fancy', 'style', 'super style', 'super_style']
+      atom_should_not_match :match_predicate, ['nameo', 'increment', 'not a predicate', 'has style']
     
       atom_should_match     :match_factory, ['user', 'fast car', 'fast_car', 'car']
       atom_should_not_match :match_factory, ['users', 'faster car', 'event created']

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Ian White
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 +01:00
+date: 2010-04-27 00:00:00 +01:00
 default_executable: 
 dependencies: []