sandwich 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/sandwich/cucumber/debug_steps.rb

@@ -14,6 +14,10 @@ Then /^show me the source for #{q}$/ do |selector|
   puts locate(selector).html
 end
 
+Then /^show me the source for ([^\"]+)$/ do |selector|
+  puts locate(selector_for(selector)).html
+end
+
 Then /^show me the page text$/ do
   IO.popen("html2text", "w+") do |io| 
     io.puts response.body

data/lib/sandwich/cucumber/model_steps.rb

@@ -1,6 +1,5 @@
 require 'sandwich/ext/string'
 require 'sandwich/cucumber/world'
-require 'sandwich/regexps'
 
 Given /^(an?|the|\d+) (.+) exists?$/ do |total, what|
   class_for(what).tap do |model|
@@ -9,13 +8,22 @@ Given /^(an?|the|\d+) (.+) exists?$/ do |total, what|
 end
 
 Transform /(an?|\d+) (.+) #{q}$/ do |total, what, value|
-  model = class_for(what)
-  r     = total.times.map { model.make(model.default_attribute => value) }
+  model = attr = nil
+
+  begin
+    model = class_for(what)
+    attr  = model.default_attribute
+  rescue NameError
+    what, attr = *what.split(/(?:with|in)/).map(&:strip)
+    model = class_for(what)
+  end
+
+  r     = total.times.map { model.make(attr => value) }
   
   r.length == 1 ? r.first : r
 end
 
-Transform /the (.+) (?:with|in) (.+) #{q}$/ do |what, attr, value|
+Transform /the (.+) #{q}$/ do |what, attr, value|
   class_for(what).find(:first, :conditions => {attr => value})
 end
 
@@ -28,6 +36,10 @@ Given /^(.+) belonging to (.+)$/ do |child, parent|
   child.send("#{parent.class.name.underscore}=", parent)
 end
 
+Given /^(a .+ with .+)$/ do |obj| 
+  # la la la la
+end
+
 Given /^(.+) has (.+)$/ do |parent, child|
   parent.send(child.class.name.underscore.pluralize) << child
 end

data/lib/sandwich/cucumber/table_steps.rb

@@ -1,5 +1,3 @@
-require 'sandwich/regexps'
-
 When /^I fill in the #{q} row, #{q} column in (.+?) with #{q}$/ 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 }

data/lib/sandwich/cucumber/web_steps.rb

@@ -1,5 +1,3 @@
-require 'sandwich/regexps'
-
 Then /^I should see "([^\"]*)" within (.+)$/ do |text, selector|
   page.should have_xpath(xpath(selector_for(selector)), :text => text)
 end

data/sandwich.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sandwich}
-  s.version = "0.0.4"
+  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-18}
+  s.date = %q{2010-04-19}
   s.description = %q{Yup, cucumber helpers}
   s.email = %q{david@thedigitalants.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - David Leal
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 +01:00
+date: 2010-04-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency