hashidator 0.3.1 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 083c986d0c9f200a3780b92590eba1a6c5a3bc19
+  data.tar.gz: f43f7f87b611a0b448e7e5962bf75c1cbe015d86
+SHA512:
+  metadata.gz: 3410c9606685bd160689050acb9bc1826ccab7931eeb5db74f5da1bb6d426b2cb001b53453579d2b7a6f6c6b7381f258fef60347a981a704459505fe4d66a1c4
+  data.tar.gz: 8b43927c3a5ad3d8e6676f00b44b05103265016e7a11ade494359f55e2f157cea72ee9091010f9933c20225945f6470493994fede79599f6969e9b2a2d97d450

data/hashidator.gemspec

@@ -1,10 +1,12 @@
+$:.push File.expand_path("../lib", __FILE__)
+require 'hashidator/version'
+
 Gem::Specification.new do |s|
   s.name     = "hashidator"
-  s.version  = "0.3.1"
-  s.date     = "2010-10-05"
+  s.version  = Hashidator::VERSION
   s.summary  = "define schemas as a hash, and validate hashes!"
   s.email    = "harry@vangberg.name"
-  s.homepage = "http://github.com/ichverstehe/hashidator"
+  s.homepage = "https://github.com/vangberg/hashidator"
   s.description = "define schemas as a hash, and validate hashes!"
   s.has_rdoc = false
   s.authors  = ["Harry Vangberg", "Peter Suschlik"]
@@ -12,7 +14,8 @@ Gem::Specification.new do |s|
     "README", 
     "TODO",
 		"hashidator.gemspec", 
-		"lib/hashidator.rb"
+		"lib/hashidator.rb",
+		"lib/hashidator/version.rb"
   ]
   s.test_files  = [
     "test/helper.rb",

data/lib/hashidator/version.rb

@@ -0,0 +1,3 @@
+class Hashidator
+  VERSION = "0.4.0"
+end

data/lib/hashidator.rb

@@ -1,4 +1,6 @@
 class Hashidator
+  autoload :VERSION, 'hashidator/version'
+
   def self.validate(schema, input)
     new(schema).validate(input)
   end
@@ -20,20 +22,15 @@ class Hashidator
 
   def validate_value(validator, value)
     case validator
-    when Range
-      validator.include? value
     when Array
       value.respond_to?(:all?) && value.all? {|x| validate_value(validator[0], x)}
     when Symbol
       value.respond_to? validator
-    when Regexp
-      validator.match value.to_s
     when Hash
-      Hashidator.validate(validator, value)
-    when Class, Module
-      value.is_a? validator
-    when Proc
-      result = validator.call(value)
+      self.class.validate(validator, value)
+    else
+      result = validator == value
+      result = validator === value unless result
       result = validate_value(result, value) unless Boolean === result
       result
     end
@@ -50,3 +47,7 @@ end
 class FalseClass
   include Boolean
 end
+
+class Proc
+  alias :=== :call if RUBY_VERSION < "1.9"
+end

data/test/test_hashidator.rb

@@ -52,7 +52,6 @@ class TestHashidator < Test::Unit::TestCase
 
   def test_validate_boolean
     assert_true h({:admin => Boolean}, {:admin => true})
-    assert_true h({:admin => Boolean}, {:admin => true})
   end
 
   def test_invalidate_boolean
@@ -69,6 +68,17 @@ class TestHashidator < Test::Unit::TestCase
     assert_false h({:uri => /^http:/}, {:uri => :symbol})
   end
 
+  def test_validate_exact_values
+    assert_true h({:result => "ok"}, {:result => "ok"})
+    assert_true h({:bool => true}, {:bool => true})
+  end
+
+  def test_invalidate_exact_values
+    assert_false h({:result => "ok"}, {:result => "error"})
+    assert_false h({:result => "ok"}, {:result => nil})
+    assert_false h({:bool => false}, {:bool => true})
+  end
+
   def test_validate_respond_to
     assert_true h({:name => :to_s}, {:name => "Harry"})
   end
@@ -124,6 +134,25 @@ class TestHashidator < Test::Unit::TestCase
     assert_false h(schema, {:methods => ["Harry", 2]})
   end
 
+  def test_validation_with_equality
+    optional = Class.new do
+      def initialize(schema)
+        @schema = schema
+      end
+
+      def ===(other)
+        other.nil? || @schema
+      end
+    end
+
+    schema = {:phone => optional.new(String)}
+    assert_true h(schema, {:phone => "+49 2305 4711"})
+    assert_true h(schema, {:phone => nil})
+    assert_true h(schema, {})
+    assert_false h(schema, {:phone => false})
+    assert_false h(schema, {:phone => 1234567})
+  end
+
   def test_validate_nested
     schema = {:name => {:first => String, :last => String}}
     assert_true h(schema, {:name => {:first => "Mike", :last => "Damone"}})
@@ -148,6 +177,22 @@ class TestHashidator < Test::Unit::TestCase
     )
   end
 
+  def test_deep_nested_validation_uses_subclass
+    h = Class.new(Hashidator) do
+      def validate(input)
+        throw :halt, "#{input[:value]} HAMMERZEIT" if input[:value] == 'STOP'
+        super
+      end
+    end
+
+    caught = catch(:halt) do
+      h.validate(
+        {:deep => { :value => String}},
+        {:deep => { :value => 'STOP'}})
+    end
+    assert_equal "STOP HAMMERZEIT", caught
+  end
+
   def test_invalidate_for_nil_input
     schema = {:user => { :name => String }}
     assert_false h(schema, nil)

metadata

@@ -1,74 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hashidator
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Harry Vangberg
 - Peter Suschlik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-05 00:00:00 +02:00
-default_executable: 
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies: []
-
 description: define schemas as a hash, and validate hashes!
 email: harry@vangberg.name
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - TODO
 - hashidator.gemspec
 - lib/hashidator.rb
+- lib/hashidator/version.rb
 - test/helper.rb
 - test/test_hashidator.rb
-has_rdoc: true
-homepage: http://github.com/ichverstehe/hashidator
+homepage: https://github.com/vangberg/hashidator
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: define schemas as a hash, and validate hashes!
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_hashidator.rb
+has_rdoc: false