hashidator 0.1 → 0.2

data/hashidator.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "hashidator"
-  s.version  = "0.1"
-  s.date     = "2009-12-18"
+  s.version  = "0.2"
+  s.date     = "2009-12-19"
   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

@@ -11,31 +11,31 @@ class Hashidator
   end
 
   def validate(input)
-    results = []
-
-    schema.each { |key, validator|
-      value = input[key]
-      
-      results << case validator
-      when Range;
-        validator.include? value
-      when Array;
-        if validator[0].is_a? Symbol
-          value.respond_to? validator[0]
-        else
-          value.all? {|x| x.is_a? validator[0]}
-        end
-      when Symbol;
-        value.respond_to? validator
-      when Hash;
-        Hashidator.validate(validator, value)
-      when Class, Module;
-        value.is_a? validator
-      end
+    results = schema.map { |key, validator|
+      validate_value(validator, input[key])
     }
 
     results.all?
   end
+
+  private
+
+  def validate_value(validator, value)
+    case validator
+    when Range
+      validator.include? value
+    when Array
+      value.all? {|x| validate_value(validator[0], x) }
+    when Symbol
+      value.respond_to? validator
+    when Regexp
+      value.match validator
+    when Hash
+      Hashidator.validate(validator, value)
+    when Class, Module
+      value.is_a? validator
+    end
+  end
 end
 
 module Boolean

data/test/test_hashidator.rb

@@ -49,6 +49,14 @@ class TestHashidator < Test::Unit::TestCase
     assert_false h({:admin => Boolean}, {:admin => 1234})
   end
 
+  def test_validate_regexp
+    assert_true h({:uri => /^http:/}, {:uri => "http://example.com"})
+  end
+
+  def test_invalidate_regexp
+    assert_false h({:uri => /^http:/}, {:uri => "john coltrane"})
+  end
+
   def test_validate_respond_to
     assert_true h({:name => :to_s}, {:name => "Harry"})
   end
@@ -71,6 +79,13 @@ class TestHashidator < Test::Unit::TestCase
     )
   end
 
+  def test_validate_array_members_range
+    assert_true h(
+      {:names => [(1..9)]},
+      {:names => [1, 9]}
+    )
+  end
+
   def test_validate_nested
     schema = {:name => {:first => String, :last => String}}
     assert_true h(schema, {:name => {:first => "Mike", :last => "Damone"}})
@@ -80,4 +95,18 @@ class TestHashidator < Test::Unit::TestCase
     schema = {:name => {:first => String, :last => String}}
     assert_false h(schema, {:name => {:first => "Mike", :last => 1234}})
   end
+
+  def test_validate_deep_nested
+    assert_true h(
+      {:people => [{ :name => :to_s, :age => (18..40)}]},
+      {:people => [{ :name => "Ann", :age => 19 }, { :name => "Bob", :age => 23 }]}
+    )
+  end
+
+  def test_invalidate_deep_nested
+    assert_false h(
+      {:people => [{ :name => :to_s, :age => (18..40)}]},
+      {:people => [{ :name => "Ann", :age => 15 }, { :name => "Bob", :age => 23 }]}
+    )
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hashidator
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Harry Vangberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 +01:00
+date: 2009-12-19 00:00:00 +01:00
 default_executable: 
 dependencies: []