fixjour 0.0.1 → 0.0.2

data/lib/fixjour.rb

@@ -8,7 +8,8 @@ require 'fixjour/errors'
 require 'fixjour/builders'
 
 # This method is just for prettiness
-def Fixjour(&block)
+def Fixjour(options={}, &block)
   return Fixjour unless block_given?
-  Fixjour.module_eval(&block)
+  Fixjour.evaluate(&block)
+  Fixjour.verify! if options[:verify]
 end

data/lib/fixjour/builders.rb

@@ -1,5 +1,17 @@
 module Fixjour
   class << self
+    def evaluate(&block)
+      begin
+        module_eval(&block)
+      rescue NameError => e
+        if evaluator.respond_to?(e.name)
+          raise NonBlockBuilderReference.new("You must use a builder block in order to reference other Fixjour creation methods.")
+        else
+          raise e
+        end
+      end
+    end
+    
     # The list of classes that have builders defined.
     def builders
       @builders ||= Set.new
@@ -16,12 +28,19 @@ module Fixjour
     
     # This method should always return a valid instance of
     # a model object.
-    def define_builder(klass, &block)
+    def define_builder(klass, options={}, &block)
       add_builder(klass)
 
       name = name_for(klass)
-
-      define_new(name, block)
+      
+      if block_given?
+        define_new(name, &block)
+      else
+        define_new(name) do |overrides|
+          klass.new(options.merge(overrides))
+        end
+      end
+      
       define_create(name)
       define_valid_attributes(name)
     end
@@ -33,10 +52,11 @@ module Fixjour
     end
     
     # Defines the new_* method
-    def define_new(name, block)
+    def define_new(name, &block)
       define_method("new_#{name}") do |*args|
         overrides = args.first || { }
-        block.bind(self).call(overrides)
+        result = block.bind(self).call(overrides)
+        result
       end
     end
     
@@ -60,9 +80,18 @@ module Fixjour
 
         overrides = args.extract_options!
         attrs = instance_variable_get("@__valid_#{name}_attrs").merge(overrides)
+        attrs.stringify_keys!
         attrs.make_indifferent!
         attrs
       end
     end
+    
+    def evaluator
+      @evaluator ||= begin
+        klass = Class.new
+        klass.send :include, self
+        klass.new
+      end
+    end
   end
-end
+end

data/lib/fixjour/errors.rb

@@ -11,4 +11,6 @@ module Fixjour
   
   # Raised when a builder block saves the object.
   class BuilderSavedRecord < StandardError; end
+  
+  class NonBlockBuilderReference < StandardError; end
 end

data/lib/fixjour/verify.rb

@@ -7,7 +7,7 @@ module Fixjour
     # * The creation methods return objects of the proper type
     def verify!
       builders.each do |klass|
-        result = validity_checker.send("new_#{name_for(klass)}")
+        result = evaluator.send("new_#{name_for(klass)}")
         
         unless result.valid?
           raise InvalidBuilder.new("The builder for #{klass} returns an invalid object")
@@ -22,15 +22,5 @@ module Fixjour
         end
       end
     end
-
-    private
-
-    def validity_checker
-      @evaluator ||= begin
-        klass = Class.new
-        klass.send :include, self
-        klass.new
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fixjour
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Pat Nakajima