sandwich 0.0.19 → 0.0.20

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.20

data/lib/sandwich/cucumber/web_steps.rb

@@ -8,7 +8,7 @@ end
 
 World(Sandwich::WithinHelper)
 
-Given /^I(?:'m| am) on the page for (.+)$/ do |record|
+Given /^I(?:\'m| am) on the page for (.+)$/ do |record|
   visit(polymorphic_path(record))
 end
 
@@ -28,6 +28,14 @@ Then /^I should see "([^\"]*)" (?:with)?in (.+)$/ do |text, selector|
   page.should have_xpath(xpath(selector_for(selector)), :text => text)
 end
 
+Then /^I should not see "([^\"]*)" (?:with)?in (.+)$/ do |text, selector|
+  page.should_not have_xpath(xpath(selector_for(selector)), :text => text)
+end
+
+Then /^I (should|should not) see a link to "([^\"]+)"/ do |action, text|
+  page.send(action.underscore, have_xpath("//a", :text => text))
+end
+
 Then /^I should see the header "([^\"]*)"$/ do |text|
   page.should have_xpath("//h1 | //h2 | //h3 | //h4 | //h5 | //h6")
 end
@@ -37,7 +45,11 @@ Then /^I should see the (notice|error) "([^\"]*)"$/ do |type, message|
 end
 
 Then /^I should see (.+)$/ do |selector|
-  locate(:xpath, xpath(selector_for(selector)))
+  page.should have_xpath(xpath(selector_for(selector)))
+end
+
+Then /^I should not see (.+)$/ do |selector|
+  page.should_not have_xpath(xpath(selector_for(selector)))
 end
 
 When /^I fill in the following:$/ do |table|

data/lib/sandwich/helpers/base.rb

@@ -27,6 +27,31 @@ module Sandwich
           raise "No default attribute defined for #{self}"
         end
       end
+
+      def prepare_args(args, op)
+        case args
+        when Hash
+          Hash[*args.each_pair.map { |k, v| prepare_pair(k, v) }.flatten]
+        when nil
+          {}
+        else
+          default_attribute_args(args, op)
+        end
+      end
+
+      private
+
+      def prepare_pair(k, v)
+        [k.underscore, prepare_value(k, v)]
+      end
+
+      def prepare_value(key, value)
+        if assoc = reflect_on_association(key.to_sym)
+          Sandwich::Model::Materializer[assoc.class_name].get(value)
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/sandwich/model/base.rb

@@ -11,7 +11,7 @@ module Sandwich
 
     module Base
       def Materializer(name)
-        Materializer[name]
+        Sandwich::Model::Materializer[name]
       end
       
       def materialize!(match)

data/lib/sandwich/model/definition_scanner.rb

@@ -72,7 +72,7 @@ module Sandwich
       def attribute_value
         skip(/\s*"/)
 
-        scan(/[^"]+/).tap { |val| skip(/(?:"|\s+)/) }
+        scan(/[^"]+/).tap { |val| skip(/(?:"|\s+)/) }.to_s
       end
 
       def has_attribute_separator?

data/lib/sandwich/model/machinist.rb

@@ -7,7 +7,7 @@ module Sandwich
 
       class Materializer < Sandwich::Model::Materializer
         def new(args = nil)
-          @model.make_unsaved(@key, prepare_args(args, :create))
+          @model.make_unsaved(@key, @model.prepare_args(args, :create))
         end
       end
 
@@ -19,8 +19,8 @@ module Sandwich
         include Sandwich::Model::Base::Extensions
 
         def blueprint(name = :master, &blueprints)
-          if block_given?
-            Machinist::Materializer[name] = self unless name == :master
+          if block_given? && name != :master
+            Machinist::Materializer[name] = self
           end
 
           super

data/lib/sandwich/model/materializer.rb

@@ -37,31 +37,10 @@ module Sandwich
       end
 
       def get(args)
-        @model.find(:first, :conditions => prepare_args(args, :find)).tap do |result|
+        @model.find(:first, :conditions => @model.prepare_args(args, :find)).tap do |result|
           raise "Could not find model for args: #{args.inspect}" if result.nil?
         end
       end
-
-      private
-      
-      def prepare_args(args, op)
-        case args
-        when Hash
-          Hash[*args.each_pair.map { |k, v| [k.underscore, prepare_value(k, v)] }.flatten]
-        when nil
-          {}
-        else
-          @model.default_attribute_args(args, op)
-        end
-      end
-
-      def prepare_value(key, value)
-        if assoc = @model.reflect_on_association(key.to_sym)
-          self.class[assoc.class_name].get(value)
-        else
-          value
-        end
-      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 19
-  version: 0.0.19
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - David Leal
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +01:00
+date: 2010-06-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency