sandwich 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/sandwich/cucumber/model_steps.rb

@@ -2,7 +2,7 @@ require 'sandwich/ext/string'
 
 Given /^((?:an?|the|\d+) .+)$/ do |what| end
 
-Transform /(?:an?|\d+) .+/ do |match|
+Transform /(?:an?|\d+|the) .+/ do |match|
   materialize!(match)
 end
 
@@ -10,10 +10,6 @@ Given /^(an?|the|\d+) (.+) with the following attributes:$/ do |total, what, tab
   total.times { record!(what, table.rows_hash) }
 end
 
-Transform /the (.+?) "([^\"]*)"$/ do |what, value|
-  record(what, value)
-end
-
 Given /^(.+) belong(?:ing|s) to (an?|the) (.+)$/ do |child, determiner, rest|
   d = definition("#{determiner} #{rest}")
   a = child.class.reflect_on_association(d.raw_model.underscore.to_sym)

data/lib/sandwich/cucumber/table_steps.rb

@@ -10,3 +10,7 @@ end
 Then /^I should see #{qc} in the (\w+) data row of (.+)$/ do |value, ordinal, path|
   page.should have_xpath("(#{xpath(selector_for(path))}//tr[td])[#{ordinal.to_i}]", :text => value)
 end
+
+Then /^I should see (\d+) entr(?:y|ies) in ([^\"]+)$/ do |total, path|
+  page.should have_xpath("#{xpath(selector_for(path))}//tr[td]", :count => total.to_i)
+end

data/lib/sandwich/model/base.rb

@@ -1,6 +1,8 @@
 require 'strscan'
 
 module Sandwich
+  class ModelNotFoundError < StandardError; end
+
   class DefinitionScanner < StringScanner
     def initialize(str, attribute_separators)
       super
@@ -142,6 +144,8 @@ module Sandwich
         else
           record(model, values)
         end
+      rescue ModelNotFoundError
+        return match
       end
 
       def definition(str)

data/lib/sandwich/model/machinist.rb

@@ -33,45 +33,33 @@ module Sandwich
         end
 
         def initialize(key, model)
-          @key, @model = key, model
+          @key, @model = if (key.to_s == model.name.underscore)
+                           [:master, model]
+                         else
+                           [key, model]
+                         end
         end
 
         def get(args)
-          args = prepare_args(args)
-
-          result = case args
-                   when Hash
-                     @model.find(:first, :conditions => args)
-                   else
-                     @model.find(:first, :conditions => @model.default_attribute_args(args, :find))
-                   end
-          
-          raise "Could not find model for args: #{args.inspect}" if result.nil?
-
-          result
+          @model.find(:first, :conditions => prepare_args(args, :find)).tap do |result|
+            raise "Could not find model for args: #{args.inspect}" if result.nil?
+          end
         end
 
         def create(args = nil)
-          args = prepare_args(args)
-
-          case args
-          when Hash
-            @model.make(@key, args)
-          else
-            @model.make(@key, @model.default_attribute_args(args, :create))
-          end
+          @model.make(@key, prepare_args(args, :create))
         end
 
         private
         
-        def prepare_args(args)
+        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
-            args
+            @model.default_attribute_args(args, op)
           end
         end
 
@@ -103,7 +91,7 @@ module Sandwich
       def record!(name, args)
         materializer = Materializer[name]
 
-        return name if materializer.nil?
+        raise ModelNotFoundError, "No model found for '#{name}'" if materializer.nil?
         
         materializer.create(args)
       end
@@ -111,7 +99,7 @@ module Sandwich
       def record(name, args)
         materializer = Materializer[name]
 
-        return name if materializer.nil?
+        raise ModelNotFoundError, "No model found for '#{name}'" if materializer.nil?
 
         materializer.get(args)
       end

metadata

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