fixjour 0.0.5 → 0.0.6

data/lib/fixjour/builders.rb

@@ -1,62 +1,79 @@
 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
+    attr_accessor :allow_redundancy
     
     # The list of classes that have builders defined.
     def builders
       @builders ||= Set.new
     end
 
-    # Registers a class' builder. This allows us to make sure
-    # redundant builders aren't defined, which can lead to confusion
-    # when trying to figure out where objects are being created.
-    def add_builder(klass)
-      unless builders.add?(klass)
-        raise RedundantBuilder.new("You already defined a builder for #{klass.inspect}")
-      end
-    end
-    
     # This method should always return a valid instance of
     # a model object.
     def define_builder(klass, options={}, &block)
       add_builder(klass)
 
-      name = name_for(klass)
-      
       if block_given?
-        define_new(name, &block)
+        define_new(klass, &block)
       else
-        define_new(name) do |overrides|
+        define_new(klass) do |overrides|
           klass.new(options.merge(overrides))
         end
       end
       
+      name = name_for(klass)
+      
       define_create(name)
       define_valid_attributes(name)
     end
     
+    # Adds builders to Fixjour.
+    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
+
+    # Checks to see whether or not a builder is defined. Duh.
+    def builder_defined?(builder)
+      case builder
+      when Class          then builders.include?(builders)
+      when String, Symbol then builders.map(&:name).include?(builder)
+      end
+    end
+    
     private
     
+    # Registers a class' builder. This allows us to make sure
+    # redundant builders aren't defined, which can lead to confusion
+    # when trying to figure out where objects are being created.
+    def add_builder(klass)
+      unless builders.add?(klass) or Fixjour.allow_redundancy
+        raise RedundantBuilder.new("You already defined a builder for #{klass.inspect}")
+      end
+    end
+    
     def name_for(klass)
       klass.name.underscore
     end
     
     # Defines the new_* method
-    def define_new(name, &block)
+    def define_new(klass, &block)
+      name = name_for(klass)
       define_method("new_#{name}") do |*args|
-        overrides = args.first || { }
-        overrides.extend(OverrideProcessing)
-        result = block.bind(self).call(overrides)
+        overrides = OverridesHash.new(args.first || { })
+        
+        args = case block.arity
+        when 1 then [overrides]
+        when 2 then [MergingProxy.new(klass, overrides), overrides]
+        end
+        
+        result = block.bind(self).call(*args)
         result
       end
     end
@@ -87,6 +104,7 @@ module Fixjour
       end
     end
     
+    # Anonymous class used for reflecting on current Fixjour state.
     def evaluator
       @evaluator ||= begin
         klass = Class.new
@@ -94,13 +112,5 @@ module Fixjour
         klass.new
       end
     end
-    
-    module OverrideProcessing
-      def process(key)
-        if value = delete(key)
-          yield value
-        end
-      end
-    end
   end
 end

data/lib/fixjour/errors.rb

@@ -8,5 +8,11 @@ module Fixjour
   # Raised when a builder block saves the object.
   class BuilderSavedRecord < StandardError; end
   
+  # Raised when a Fixjour creation method is called in
+  # the wrong context.
   class NonBlockBuilderReference < StandardError; end
+  
+  # Raised when a builder is defined for a class that already
+  # has one.
+  class RedundantBuilder < StandardError; end
 end

data/lib/fixjour/merging_proxy.rb

@@ -0,0 +1,21 @@
+module Fixjour
+  # Proxy passed to builder blocks as first argument when a builder
+  # block takes two arguments. Automatically merges overrides when
+  # the #new method is called.
+  class MergingProxy
+    instance_methods.each { |m| undef_method(m) unless m =~ /__|inspect/ }
+    
+    def initialize(klass, overrides)
+      @klass = klass
+      @overrides = overrides
+    end
+  
+    def new(defaults={})
+      @klass.new(defaults.merge(@overrides))
+    end
+    
+    def method_missing(sym, *args, &block)
+      @klass.respond_to?(sym) ? @klass.send(sym, *args, &block) : super
+    end
+  end
+end

data/lib/fixjour/overrides_hash.rb

@@ -0,0 +1,20 @@
+module Fixjour
+  # The overrides hash passed into each of the Fixjour
+  # methods is wrapped in this class to make the delete
+  # method private and add the ability to process.
+  class OverridesHash < Hash
+    private :delete
+    
+    def initialize(hash)
+      replace(hash)
+    end
+    
+    # Allows for processing of the overrides hash. Deletes
+    # the option when it's present, then yields the value.
+    def process(option)
+      if value = delete(option)
+        yield value if block_given?
+      end
+    end
+  end
+end

data/lib/fixjour/redundant_check.rb

@@ -1,19 +1,8 @@
 module Fixjour
-  # Raised when a builder is defined for a class that already
-  # has one.
-  class RedundantBuilder < StandardError; end
-  
   def self.included(klass)
     klass.extend(RedundancyChecker)
   end
   
-  def self.builder_defined?(builder)
-    case builder
-    when Class          then builders.include?(builders)
-    when String, Symbol then builders.map(&:name).include?(builder)
-    end
-  end
-  
   module RedundancyChecker
     BUILDER_METHOD_PATTERN = /^(new|create|valid)_(\w+)(_attributes)?$/
     

data/lib/fixjour.rb

@@ -3,7 +3,9 @@ $LOAD_PATH << File.dirname(__FILE__)
 require 'rubygems'
 require 'activerecord'
 require 'core_ext/hash'
+require 'fixjour/merging_proxy'
 require 'fixjour/redundant_check'
+require 'fixjour/overrides_hash'
 require 'fixjour/verify'
 require 'fixjour/errors'
 require 'fixjour/builders'
@@ -11,6 +13,8 @@ require 'fixjour/builders'
 # This method is just for prettiness
 def Fixjour(options={}, &block)
   return Fixjour unless block_given?
+  Fixjour.allow_redundancy = options[:allow_redundancy]
   Fixjour.evaluate(&block)
   Fixjour.verify! if options[:verify]
+  Fixjour.allow_redundancy = false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fixjour
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -35,9 +35,11 @@ files:
 - lib/core_ext/hash.rb
 - lib/fixjour
 - lib/fixjour/builders.rb
+- lib/fixjour/merging_proxy.rb
 - lib/fixjour/errors.rb
 - lib/fixjour/verify.rb
 - lib/fixjour/redundant_check.rb
+- lib/fixjour/overrides_hash.rb
 - lib/fixjour.rb
 has_rdoc: true
 homepage: http://github.com/nakajima/fixjour