nakischema 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f12dd71c0e349bb4c32d404317b64e8f4bfe2d4c
-  data.tar.gz: 56ade8e30f239f41d315b6aefa2bef82e434a605
+SHA256:
+  metadata.gz: d7b23047f5d6ea56c755489cc2e2238db4d3c550da31cc8f03a3f91d820ee465
+  data.tar.gz: 0a0feaf7a0642ad4a42d3ef62aafd34e1a6f20e7dc0b78712d2604c384d6a811
 SHA512:
-  metadata.gz: b32ad0bd582d777c3a8cf03878b359d95278e0690625a4c6184bf26fff4050e60e972539270799a6927f6dc609d18c3edd63cbf92653b01f4f2f387dff973951
-  data.tar.gz: a014ed22afe9721d23b70eefe0a012188d001db8f8fe179be2c9b0d5557a3e3aa15d5d813ebe78e603cefeb72787c5efb9baf1b17dfc2bd916d6cf7d8c4c95c4
+  metadata.gz: 8d252b3a8fd89e90531c896b30e381121ce16b024480c8d87ede34c4267a0cf03a0278e6e1a356a10c126662aebb16b456b6c2914dbb4591eeab66d41cdc9ec1
+  data.tar.gz: b7e3989528ac2bf4e233fd30b29da1cc2d0491838c26d6adbf4b014f30eae2015caaab61f9f8566af18aa31a62d23464143dba02dda73d920d8fa4c6301a4475

data/lib/nakischema.rb

@@ -1,9 +1,9 @@
 module Nakischema
   Error = Class.new RuntimeError
 
-  def self.validate object, schema, path = []
+  def self.validate object, schema, message = nil, path: []
     raise_with_path = lambda do |msg, _path = path|
-      raise Error.new "#{msg}#{" (at #{_path})" unless _path.empty?}"
+      raise Error.new "#{msg}#{" (at #{_path})" unless _path.empty?}#{" #{message}" if message}"
     end
     # TODO: maybe move '(at ...)' to the beginning
     case schema
@@ -14,26 +14,28 @@ module Nakischema
     when Range                                           ; raise_with_path.call "expected #{schema        } != #{object        }" unless schema.include? object
     when Hash
       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?
+      raise_with_path.call "expected Array != #{object.class}" unless object.is_a? Array unless (schema.keys & %i{ size }).empty?   # TODO: maybe allow Hash object?
       schema.each do |k, v|
         case k
         when :size ; raise_with_path.call "expected explicit size #{v} != #{object.size}" unless v.include? object.size
         # when Fixnum
         #   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 :values ; validate object.values, v, [*path, :values]
-        when :keys_sorted ; validate object.keys.sort, v, [*path, :keys_sorted]
-        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] }
+        #   validate object[k], v, path: [*path, :"##{k}"]
+        when :keys ; validate object.keys, v, path: [*path, :keys]
+        when :values ; validate object.values, v, path: [*path, :values]
+        when :keys_sorted ; validate object.keys.sort, v, path: [*path, :keys_sorted]   # TODO: maybe copypaste the Array validation to reduce [] nesting
+        when :hash_opt ; v.each{ |k, v| validate object.fetch(k), v, path: [*path, k] if object.key? k }
+        when :hash_req ; raise_with_path.call "expected required keys #{v.keys.sort} ∉ #{object.keys.sort}" unless (v.keys - object.keys).empty?
+                         v.each{ |k, v| validate object.fetch(k), v, path: [*path, k] }
         when :hash     ; raise_with_path.call "expected Hash != #{object.class}" unless object.is_a? 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}"] }
+                         raise_with_path.call "expected implicit keys #{v.keys.sort} != #{object.keys.sort}" unless v.keys.sort == object.keys.sort
+                         v.each{ |k, v| validate object.fetch(k), v, path: [*path, k] }
+        when :each_key ; object.keys.each_with_index{ |k, i| validate k, v, path: [*path, :"key##{i}"] }
+        when :each_value ; object.values.each_with_index{ |v_, i| validate v_, v, path: [*path, :"value##{i}"] }
+        when :method ; v.each{ |m, e| validate object.public_method(m).call, e, path: [*path, :"method##{m}"] }
         when :each
           raise_with_path.call "expected iterable != #{object.class}" unless object.respond_to? :each_with_index
-          object.each_with_index{ |e, i| validate e, v, [*path, :"##{i}"] }
+          object.each_with_index{ |e, i| validate e, v, path: [*path, :"##{i}"] }
         # when :case
         #   raise_with_path.call "expected at least one of #{v.size} cases to match the #{object.inspect}" if v.map.with_index do |(k, v), i|
         #     next if begin
@@ -42,7 +44,7 @@ module Nakischema
         #     rescue Error => e
         #       e
         #     end
-        #     validate object, v, [*path, :"case##{i}"]
+        #     validate object, v, path: [*path, :"case##{i}"]
         #     true
         #   end.none?
         when :assertions
@@ -61,12 +63,12 @@ module Nakischema
       if schema.map(&:class) == [Array]
         raise_with_path.call "expected Array != #{object.class}" unless object.is_a? Array
         raise_with_path.call "expected implicit size #{schema[0].size} != #{object.size} for #{object.inspect}" unless schema[0].size == object.size
-        object.zip(schema[0]).each_with_index{ |(o, v), i| validate o, v, [*path, :"##{i}"] }
+        object.zip(schema[0]).each_with_index{ |(o, v), i| validate o, v, path: [*path, :"##{i}"] }
       else
         results = schema.lazy.with_index.map do |v, i|
           # raise_with_path.call "unsupported nested Array" if v.is_a? Array
           begin
-            validate object, v, [*path, :"variant##{i}"]
+            validate object, v, path: [*path, :"variant##{i}"]
             nil
           rescue Error => e
             e
@@ -96,12 +98,12 @@ module Nakischema
         when :exact ; children = object.xpath "./*"
                       names = children.map(&:name).uniq
                       raise_with_path.call "expected implicit children #{v.keys} != #{names}" unless v.keys == names
-                      v.each do |k, v|
-                        selected = children.select{ |_| _.name == k }
-                        validate_oga_xml selected, v, [*path, k]
-                      end
-        when :children ; v.each{ |k, v| validate_oga_xml object.xpath(k.start_with?("./") ? k : "./#{k}"), v, [*path, k] }
-        when :attr_req ; v.each{ |k, v| validate_oga_xml object[k], v, [*path, k] }
+                      v.each{ |k, v| validate_oga_xml children.select{ |_| _.name == k }, v, [*path, k] }
+        when :children   ; v.each{ |k, v| validate_oga_xml object.xpath(k.start_with?("./") ? k : "./#{k}"), v, [*path, k] }
+        when :attr_exact ; names = object.attributes.map &:name
+                           raise_with_path.call "expected implicit attributes #{v.keys} != #{names}" unless v.keys == names
+                           v.each{ |k, v| validate_oga_xml object[k], v, [*path, k] }
+        when :attr_req   ; v.each{ |k, v| validate_oga_xml object[k], v, [*path, k] }
         when :assertions
           v.each_with_index do |assertion, i|
             begin

data/nakischema.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nakischema"
-  spec.version      = "0.1.3"
+  spec.version      = "0.2.0"
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nakischema
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-12 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies: []
 description: The most compact yet powerful arbitrary nested objects validator. Especially
   handy to validate JSONs.
@@ -40,8 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.3.25
 signing_key: 
 specification_version: 4
 summary: compact yet powerful arbitrary nested objects validator