nakischema 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66f0fa36c6867bf9d4ae1e6388522a98baa5ce53
-  data.tar.gz: 3fa3398cecfcb67fa6428e0d69898f3bfc5a5af1
+  metadata.gz: 23e9302b311123a5b0837d868887c752af34a976
+  data.tar.gz: 275eb8ded8c32e65f1daa4daab04c559937f1b58
 SHA512:
-  metadata.gz: 573bc852f4e8d2af49d856247818d3d7b264fa3aa3df05b306136eb35d72f3979831221bce80859eab539ec591b96a00283d2080a38b0b46495288e947623f78
-  data.tar.gz: '0504529ee39e1306ec3c5469bb3a2a649f5738a61965ff8613f944581e07a041e32785173ec8c48bcf24beba2b41d2d9a5620e8b87e70cad359db4ee43e490c7'
+  metadata.gz: 30f2f5ca6da4eed2d5d94a1e967f260e561343db487d14b0114b2f77e40da3d71b4f3c7356520390678746f49fe459f45b7c01f70ddf4f29ab6506ec267d654e
+  data.tar.gz: aecc915fd810136e9465f9921f8878005b3ebc6edb1d4d0f101f1cfc5103b85fa8c79139f6bec9dba6aa0c1dc182bc10d879a5c807cce72356d12c1f3e2a5e6a

data/lib/nakischema.rb

@@ -1,9 +1,10 @@
 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?}"   # TODO: maybe move '(at ...)' to the beginning
+    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 Hash
       raise_with_path.call "expected Hash != #{object.class}" unless object.is_a? Hash unless (schema.keys & %i{ keys each_key each_value }).empty?
@@ -14,7 +15,7 @@ module Nakischema
         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.fetch(k), v, [*path, k] if object.key? k }
         when :hash_req ; v.each{ |k, v| validate object.fetch(k), v, [*path, k] }
@@ -36,8 +37,16 @@ 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, Symbol ; raise_with_path.call "expected #{schema.inspect} != #{object.inspect}" unless schema == object
@@ -47,24 +56,22 @@ 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}" unless schema[0].size == object.size
-        object.zip(schema[0]).each_with_index do |(o, v), i|
-          validate o, v, [*path, :"##{i}"]
-        end
+        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.1"
+  spec.version      = "0.0.2"
   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.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon