Merge branch 'better_error'

README.markdown

@@ -187,6 +187,8 @@ will use the `:admin` blueprint.
 
 Named blueprints call the default blueprint to set any attributes not specifically provided, so in this example the `email` attribute will still be generated even for an admin user.
 
+You must define a default blueprint for any class that has a named blueprint, even if the default blueprint is empty.
+
 
 ### Belongs\_to Associations
 

lib/machinist.rb

@@ -14,7 +14,13 @@ def self.run(adapter, object, *args)
       end
 
       blueprint = object.class.blueprint
-      raise "No blueprint for class #{object.class}" if blueprint.nil?
+      if blueprint.nil?
+        if named_blueprint
+          raise "Can't construct an object from a named blueprint without a default blueprint for class #{object.class}"
+        else
+          raise "No blueprint for class #{object.class}"
+        end
+      end
 
       attributes = args.pop || {}
 

spec/machinist_spec.rb

@@ -29,7 +29,7 @@ class Son < Dad
     end
 
     it "should raise for make on a class with no blueprint" do
-      lambda { Person.make }.should raise_error(RuntimeError)
+      lambda { Person.make }.should raise_error(RuntimeError, "No blueprint for class MachinistSpecs::Person")
     end
 
     it "should set an attribute on the constructed object from a constant in the blueprint" do
@@ -113,7 +113,7 @@ class Son < Dad
         end
         @person = Person.make(:admin)
       end
-
+      
       it "should override an attribute from the parent blueprint in the child blueprint" do
         @person.admin.should == true
       end
@@ -131,12 +131,19 @@ class Son < Dad
         Person.blueprint(:bar) { }
         Person.named_blueprints.to_set.should == [:admin, :foo, :bar].to_set
       end
-      
+
       it "should raise exception for make if named blueprint is not defined" do
         lambda { Person.make(:bogus) }.should raise_error(
           RuntimeError, "No blueprint named 'bogus' defined for class MachinistSpecs::Person"
         )
       end
+
+      it "should raise a sensible error when calling a named blueprint with no master" do
+        Post.blueprint(:foo) { }
+        lambda { Post.make(:foo) }.should raise_error(
+          RuntimeError, "Can't construct an object from a named blueprint without a default blueprint for class MachinistSpecs::Post"
+        )
+      end
     end
 
     describe "blueprint inheritance" do