winch 0.0.2 → 0.0.3

data/Manifest.txt

@@ -1,8 +1,8 @@
 History.txt
 Manifest.txt
 PostInstall.txt
-README.rdoc
 Rakefile
+README.rdoc
 lib/active_resource_boot/base.rb
 lib/winch/base.rb
 lib/winch.rb
@@ -11,4 +11,4 @@ script/destroy
 script/generate
 spec/spec.opts
 spec/spec_helper.rb
-spec/winch_spec.rb
+spec/winch_spec.rb

data/lib/winch/base.rb

@@ -2,7 +2,7 @@ module Winch::Base
   module ClassMethods
     def must_have(name, options={})
       #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).one? { |v| !v.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))
     end
@@ -23,20 +23,28 @@ module Winch::Base
         end
       end
     end
-      
-    def preform_type_check
-      @broken_attributes = (@broken_attributes || []) + attributes.keys.collect do |name|
-        if attributes[name].kind_of?(ActiveResource::Base) && !attributes[name].well_typed?
-          attributes[name].broken_attributes.collect { |a| "%s.%s" % [name, a] }
-        elsif attributes[name].kind_of?(Array)
-          attributes[name].to_enum(:each_with_index).collect do |node, index|
-            node.broken_attributes.collect { |a| "%s[%s].%s" % [name, index, a] } unless node.well_typed?
-          end
-        else
-          nil
-        end
-      end.flatten.compact
 
+    def find_broken_in_active_resource(name, node)
+      @broken_attributes += node.broken_attributes.collect { |a| "%s.%s" % [name, a] } unless node.well_typed?
+    end
+
+    def find_broken_in_collection(name, node)
+      node.each_with_index do |child_node, index|
+        find_broken_in_node("%s[%s]" % [name, index], child_node)
+      end
+    end
+
+    def find_broken_in_node(name, node)
+      if node.kind_of?(ActiveResource::Base)
+        find_broken_in_active_resource(name, node)
+      elsif node.kind_of?(Array)
+        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

data/lib/winch.rb

@@ -5,9 +5,8 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Winch
-  VERSION = '0.0.2'
-  
-  autoload :Base, 'winch/base'
+  VERSION = '0.0.3' unless defined?(Winch::VERSION)
 end
 
+require 'winch/base'
 require 'active_resource_boot/base'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winch
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Vanson Samuel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -05:00
+date: 2009-12-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,8 +47,8 @@ files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
-- README.rdoc
 - Rakefile
+- README.rdoc
 - lib/active_resource_boot/base.rb
 - lib/winch/base.rb
 - lib/winch.rb