machinist 1.0.4 → 1.0.5

data/lib/machinist.rb

@@ -38,7 +38,7 @@ module Machinist
       if attribute_assigned?(symbol)
         # If we've already assigned the attribute, return that.
         @object.send(symbol)
-      elsif @adapter.has_association?(@object, symbol) && !@object.send(symbol).nil?
+      elsif @adapter.has_association?(@object, symbol) && !nil_or_empty?(@object.send(symbol))
         # If the attribute is an association and is already assigned, return that.
         @object.send(symbol)
       else
@@ -58,6 +58,10 @@ module Machinist
     
   private
     
+    def nil_or_empty?(object)
+      object.respond_to?(:empty?) ? object.empty? : object.nil?
+    end
+    
     def assign_attribute(key, value)
       assigned_attributes[key.to_sym] = value
       @object.send("#{key}=", value)

data/lib/machinist/active_record.rb

@@ -1,5 +1,6 @@
 require 'machinist'
 require 'machinist/blueprints'
+require 'active_record'
 
 module Machinist
   

data/lib/machinist/sequel.rb

@@ -0,0 +1,62 @@
+require 'machinist'
+require 'machinist/blueprints'
+require 'sequel'
+
+module Machinist
+  class SequelAdapter
+    def self.has_association?(object, attribute)
+      object.class.associations.include?(attribute)
+    end
+
+    def self.class_for_association(object, attribute)
+      object.class.association_reflection(attribute).associated_class
+    end
+
+    def self.assigned_attributes_without_associations(lathe)
+      attributes = {}
+      lathe.assigned_attributes.each_pair do |attribute, value|
+        association = lathe.object.class.association_reflection(attribute)
+        if association && association[:type] == :many_to_one
+          key = association[:key] || association.default_key
+          attributes[key] = value.send(association.primary_key)
+        else
+          attributes[attribute] = value
+        end
+      end
+      attributes
+    end
+  end
+
+  module SequelExtensions
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def make(*args, &block)
+        lathe = Lathe.run(Machinist::SequelAdapter, self.new, *args)
+        unless Machinist.nerfed?
+          lathe.object.save
+          lathe.object.refresh
+        end
+        lathe.object(&block)
+      end
+
+      def make_unsaved(*args)
+        returning(Machinist.with_save_nerfed { make(*args) }) do |object|
+          yield object if block_given?
+        end
+      end
+
+      def plan(*args)
+        lathe = Lathe.run(Machinist::SequelAdapter, self.new, *args)
+        Machinist::SequelAdapter.assigned_attributes_without_associations(lathe)
+      end      
+    end
+  end
+end
+
+class Sequel::Model
+  include Machinist::Blueprints
+  include Machinist::SequelExtensions
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: machinist
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Pete Yandell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-09 00:00:00 +11:00
+date: 2009-10-20 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,7 @@ files:
 - lib/machinist/object.rb
 - lib/machinist/active_record.rb
 - lib/machinist/data_mapper.rb
+- lib/machinist/sequel.rb
 has_rdoc: true
 homepage: http://github.com/notahat/machinist
 licenses: []