notahat-machinist 0.1.7 → 0.2.0

data/lib/machinist.rb

@@ -24,22 +24,24 @@ module Machinist
     
     module ClassMethods
       def blueprint(&blueprint)
-        @blueprint = blueprint
+        @blueprint = blueprint if block_given?
+        @blueprint
       end
   
-      def make(attributes = {})
-        raise "No blueprint for class #{self}" if @blueprint.nil?
-        lathe = Lathe.new(self, attributes)
-        lathe.instance_eval(&@blueprint)
+      def make(attributes = {}, &block)
+        lathe = Lathe.run(self.new, attributes)
         unless Machinist.nerfed?
           lathe.object.save!
           lathe.object.reload
         end
-        returning(lathe.object) do |object|
-          yield object if block_given?
-        end
+        lathe.object(&block)
       end
-    
+
+      def plan(attributes = {})
+        lathe = Lathe.run(self.new, attributes)
+        lathe.assigned_attributes
+      end
+          
       def make_unsaved(attributes = {})
         returning(Machinist.with_save_nerfed { make(attributes) }) do |object|
           yield object if block_given?
@@ -48,11 +50,38 @@ module Machinist
     end
   end
   
+  module ActiveRecordAssociationExtensions
+    def make(attributes = {}, &block)
+      lathe = Machinist::Lathe.run(self.build, attributes)
+      unless Machinist.nerfed?
+        lathe.object.save!
+        lathe.object.reload
+      end
+      lathe.object(&block)
+    end
+
+    def plan(attributes = {})
+      lathe = Machinist::Lathe.run(self.build, attributes)
+      lathe.assigned_attributes
+    end
+  end
+  
   class Lathe
-    def initialize(klass, attributes = {})
-      @object = klass.new
-      attributes.each {|key, value| @object.send("#{key}=", value) }
-      @assigned_attributes = attributes.keys.map(&:to_sym)
+    def self.run(object, attributes = {})
+      blueprint = object.class.blueprint
+      raise "No blueprint for class #{object.class}" if blueprint.nil?
+      returning self.new(object, attributes) do |lathe|
+        lathe.instance_eval(&blueprint)
+      end
+    end
+    
+    def initialize(object, attributes = {})
+      @object = object
+      @assigned_attributes = {}
+      attributes.each do |key, value|
+        @object.send("#{key}=", value)
+        @assigned_attributes[key.to_sym] = value
+      end
     end
 
     # Undef a couple of methods that are common ActiveRecord attributes.
@@ -60,23 +89,35 @@ module Machinist
     undef_method :id
     undef_method :type
     
-    attr_reader :object
-
+    def object
+      yield @object if block_given?
+      @object
+    end
+    
+    attr_reader :assigned_attributes
+    
     def method_missing(symbol, *args, &block)
-      if @assigned_attributes.include?(symbol)
+      if @assigned_attributes.has_key?(symbol)
+        @object.send(symbol)
+      elsif @object.class.reflect_on_association(symbol) && !@object.send(symbol).nil?
         @object.send(symbol)
       else
-        value = if block
-          block.call
-        elsif args.first.is_a?(Hash) || args.empty?
-          symbol.to_s.camelize.constantize.make(args.first || {})
-        else
-          args.first
-        end
-        @object.send("#{symbol}=", value)
-        @assigned_attributes << symbol
+        @object.send("#{symbol}=", generate_attribute(symbol, args, &block))
       end
     end
+    
+    def generate_attribute(symbol, args)
+      value = if block_given?
+        yield
+      elsif args.first.is_a?(Hash) || args.empty?
+        klass = @object.class.reflect_on_association(symbol).class_name.constantize
+        klass.make(args.first || {})
+      else
+        args.first
+      end
+      @assigned_attributes[symbol] = value
+    end
+    
   end
 end
 
@@ -84,3 +125,6 @@ class ActiveRecord::Base
   include Machinist::ActiveRecordExtensions
 end
 
+class ActiveRecord::Associations::AssociationProxy
+  include Machinist::ActiveRecordAssociationExtensions
+end

data/lib/sham.rb

@@ -25,13 +25,7 @@ class Sham
   end
   
   def self.define(&block)
-    definer = Object.new
-    class << definer
-      def method_missing(*args, &block)
-        Sham.send(*args, &block)
-      end
-    end
-    definer.instance_eval(&block)
+    Sham.instance_eval(&block)
   end
   
   def initialize(name, options = {}, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: notahat-machinist
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors: 
 - Pete Yandell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-22 00:00:00 -08:00
+date: 2009-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: []