nakischema 0.0.0 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd008df051c38e237c7f65fe70c0680eb06c407
-  data.tar.gz: ff26282070eaad84c5d5d628bc7868b7857c1b9a
+  metadata.gz: f1ee5445ac066ed5b77d5dd3554d96a4c7723e26
+  data.tar.gz: 4302db46b28684a12f8c8b259c8597373355a011
 SHA512:
-  metadata.gz: ac740957dfad68d5527fe0e0a1c70adb2169563e61b922ec5660a8b298947702503568f764128a8f9f89ac87a0cfa4018490b813d4a938dea43b28b149797870
-  data.tar.gz: 2db4bc15ed4f118373d621890c0351f015ce337e6ac89ad0fe8e6914090169739bb9fe437d830c98fcf22ca93749cc5616cf6bf8c02ce930fb4ea3058ae398aa
+  metadata.gz: 91252167fbe10d1808ea86f108fc37d9ac6be0a36b99cccfab36dc2960ba04b161ac153a66071181cd394dc36ab512c4a5d7363a7e8dd3fe86ba39ea7b52b984
+  data.tar.gz: 422749ffe71639df10e08790406a03687d35e056213c1ad977f41b7ceec22ed727e38a28382af7fab75297cec9a808f373d18581a9584ea0e4d43d1111482e15

data/lib/nakischema.rb

@@ -1,25 +1,33 @@
 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_with_path = lambda do |msg, _path = path|
+      raise Error.new "#{msg}#{" (at #{_path})" unless _path.empty?}"
     end
+    # TODO: maybe move '(at ...)' to the beginning
     case schema
+    when NilClass, TrueClass, FalseClass, String, Symbol ; raise_with_path.call "expected #{schema.inspect} != #{object.inspect}" unless schema == object
+    # TODO: maybe deprecate the NilClass, TrueClass, FalseClass since they can be asserted via the next case branch
+    when Class                                           ; raise_with_path.call "expected #{schema        } != #{object.class  }" 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 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
-        # when :keys_sorted ; raise_with_path.call "expected explicit keys #{v} != #{object.keys.sort}" unless v == object.keys.sort
         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}"]
+        #   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 :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] }
+        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}"] }
         when :each
@@ -36,35 +44,38 @@ module Nakischema
         #     validate object, v, [*path, :"case##{i}"]
         #     true
         #   end.none?
-        when :assertions ; v.each_with_index{ |assertion, i| raise_with_path.call "custom assertion failed" unless assertion.call object, [*path, :"assertion##{i}"] }
-        else ; raise_with_path.call "unsupported rule #{k.inspect}"
+        when :assertions
+          v.each_with_index do |assertion, i|
+            begin
+              raise Error.new "custom assertion failed" unless assertion.call object, [*path, :"assertion##{i}"]
+            rescue Error => e
+              raise_with_path.call e, [*path, :"assertion##{i}"]
+            end
+          end
+        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 Array
       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}" unless schema[0].size == object.size
-        object.zip(schema[0]).each_with_index do |(o, v), i|
-          validate o, v, [*path, :"##{i}"]
-        end
+        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}"] }
       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, :"variant##{i}"]
             nil
           rescue Error => e
             e
           end
         end
-        raise_with_path.call \
-          "expected at least one of #{schema.size} rules to match the #{object.inspect}, errors:\n" +
+        raise Error.new "expected at least one of #{schema.size} rules to match the #{object.inspect}, errors:\n" +
           results.force.compact.map{ |_| _.to_s.gsub(/^/, "  ") }.join("\n") if results.all?
       end
-    else ; raise_with_path.call "unsupported rule class #{schema.class}"
+    else
+      raise_with_path.call "unsupported rule class #{schema.class}"
     end
   end
 end

data/nakischema.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nakischema"
-  spec.version      = "0.0.0"
+  spec.version      = "0.1.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.0.0
+  version: 0.1.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-14 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies: []
 description: The most compact yet powerful arbitrary nested objects validator. Especially
   handy to validate JSONs.