sandwich 0.0.5 → 0.0.6

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+sandwich.gemspec

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/sandwich/cucumber/debug_steps.rb

@@ -10,7 +10,7 @@ Then /^show me all (.+)$/ do |targets|
   end
 end
 
-Then /^show me the source for #{q}$/ do |selector|
+Then /^show me the source for #{qc}$/ do |selector|
   puts locate(selector).html
 end
 

data/lib/sandwich/cucumber/model_steps.rb

@@ -1,13 +1,11 @@
 require 'sandwich/ext/string'
 require 'sandwich/cucumber/world'
 
-Given /^(an?|the|\d+) (.+) exists?$/ do |total, what|
-  class_for(what).tap do |model|
-    total.times { model.make }
-  end
+Given /^((?:an?|the|\d+) .+)$/ do |what|
+  # la la la la
 end
 
-Transform /(an?|\d+) (.+) #{q}$/ do |total, what, value|
+Transform /(an?|\d+) (.+) #{qc}$/ do |total, what, value|
   model = attr = nil
 
   begin
@@ -18,16 +16,23 @@ Transform /(an?|\d+) (.+) #{q}$/ do |total, what, value|
     model = class_for(what)
   end
 
-  r     = total.times.map { model.make(attr => value) }
+    raise \
+%q{No attribute passed and no default attribute defined. You can do that with:
+
+  YourModel.default_attribute :your_default_attribute
+
+} if attr.nil?
+
+  r = total.times.map { model.make(attr => value) }
   
   r.length == 1 ? r.first : r
 end
 
-Transform /the (.+) #{q}$/ do |what, attr, value|
+Transform /the (.+) #{qc}$/ do |what, attr, value|
   class_for(what).find(:first, :conditions => {attr => value})
 end
 
-Transform /the (.+) #{q}$/ do |what, value|
+Transform /the (.+) #{qc}$/ do |what, value|
   klass = class_for(what)
   klass.find(:first, :conditions => {klass.default_attribute => value})
 end
@@ -48,7 +53,7 @@ Given /^no (.+) exists?$/ do |what|
   class_for(what).delete_all
 end
 
-Given /^no (.+) (?:with|in) (.+) #{q} exists?$/ do |what, attr, value|
+Given /^no (.+) (?:with|in) (.+) #{qc} exists?$/ do |what, attr, value|
   class_for(what).delete_all
 end
 

data/lib/sandwich/cucumber/table_steps.rb

@@ -1,11 +1,11 @@
-When /^I fill in the #{q} row, #{q} column in (.+?) with #{q}$/ do |row, column, path, value|
+When /^I fill in the #{qc} row, #{qc} column in (.+?) with #{qc}$/ do |row, column, path, value|
   selector = xpath(selector_for(path))
   _, column_index = page.all(:xpath, "#{selector}//th").each_with_index.find { |e, i| e.text == column }
   _, row_index    = page.all(:xpath, "#{selector}//tr").each_with_index.find { |e, i| e.text.include?(row) }
   page.locate(:xpath, "((#{selector}//tr)[#{row_index + 1}]/td)[#{column_index + 1}]/input").set(value)
 end
 
-Then /^I should see #{q} in the (\w+) data row of (.+)$/ do |value, ordinal, path|
+Then /^I should see #{qc} in the (\w+) data row of (.+)$/ do |value, ordinal, path|
   within(selector_for(path)) do
     page.should have_xpath("//tr[#{ordinal.to_i}]/td", :text => value)
   end

data/lib/sandwich/ext/object.rb

@@ -1,8 +1,10 @@
 module Sandwich
   module Object
-    QUOTED_VALUE = '"([^\"]*)"' 
+    QUOTED_UNCAPTURED = '"[^\"]*"' 
+    QUOTED_CAPTURED   = '"([^\"]*)"' 
 
-    def q() QUOTED_VALUE end
+    def qc() QUOTED_CAPTURED end
+    def qu() QUOTED_UNCAPTURED end
 
     ::Object.send(:include, self)
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - David Leal
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +01:00
+date: 2010-04-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,7 +107,6 @@ files:
 - lib/sandwich/ext/string.rb
 - lib/sandwich/helpers/amounts.rb
 - lib/sandwich/helpers/base.rb
-- sandwich.gemspec
 - spec/sandwich_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/sandwich.gemspec

@@ -1,78 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{sandwich}
-  s.version = "0.0.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["David Leal"]
-  s.date = %q{2010-04-19}
-  s.description = %q{Yup, cucumber helpers}
-  s.email = %q{david@thedigitalants.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/sandwich.rb",
-     "lib/sandwich/cucumber/debug_steps.rb",
-     "lib/sandwich/cucumber/model_steps.rb",
-     "lib/sandwich/cucumber/table_steps.rb",
-     "lib/sandwich/cucumber/web_steps.rb",
-     "lib/sandwich/cucumber/world.rb",
-     "lib/sandwich/ext/active_record.rb",
-     "lib/sandwich/ext/capybara.rb",
-     "lib/sandwich/ext/object.rb",
-     "lib/sandwich/ext/string.rb",
-     "lib/sandwich/helpers/amounts.rb",
-     "lib/sandwich/helpers/base.rb",
-     "sandwich.gemspec",
-     "spec/sandwich_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/david/sandwich}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Cucumber helpers}
-  s.test_files = [
-    "spec/sandwich_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_runtime_dependency(%q<machinist>, [">= 0"])
-      s.add_runtime_dependency(%q<capybara>, [">= 0"])
-      s.add_runtime_dependency(%q<cucumber>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<machinist>, [">= 0"])
-      s.add_dependency(%q<capybara>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<machinist>, [">= 0"])
-    s.add_dependency(%q<capybara>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-  end
-end
-