sandwich 0.0.13 → 0.0.14

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/lib/sandwich/cucumber/model_steps.rb

@@ -1,6 +1,13 @@
 require 'sandwich/ext/string'
 
-Given /^((?:an?|the|\d+) .+)$/ do |what| end
+Given /^((?:an?|the|\d+) .+)$/ do |target|
+  case target
+  when String
+    raise %Q{Could not materialize "#{target}"}
+  else
+    target
+  end
+end
 
 Transform /(?:an?|\d+|the) .+/ do |match|
   materialize!(match)
@@ -23,7 +30,12 @@ Given /^(.+) belong(?:ing|s) to (an?|the) (.+)$/ do |child, determiner, rest|
 end
 
 Given /^(.+) has (.+)$/ do |parent, child|
-  parent.send(child.class.name.underscore.pluralize) << child
+  case child
+  when Array
+    child.each { |c| parent.send(child.first.class.name.underscore.pluralize) << c }
+  else
+    parent.send(child.class.name.underscore.pluralize) << c
+  end
 end
 
 Given /^the following (.+):$/ do |what, table|

data/lib/sandwich/cucumber/web_steps.rb

@@ -1,3 +1,17 @@
+module Sandwich
+  module WithinHelper
+    def inside(locator)
+      locator ? within(:xpath, xpath(locator)) { yield } : yield    
+    end
+  end
+end
+
+World(Sandwich::WithinHelper)
+
+When /^I follow "([^\"]*)"(?: (?:with)?in (.+))$/ do |link, container|
+  inside(selector_for(container)) { click_link(link) }
+end
+
 Then /^I should see "([^\"]*)" (?:with)?in (.+)$/ do |text, selector|
   page.should have_xpath(xpath(selector_for(selector)), :text => text)
 end

data/lib/sandwich/cucumber/world.rb

@@ -8,7 +8,7 @@ module Sandwich
                        end
 
       if kind == :css
-        Capybara::XPath.from_css(selector)
+        Capybara::XPath.from_css(selector).to_s
       else
         selector
       end

data/lib/sandwich/model/base.rb

@@ -123,7 +123,14 @@ module Sandwich
 
         def default_attribute_args(value, op)
           if @default_attribute.respond_to?(:call)
-            @default_attribute.call(value, op)
+            case @default_attribute.arity
+            when 1
+              @default_attribute.call(value)
+            when 2
+              @default_attribute.call(value, op)
+            else
+              raise ArgumentError, "the block sent to #{name}.default_attribute needs 1 or 2 arguments"
+            end
           elsif @default_attribute
             {@default_attribute => value}
           else
@@ -134,12 +141,14 @@ module Sandwich
 
       def materialize!(match)
         determiner, model, values = definition(match).model_definition
+        
+        return match if model.nil?
 
         if creator?(determiner)
           if determiner.to_i == 1
             record!(model, values)
           else
-            determiner.times.map { record!(model, values) }
+            determiner.times.map { record!(model.singularize, values) }
           end
         else
           record(model, values)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - David Leal
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 +01:00
+date: 2010-05-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency