nakischema 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7b23047f5d6ea56c755489cc2e2238db4d3c550da31cc8f03a3f91d820ee465
-  data.tar.gz: 0a0feaf7a0642ad4a42d3ef62aafd34e1a6f20e7dc0b78712d2604c384d6a811
+  metadata.gz: 17bf09e8fde06d6abca6cb282d3bfe74195c6b3ea77a0c840d903b728b4441ad
+  data.tar.gz: a2b7b578d4f54481c6c990626625ad09d7e1314e9d8623e1a1fa9e4e6c8b14a7
 SHA512:
-  metadata.gz: 8d252b3a8fd89e90531c896b30e381121ce16b024480c8d87ede34c4267a0cf03a0278e6e1a356a10c126662aebb16b456b6c2914dbb4591eeab66d41cdc9ec1
-  data.tar.gz: b7e3989528ac2bf4e233fd30b29da1cc2d0491838c26d6adbf4b014f30eae2015caaab61f9f8566af18aa31a62d23464143dba02dda73d920d8fa4c6301a4475
+  metadata.gz: b1efdd78b40f3980d4b1176f4702f614e3afef78db35e4c1395a744a1bae47fef0f159b24012b880bb1038174ad1e3ea9f4f9111ee21799759baff5bc696032f
+  data.tar.gz: 3dd739593892acd46186e49959f0f8d5b7680decbaafc9c95b424b40d7d6af0bf7ef9f7c264e38be54506a44b43a4aa90ca5ab8903c5d07b5f99782ffcf0e694

data/lib/nakischema.rb

@@ -17,18 +17,22 @@ module Nakischema
       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: [*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?
+        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.sort} != #{object.keys.sort}" unless v.keys.sort == object.keys.sort
+                         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}"] }
@@ -136,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.2.0"
+  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.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-22 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