nakischema 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd008df051c38e237c7f65fe70c0680eb06c407
-  data.tar.gz: ff26282070eaad84c5d5d628bc7868b7857c1b9a
+  metadata.gz: 66f0fa36c6867bf9d4ae1e6388522a98baa5ce53
+  data.tar.gz: 3fa3398cecfcb67fa6428e0d69898f3bfc5a5af1
 SHA512:
-  metadata.gz: ac740957dfad68d5527fe0e0a1c70adb2169563e61b922ec5660a8b298947702503568f764128a8f9f89ac87a0cfa4018490b813d4a938dea43b28b149797870
-  data.tar.gz: 2db4bc15ed4f118373d621890c0351f015ce337e6ac89ad0fe8e6914090169739bb9fe437d830c98fcf22ca93749cc5616cf6bf8c02ce930fb4ea3058ae398aa
+  metadata.gz: 573bc852f4e8d2af49d856247818d3d7b264fa3aa3df05b306136eb35d72f3979831221bce80859eab539ec591b96a00283d2080a38b0b46495288e947623f78
+  data.tar.gz: '0504529ee39e1306ec3c5469bb3a2a649f5738a61965ff8613f944581e07a041e32785173ec8c48bcf24beba2b41d2d9a5620e8b87e70cad359db4ee43e490c7'

data/lib/nakischema.rb

@@ -2,11 +2,11 @@ module Nakischema
   Error = Class.new RuntimeError
   def self.validate object, schema, path = []
     raise_with_path = lambda do |msg|
-      raise Error.new "#{msg}#{" (at #{path})" unless path.empty?}"
+      raise Error.new "#{msg}#{" (at #{path})" unless path.empty?}"   # TODO: maybe move '(at ...)' to the beginning
     end
     case schema
     when Hash
-      raise_with_path.call "expected Hash != #{object.class}" unless object.is_a? Hash unless (schema.keys & %i{ keys_sorted keys values }).empty?
+      raise_with_path.call "expected Hash != #{object.class}" unless object.is_a? Hash unless (schema.keys & %i{ keys each_key each_value }).empty?
       raise_with_path.call "expected Array != #{object.class}" unless object.is_a? Array unless (schema.keys & %i{ size }).empty?
       schema.each do |k, v|
         case k
@@ -16,10 +16,10 @@ module Nakischema
         #   raise_with_path.call "expected Array != #{object.class}" unless object.is_a? Array
         #   validate object[k], v, [*path, "##{k}"]
         when :keys ; validate object.keys, v, [*path, :keys]
-        when :hash_opt ; v.each{ |k, v| validate object[k], v, [*path, k] if object.key? k }
-        when :hash
-          raise_with_path.call "expected implicit keys #{v} != #{object.keys.sort}" unless v.keys.sort == object.keys.sort
-          v.each{ |k, v| validate object.fetch(k), v, [*path, k] }
+        when :hash_opt ; v.each{ |k, v| validate object.fetch(k), v, [*path, k] if object.key? k }
+        when :hash_req ; v.each{ |k, v| validate object.fetch(k), v, [*path, k] }
+        when :hash     ; raise_with_path.call "expected implicit keys #{v.keys} != #{object.keys.sort}" unless v.keys.sort == object.keys.sort
+                         v.each{ |k, v| validate object.fetch(k), v, [*path, k] }
         when :each_key ; object.keys.each_with_index{ |k, i| validate k, v, [*path, :"key##{i}"] }
         when :each_value ; object.values.each_with_index{ |v_, i| validate v_, v, [*path, :"value##{i}"] }
         when :each
@@ -40,9 +40,9 @@ module Nakischema
         else ; raise_with_path.call "unsupported rule #{k.inspect}"
         end
       end
-    when NilClass, TrueClass, FalseClass, String ; raise_with_path.call "expected #{schema.inspect} != #{object.inspect}" unless schema == object
-    when Regexp                                  ; raise_with_path.call "expected #{schema        } != #{object.inspect}" unless schema === object
-    when Range                                   ; raise_with_path.call "expected #{schema        } != #{object        }" unless schema.include? object
+    when NilClass, TrueClass, FalseClass, String, Symbol ; raise_with_path.call "expected #{schema.inspect} != #{object.inspect}" unless schema == object
+    when Regexp                                          ; raise_with_path.call "expected #{schema        } != #{object.inspect}" unless schema === object
+    when Range                                           ; raise_with_path.call "expected #{schema        } != #{object        }" unless schema.include? object
     when Array
       if schema.map(&:class) == [Array]
         raise_with_path.call "expected Array != #{object.class}" unless object.is_a? Array

data/nakischema.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nakischema"
-  spec.version      = "0.0.0"
+  spec.version      = "0.0.1"
   spec.summary      = "compact yet powerful arbitrary nested objects validator"
   spec.description  = "The most compact yet powerful arbitrary nested objects validator. Especially handy to validate JSONs."
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nakischema
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon