sandwich 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/sandwich/cucumber/model_steps.rb

@@ -16,14 +16,9 @@ Transform /(an?|\d+) (.+) #{qc}$/ do |total, what, value|
     model = class_for(what)
   end
 
-  raise \
-%Q{No attribute passed and no default attribute defined. You can do that with:
+  raise "No attribute passed and no default attribute defined for #{model}" if attr.nil?
 
-#{model}.default_attribute :your_default_attribute
-
-} if attr.nil?
-
-  r = total.times.map { model.make(attr => value) }
+  r = total.times.map { model.make(attr.to_s.underscore => value) }
   
   r.length == 1 ? r.first : r
 end
@@ -56,7 +51,9 @@ end
 
 Given /^(an?|the|\d+) (.+) with the following attributes:$/ do |total, what, table|
   class_for(what).tap do |model|
-    total.times { model.make(Hash[*table.raw.map { |k, v| [k.underscore, v] }.flatten]) }
+    total.times do
+      model.make(Hash[*table.raw.map { |k, v| [k.underscore, value_for(model, k, v)] }.flatten])
+    end
   end
 end
 

data/lib/sandwich/cucumber/world.rb

@@ -7,7 +7,7 @@ module Sandwich
     def value_for(model, attr, value)
       if assoc = model.reflect_on_association(attr.to_sym)
         assoc_class = assoc.class_name.constantize
-        assoc_class.make(assoc_class.default_attribute => value)
+        assoc_class.find_or_make(assoc_class.default_attribute_query(value))
       else
         value
       end

data/lib/sandwich/ext/active_record.rb

@@ -1,4 +1,5 @@
 ActiveRecord::Base.class_eval do 
   extend  Sandwich::Base::ClassMethods
   include Sandwich::Amounts
+  include Sandwich::Helpers::Associations
 end

data/lib/sandwich/ext/machinist.rb

@@ -0,0 +1,13 @@
+module Sandwich
+  module Ext
+    module FindOrMake
+      module ActiveRecord
+        def find_or_make(filters, args = {})
+          find(:first, :conditions => filters) || make(filters.merge(args))
+        end
+
+        ::ActiveRecord::Base.send(:extend, self)
+      end
+    end
+  end
+end

data/lib/sandwich/helpers/associations.rb

@@ -0,0 +1,33 @@
+module Sandwich
+  module Helpers
+    module Associations
+      def method_missing(name, *args)
+        plural_name = name.to_s.gsub('=', '').pluralize
+
+        if respond_to?(plural_name)
+          value       = args.first
+          association = self.class.reflect_on_association(plural_name.to_sym)
+          
+          if association
+            child_class = association.class_name.constantize
+
+            if value.kind_of?(child_class)
+              send(association_name) << value
+            else
+              send(plural_name) << 
+                child_class.find_or_make(child_class.default_attribute_query(value))
+            end
+          else
+            if send(plural_name)
+              send(plural_name) << value
+            else
+              send("#{plural_name}=", [value])
+            end
+          end
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/sandwich/helpers/base.rb

@@ -5,9 +5,13 @@ module Sandwich
         if name
           @default_attribute = name
         else
-          @default_attribute
+          @default_attribute or raise "No default attribute defined for #{self}"
         end
       end
+
+      def default_attribute_query(value)
+        {default_attribute => value}
+      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - David Leal
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 +01:00
+date: 2010-04-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,9 +103,11 @@ files:
 - lib/sandwich/cucumber/world.rb
 - lib/sandwich/ext/active_record.rb
 - lib/sandwich/ext/capybara.rb
+- lib/sandwich/ext/machinist.rb
 - lib/sandwich/ext/object.rb
 - lib/sandwich/ext/string.rb
 - lib/sandwich/helpers/amounts.rb
+- lib/sandwich/helpers/associations.rb
 - lib/sandwich/helpers/base.rb
 - spec/sandwich_spec.rb
 - spec/spec.opts