nakajima-fixjour 0.0.4 → 0.0.5

data/lib/fixjour/builders.rb

@@ -54,8 +54,7 @@ module Fixjour
     # Defines the new_* method
     def define_new(name, &block)
       define_method("new_#{name}") do |*args|
-        overrides = args.first || { }
-        overrides.extend(OverrideProcessing)
+        overrides = OverridesHash.new(args.first || { })
         result = block.bind(self).call(overrides)
         result
       end
@@ -94,13 +93,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/overrides_hash.rb

@@ -0,0 +1,15 @@
+module Fixjour
+  class OverridesHash < Hash
+    private :delete
+    
+    def initialize(hash)
+      replace(hash)
+    end
+    
+    def process(option)
+      if value = delete(option)
+        yield value if block_given?
+      end
+    end
+  end
+end

data/lib/fixjour/redundant_check.rb

@@ -0,0 +1,36 @@
+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)?$/
+    
+    def method_added(sym)
+      name = sym.to_s
+      
+      if klass_name = get_klass_name(name)
+        if Fixjour.builder_defined?(klass_name)
+          raise RedundantBuilder.new("You already defined a builder for #{inspect}")
+        end
+      end
+    end
+    
+    def get_klass_name(name)
+      if match = name.match(BUILDER_METHOD_PATTERN)
+        match[2].classify.gsub(/Attribute$/, '')
+      end
+    end
+  end
+end

data/lib/fixjour.rb

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'activerecord'
 require 'core_ext/hash'
 require 'fixjour/redundant_check'
+require 'fixjour/overrides_hash'
 require 'fixjour/verify'
 require 'fixjour/errors'
 require 'fixjour/builders'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nakajima-fixjour
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -36,6 +36,8 @@ files:
 - lib/fixjour/builders.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