hashidator 0.2 → 0.3

data/README

@@ -11,7 +11,7 @@ define schemas as a hash, and validate hashes!
     h.validate(invalid) #=> false
 
 see examples/basic.rb for full coverage. it knows
-classes, ranges, booleans and duck typing. yay!
+classes, ranges, booleans, proc and duck typing. yay!
 
 (c) 2009 harry vangberg <harry@vangberg.name>,
 distributed under the mit license. google it.

data/hashidator.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "hashidator"
-  s.version  = "0.2"
-  s.date     = "2009-12-19"
+  s.version  = "0.3"
+  s.date     = "2010-02-03"
   s.summary  = "define schemas as a hash, and validate hashes!"
   s.email    = "harry@vangberg.name"
   s.homepage = "http://github.com/ichverstehe/hashidator"

data/lib/hashidator.rb

@@ -1,21 +1,18 @@
 class Hashidator
   def self.validate(schema, input)
-    hd = new(schema)
-    hd.validate(input)
+    new(schema).validate(input)
   end
 
-  attr_accessor :schema, :errors
+  attr_accessor :schema
 
   def initialize(schema)
     @schema = schema
   end
 
   def validate(input)
-    results = schema.map { |key, validator|
+    schema.all? {|key, validator|
       validate_value(validator, input[key])
     }
-
-    results.all?
   end
 
   private
@@ -25,7 +22,7 @@ class Hashidator
     when Range
       validator.include? value
     when Array
-      value.all? {|x| validate_value(validator[0], x) }
+      value.all? {|x| validate_value(validator[0], x)}
     when Symbol
       value.respond_to? validator
     when Regexp
@@ -34,6 +31,10 @@ class Hashidator
       Hashidator.validate(validator, value)
     when Class, Module
       value.is_a? validator
+    when Proc
+      result = validator.call(value)
+      result = validate_value(result, value) unless Boolean === result
+      result
     end
   end
 end

data/test/helper.rb

@@ -1,7 +1,6 @@
 $:.unshift "lib"
 
 require 'test/unit'
-require 'contest'
 require 'hashidator'
 
 class Test::Unit::TestCase

data/test/test_hashidator.rb

@@ -36,6 +36,10 @@ class TestHashidator < Test::Unit::TestCase
     assert_true h({:children => [String]}, {:children => ["Sue", "Mike"]})
   end
 
+  def test_validate_empty_array_members
+    assert_true h({:children => [String]}, {:children => []})
+  end
+
   def test_invalidate_array_members
     assert_false h({:children => [String]}, {:children => ["Sue", 1234]})
   end
@@ -86,6 +90,32 @@ class TestHashidator < Test::Unit::TestCase
     )
   end
 
+  def test_validate_proc_with_boolean_result
+    assert_true h(
+      {:methods => proc {|v| v.all? {|e| e.is_a?(String) || e.is_a?(Symbol) } }},
+      {:methods => ["to_s", :to_h]}
+    )
+  end
+
+  def test_invalidate_proc_with_boolean_result
+    assert_false h(
+      {:methods => proc {|v| v.all? {|e| e.is_a?(String) || e.is_a?(Symbol) } }},
+      {:methods => ["to_s", 123]}
+    )
+  end
+
+  def test_validate_proc_with_cascaded_result
+    schema = {:methods => proc {|v| v.first.is_a?(Integer) ? [Integer] : [String] } }
+    assert_true h(schema, {:methods => [1, 2]})
+    assert_true h(schema, {:methods => ["Harry", "Damone"]})
+  end
+
+  def test_invalidate_proc_with_cascaded_result
+    schema = {:methods => proc {|v| v.first.is_a?(Integer) ? [Integer] : [String] } }
+    assert_false h(schema, {:methods => [1, "Damone"]})
+    assert_false h(schema, {:methods => ["Harry", 2]})
+  end
+
   def test_validate_nested
     schema = {:name => {:first => String, :last => String}}
     assert_true h(schema, {:name => {:first => "Mike", :last => "Damone"}})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hashidator
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Harry Vangberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-19 00:00:00 +01:00
+date: 2010-02-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: define schemas as a hash, and validate hashes!