winch 0.0.3 → 0.0.4

data/lib/winch/base.rb

@@ -4,23 +4,40 @@ module Winch::Base
       #Either :default, or :faux can be anything including false and '', just not nil
       raise "%s can have either a default or a faux value, but not both." % name unless options.values_at(:default, :faux).select { |v| !v.nil? }.length == 1
 
-      self.must_haves = (self.must_haves || []).push(options.merge(:name => name))
+      self.must_haves = (self.must_haves || {}).merge(name => options.merge(:name => name))
     end
   end
   
   module InstanceMethods
     def initialize_winch(attributes)
-      (self.must_haves || []).each do |clause| 
-        name = clause[:name]
+      (self.must_haves || {}).each do |name, clause|
+        set_default_for_attribute(attributes, clause)
+      end
+    end
 
-        next unless attributes[name].nil?
+    def preform_type_check
+      @broken_attributes ||= []
+      attributes.keys.each { |name| find_broken_in_node(name, attributes[name]) }
+      @well_typed = @broken_attributes.blank?
 
-        if clause[:default].nil?
-          @broken_attributes = (@broken_attributes || []).push(name)
-          attributes[name] = clause[:faux]
-        else
-          attributes[name] = clause[:default]
-        end
+      return if @well_typed
+      return unless self.class.parent == Object
+      
+      raise Winch::TypeError.new(:object => self) if Winch.config.raise_on_broken_attributes
+    end
+
+    private
+
+    def set_default_for_attribute(attributes, clause)
+      name = clause[:name]
+
+      return unless attributes[name].nil?
+
+      if clause[:default].nil?
+        @broken_attributes = (@broken_attributes || []).push(name)
+        attributes[name] = clause[:faux]
+      else
+        attributes[name] = clause[:default]
       end
     end
 
@@ -41,17 +58,12 @@ module Winch::Base
         find_broken_in_collection(name, node)
       end
     end
-
-    def preform_type_check
-      @broken_attributes ||= []
-      attributes.keys.each { |name| find_broken_in_node(name, attributes[name]) }
-      @well_typed = @broken_attributes.blank?
-    end
   end
-  
+
   def self.included(klass)
     klass.class_eval do
-      class_inheritable_array :must_haves, :instance_writer => false
+      class_inheritable_hash :must_haves, :instance_writer => false
+
       attr_reader :well_typed, :broken_attributes
       alias_method :well_typed?, :well_typed
       
@@ -59,4 +71,18 @@ module Winch::Base
       include InstanceMethods
     end
   end
+end
+
+module Winch
+  def self.config
+    @@config ||= OpenStruct.new(:raise_on_broken_attributes => false)
+  end
+end
+
+class Winch::TypeError < Exception
+  attr_accessor :object
+
+  def initialize(options={})
+    self.object = options[:object]
+  end
 end

data/lib/winch.rb

@@ -5,7 +5,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Winch
-  VERSION = '0.0.3' unless defined?(Winch::VERSION)
+  VERSION = '0.0.4' unless defined?(Winch::VERSION)
 end
 
 require 'winch/base'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winch
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Vanson Samuel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 -05:00
+date: 2009-12-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency