nakischema 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe6edc1f3b95435d8fa18f6d2836086050d96276b1397fce0a378ceafbaf2797
-  data.tar.gz: 2b23892f25a662c9c788a611cf1417dffcbc65a8bf4ae275cd03bfb220b17337
+  metadata.gz: 63a4f15494ac50f198c795a569e50304326cbb309e5a30bd0b0446c702da5212
+  data.tar.gz: a20e6a51a422b271b1bb98d5f4be387bd3aa89fa8dc1ac5e8701b3376bd6ba82
 SHA512:
-  metadata.gz: 4e3659f172ace66b3b3353e0630f8be2e4baa5c252fa27f22c9def7e37954082a62ed642d082b1015087e2b3126df54c477caa165179e595a401431d84b801cd
-  data.tar.gz: ec1de44276cb84f9d2e2ec374ef5be6c62fa7f9655149f572111c62911a2f83c2360450a29724e6b115147c8c467c8a44b4597363bddeb20067c5dd0b27229c7
+  metadata.gz: 2e702f55dffb989ae23ab8c0b9b4d0ad2fc2fdf7f1da3e1b90528b3c370c7bd39409fc49d844e65b2d13a1174c153c8f8dab1d17950c3981757d5f680477b7b8
+  data.tar.gz: 5ae028759edb1366dce9203a6cc68c15e23875efaa2ac47dcb3432fc1324ad08badb2d21772fe069735f64d3127063b4703598f41abfc163d6207a509f6636de

data/lib/nakischema.rb

@@ -7,11 +7,11 @@ module Nakischema
     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
+    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 Range                                           ; raise_with_path.call "expected #{schema        } != #{object.inspect}" 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?   # TODO: maybe allow Hash object?
@@ -86,6 +86,13 @@ module Nakischema
     end
   end
 
+  def self.valid? object, schema
+    validate object, schema
+    true
+  rescue Error
+    false
+  end
+
   def self.validate_oga_xml object, schema, path = []
     raise_with_path = lambda do |msg, _path = path|
       raise Error.new "#{msg}#{" (at #{_path})" unless _path.empty?}"
@@ -141,31 +148,36 @@ module Nakischema
     end
   end
 
-  def self.fixture _
+  def self.fixture _, no_shuffle = false
     require "regexp-examples"
     require "addressable"
     case _
+    when NilClass ; nil
     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] }
+      when %i{ hash     } ;   _[:hash    ].map{ |k,v| [k,fixture(v,no_shuffle)] }                .then{ |_| no_shuffle ? _ : _.shuffle }.to_h
+      when %i{ hash_req } ; [*_[:hash_req].map{ |k,v| [k,fixture(v,no_shuffle)] }, ["foo","bar"]].then{ |_| no_shuffle ? _ : _.shuffle }.to_h   # TODO: assert no collision
+      when %i{ size each } ; Array.new(_[:size].max){ fixture _[:each], no_shuffle }
       else ; fail _.keys.inspect
       end
-    when Array ; [Array] == _.map(&:class) ? _[0].map(&method(:fixture)) : fixture(_.sample)
+    when Array ; [Array] == _.map(&:class) ? _[0].map{ |_| fixture _, no_shuffle } : fixture(_.sample, no_shuffle)
     when Regexp
-      t = _.random_example
-      tt = begin
-        URI t
+      begin
+        URI(t = _.random_example)
       rescue URI::InvalidURIError
-        URI Addressable::URI.escape t
-      end
-      tt.is_a?(URI::HTTP) ? tt.to_s : t
+        begin
+          URI Addressable::URI.escape t
+        rescue Addressable::URI::InvalidURIError
+          t
+        end
+      end.to_s
     when Range ; rand _
     when String ; _
+    when TrueClass ; true
     when Class
       case _.name
       when "Integer" ; -rand(1000000)
+      when "String" ; SecureRandom.random_bytes(1000).force_encoding("utf-8").scrub
       when "Hash" ; {}
       else ; fail "bad fixture node class name: #{_.name}"
       end

data/nakischema.gemspec

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