nakischema 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17bf09e8fde06d6abca6cb282d3bfe74195c6b3ea77a0c840d903b728b4441ad
-  data.tar.gz: a2b7b578d4f54481c6c990626625ad09d7e1314e9d8623e1a1fa9e4e6c8b14a7
+  metadata.gz: fe6edc1f3b95435d8fa18f6d2836086050d96276b1397fce0a378ceafbaf2797
+  data.tar.gz: 2b23892f25a662c9c788a611cf1417dffcbc65a8bf4ae275cd03bfb220b17337
 SHA512:
-  metadata.gz: b1efdd78b40f3980d4b1176f4702f614e3afef78db35e4c1395a744a1bae47fef0f159b24012b880bb1038174ad1e3ea9f4f9111ee21799759baff5bc696032f
-  data.tar.gz: 3dd739593892acd46186e49959f0f8d5b7680decbaafc9c95b424b40d7d6af0bf7ef9f7c264e38be54506a44b43a4aa90ca5ab8903c5d07b5f99782ffcf0e694
+  metadata.gz: 4e3659f172ace66b3b3353e0630f8be2e4baa5c252fa27f22c9def7e37954082a62ed642d082b1015087e2b3126df54c477caa165179e595a401431d84b801cd
+  data.tar.gz: ec1de44276cb84f9d2e2ec374ef5be6c62fa7f9655149f572111c62911a2f83c2360450a29724e6b115147c8c467c8a44b4597363bddeb20067c5dd0b27229c7

data/lib/nakischema.rb

@@ -3,7 +3,7 @@ module Nakischema
 
   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?}#{" #{message}" if message}"
+      raise Error.new "#{msg}#{" (at #{_path})" unless _path.empty?}#{" #{message.respond_to?(:call) ? message[object] : message}" if message}"  # TODO: lambda message?
     end
     # TODO: maybe move '(at ...)' to the beginning
     case schema
@@ -22,24 +22,24 @@ module Nakischema
         # when Fixnum
         #   raise_with_path.call "expected Array != #{object.class}" unless object.is_a? Array
         #   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 :keys ; validate object.keys, v, message, path: [*path, :keys]
+        when :values ; validate object.values, v, message, path: [*path, :values]
+        when :keys_sorted ; validate object.keys.sort, v, message, path: [*path, :keys_sorted]   # TODO: maybe copypaste the Array validation to reduce [] nesting
         when :hash_opt ; raise_with_path.call "expected Hash != #{object.class}" unless object.is_a? Hash
-                         v.each{ |k, v| validate object.fetch(k), v, path: [*path, k] if object.key? k }
+                         v.each{ |k, v| validate object.fetch(k), v, message, path: [*path, k] if object.key? k }
         when :hash_req ; raise_with_path.call "expected Hash != #{object.class}" unless object.is_a? Hash
                          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] }
+                         v.each{ |k, v| validate object.fetch(k), v, message, path: [*path, k] }
         when :hash     ; raise_with_path.call "expected Hash != #{object.class}" unless object.is_a? Hash
                          hash_wo_opt = object.keys.sort - schema.fetch(:hash_opt, {}).keys
                          raise_with_path.call "expected implicit keys #{v.keys.sort} != #{hash_wo_opt}" unless v.keys.sort == hash_wo_opt
-                         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}"] }
+                         v.each{ |k, v| validate object.fetch(k), v, message, path: [*path, k] }
+        when :each_key ; object.keys.each_with_index{ |k, i| validate k, v, message, path: [*path, :"key##{i}"] }
+        when :each_value ; object.values.each_with_index{ |v_, i| validate v_, v, message, path: [*path, :"value##{i}"] }
+        when :method ; v.each{ |m, e| validate object.public_method(m).call, e, message, 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: [*path, :"##{i}"] }
+          object.each_with_index{ |e, i| validate e, v, message, 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
@@ -67,12 +67,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: [*path, :"##{i}"] }
+        object.zip(schema[0]).each_with_index{ |(o, v), i| validate o, v, message, 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: [*path, :"variant##{i}"]
+            validate object, v, message, path: [*path, :"variant##{i}"]
             nil
           rescue Error => e
             e

data/nakischema.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nakischema"
-  spec.version      = "0.2.1"
+  spec.version      = "0.2.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nakischema
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-14 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regexp-examples