notahat-machinist 0.2.2 → 0.3.0

data/lib/machinist/active_record.rb

@@ -51,13 +51,14 @@ module Machinist
       end
     
       module ClassMethods
-        def blueprint(&blueprint)
-          @blueprint = blueprint if block_given?
-          @blueprint
+        def blueprint(name = :master, &blueprint)
+          @blueprints ||= {}
+          @blueprints[name] = blueprint if block_given?
+          @blueprints[name]
         end
   
-        def make(attributes = {}, &block)
-          lathe = Lathe.run(self.new, attributes)
+        def make(*args, &block)
+          lathe = Lathe.run(self.new, *args)
           unless Machinist::ActiveRecord.nerfed?
             lathe.object.save!
             lathe.object.reload
@@ -65,22 +66,22 @@ module Machinist
           lathe.object(&block)
         end
 
-        def make_unsaved(attributes = {})
-          returning(Machinist::ActiveRecord.with_save_nerfed { make(attributes) }) do |object|
+        def make_unsaved(*args)
+          returning(Machinist::ActiveRecord.with_save_nerfed { make(*args) }) do |object|
             yield object if block_given?
           end
         end
           
-        def plan(attributes = {})
-          lathe = Lathe.run(self.new, attributes)
+        def plan(*args)
+          lathe = Lathe.run(self.new, *args)
           Machinist::ActiveRecord.assigned_attributes_without_associations(lathe)
         end
       end
     end
   
     module BelongsToExtensions
-      def make(attributes = {}, &block)
-        lathe = Lathe.run(self.build, attributes)
+      def make(*args, &block)
+        lathe = Lathe.run(self.build, *args)
         unless Machinist::ActiveRecord.nerfed?
           lathe.object.save!
           lathe.object.reload
@@ -88,8 +89,8 @@ module Machinist
         lathe.object(&block)
       end
 
-      def plan(attributes = {})
-        lathe = Lathe.run(self.build, attributes)
+      def plan(*args)
+        lathe = Lathe.run(self.build, *args)
         Machinist::ActiveRecord.assigned_attributes_without_associations(lathe)
       end
     end

data/lib/machinist.rb

@@ -9,10 +9,13 @@ module Machinist
   #
   # The blueprint is instance_eval'd against the Lathe.
   class Lathe
-    def self.run(object, attributes = {})
-      blueprint = object.class.blueprint
+    def self.run(object, *args)
+      blueprint       = object.class.blueprint
+      named_blueprint = object.class.blueprint(args.shift) if args.first.is_a?(Symbol)
+      attributes = args.pop || {}
       raise "No blueprint for class #{object.class}" if blueprint.nil?
       returning self.new(object, attributes) do |lathe|
+        lathe.instance_eval(&named_blueprint) if named_blueprint
         lathe.instance_eval(&blueprint)
       end
     end
@@ -52,8 +55,12 @@ module Machinist
       value = if block_given?
         yield
       elsif args.empty?
-        klass = @object.class.reflect_on_association(attribute).class_name.constantize
-        klass.make(args.first || {})
+        association = @object.class.reflect_on_association(attribute)
+        if association
+          association.class_name.constantize.make(args.first || {})
+        else
+          Sham.send(attribute)
+        end
       else
         args.first
       end

data/lib/sham.rb

@@ -19,6 +19,10 @@ class Sham
       sham.fetch_value
     end
   end
+  
+  def self.clear
+    @@shams = {}
+  end
 
   def self.reset
     @@shams.values.each(&:reset)

metadata

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