nakischema 0.1.4 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 271b63150c8a6eead2fba711f312b2e2f82ba24a
-  data.tar.gz: 829b656fc7a75c629d3ccea2ac44ca4de98d4598
+SHA256:
+  metadata.gz: 17bf09e8fde06d6abca6cb282d3bfe74195c6b3ea77a0c840d903b728b4441ad
+  data.tar.gz: a2b7b578d4f54481c6c990626625ad09d7e1314e9d8623e1a1fa9e4e6c8b14a7
 SHA512:
-  metadata.gz: 07bd982a7331b8ec0937b97d682b623d4c85ac14bcb71512dc85bc16536f40f8a01dfcac0df379097614f84748a93d2d426c2addb45b0f0ca703ee1b0c069ef6
-  data.tar.gz: c2716c3ad3e8e804891ef364c31ca7ffc3a2289b16a32f203905362b866bc3f832932be3a0350c25edd41b60d7d22c3b1739d2e279aebd0f1987d76655e07ee2
+  metadata.gz: b1efdd78b40f3980d4b1176f4702f614e3afef78db35e4c1395a744a1bae47fef0f159b24012b880bb1038174ad1e3ea9f4f9111ee21799759baff5bc696032f
+  data.tar.gz: 3dd739593892acd46186e49959f0f8d5b7680decbaafc9c95b424b40d7d6af0bf7ef9f7c264e38be54506a44b43a4aa90ca5ab8903c5d07b5f99782ffcf0e694

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,32 @@ 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 :size ; raise_with_path.call "expected Range != #{v.class}" unless v.is_a? Range
+                     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 ; 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 }
+        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] }
         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}"] }
+                         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}"] }
         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 +48,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 +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, :"##{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
@@ -134,4 +140,37 @@ module Nakischema
       raise_with_path.call "unsupported rule class #{schema.class}"
     end
   end
+
+  def self.fixture _
+    require "regexp-examples"
+    require "addressable"
+    case _
+    when Hash
+      case _.keys
+      when %i{ hash     } ;   _[:hash    ].map{ |k,v| [k,fixture(v)] }.shuffle.to_h
+      when %i{ hash_req } ; [*_[:hash_req].map{ |k,v| [k,fixture(v)] }, ["foo","bar"]].shuffle.to_h   # TODO: assert no collision
+      when %i{ size each } ; Array.new(fixture _[:size]){ fixture _[:each] }
+      else ; fail _.keys.inspect
+      end
+    when Array ; [Array] == _.map(&:class) ? _[0].map(&method(:fixture)) : fixture(_.sample)
+    when Regexp
+      t = _.random_example
+      tt = begin
+        URI t
+      rescue URI::InvalidURIError
+        URI Addressable::URI.escape t
+      end
+      tt.is_a?(URI::HTTP) ? tt.to_s : t
+    when Range ; rand _
+    when String ; _
+    when Class
+      case _.name
+      when "Integer" ; -rand(1000000)
+      when "Hash" ; {}
+      else ; fail "bad fixture node class name: #{_.name}"
+      end
+    else ; fail "bad fixture node class: #{_.class.inspect}"
+    end
+  end
+
 end

data/nakischema.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nakischema"
-  spec.version      = "0.1.4"
+  spec.version      = "0.2.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."
 
@@ -9,5 +9,8 @@ Gem::Specification.new do |spec|
   spec.license      = "MIT"
   spec.metadata     = {"source_code_uri" => "https://github.com/nakilon/nakischema"}
 
+  spec.add_dependency "regexp-examples"
+  spec.add_dependency "addressable"
+
   spec.files        = %w{ LICENSE nakischema.gemspec lib/nakischema.rb }
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: nakischema
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.1
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-12 00:00:00.000000000 Z
-dependencies: []
+date: 2023-05-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: regexp-examples
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The most compact yet powerful arbitrary nested objects validator. Especially
   handy to validate JSONs.
 email: nakilon@gmail.com
@@ -40,8 +68,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