Added make_unsaved for DataMapper.

The with_save_nerfed and nerfed? methods now live in the Machinist
module, rather than in the ActiveRecord adapter.

lib/machinist.rb

@@ -79,4 +79,22 @@ def generate_attribute_value(attribute, *args)
     end
 
   end
+
+  # This sets a flag that stops make from saving objects, so
+  # that calls to make from within a blueprint don't create
+  # anything inside make_unsaved.
+  def self.with_save_nerfed
+    begin
+      @@nerfed = true
+      yield
+    ensure
+      @@nerfed = false
+    end
+  end
+
+  @@nerfed = false
+  def self.nerfed?
+    @@nerfed
+  end
+
 end

lib/machinist/active_record.rb

@@ -40,23 +40,6 @@ def self.assigned_attributes_without_associations(lathe)
       attributes
     end
 
-    # This sets a flag that stops make from saving objects, so
-    # that calls to make from within a blueprint don't create
-    # anything inside make_unsaved.
-    def self.with_save_nerfed
-      begin
-        @@nerfed = true
-        yield
-      ensure
-        @@nerfed = false
-      end
-    end
-
-    @@nerfed = false
-    def self.nerfed?
-      @@nerfed
-    end
-
   end
 
   module ActiveRecordExtensions
@@ -67,15 +50,15 @@ def self.included(base)
     module ClassMethods
       def make(*args, &block)
         lathe = Lathe.run(Machinist::ActiveRecordAdapter, self.new, *args)
-        unless Machinist::ActiveRecordAdapter.nerfed?
+        unless Machinist.nerfed?
           lathe.object.save!
           lathe.object.reload
         end
         lathe.object(&block)
       end
 
       def make_unsaved(*args)
-        returning(Machinist::ActiveRecordAdapter.with_save_nerfed { make(*args) }) do |object|
+        returning(Machinist.with_save_nerfed { make(*args) }) do |object|
           yield object if block_given?
         end
       end
@@ -90,7 +73,7 @@ def plan(*args)
   module ActiveRecordHasManyExtensions
     def make(*args, &block)
       lathe = Lathe.run(Machinist::ActiveRecordAdapter, self.build, *args)
-      unless Machinist::ActiveRecordAdapter.nerfed?
+      unless Machinist.nerfed?
         lathe.object.save!
         lathe.object.reload
       end

lib/machinist/data_mapper.rb

@@ -18,10 +18,18 @@ def self.class_for_association(object, attribute)
   module DataMapperExtensions
     def make(*args, &block)
       lathe = Lathe.run(Machinist::DataMapperAdapter, self.new, *args)
-      lathe.object.save || raise("Save failed")
-      lathe.object.reload
+      unless Machinist.nerfed?
+        lathe.object.save || raise("Save failed")
+        lathe.object.reload
+      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
   end
 
 end

spec/data_mapper_spec.rb

@@ -65,6 +65,30 @@ class Comment
       it "should raise an exception if the object can't be saved"
     end
 
+      describe "make_unsaved method" do
+      it "should not save the constructed object" do
+        Person.blueprint { }
+        person = Person.make_unsaved
+        person.should be_new_record
+      end
+
+      it "should not save associated objects" do
+        Post.blueprint { }
+        Comment.blueprint { post }
+        comment = Comment.make_unsaved
+        comment.post.should be_new_record
+      end
+
+      it "should save objects made within a passed-in block" do
+        Post.blueprint { }
+        Comment.blueprint { }
+        comment = nil
+        post = Post.make_unsaved { comment = Comment.make }
+        post.should be_new_record
+        comment.should_not be_new_record
+      end
+    end
+
   end
 end