json_schemer 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 137a80ea5bf74eb23f2539a1ee4beb5752d6e17cb751101a764ef838239187ba
-  data.tar.gz: e901305179283ddeb9d4f8922cde1c0ad274b648d0147383cf2c6e93e395783e
+  metadata.gz: 99e547dd87197c33f01403e652c5ddecdb1dc39df0e63071a588135a94100960
+  data.tar.gz: d2b6d281eaa5d6d228ef5a90ea1d8ddbd22574f72d638c83d3fe48b1fd50825c
 SHA512:
-  metadata.gz: d6a0543fa428a1fcaa7081d9a9ef2394f350ad9d20c7a4878445869e5d35b8e3bd8a8f23ce71acbb46347bfb102ccbf3aec0d41bd72f58f458a3453d5b1b9b1f
-  data.tar.gz: 3d1b65df9ca5b2c225d142faa4fd2653e61bca660cd26ba775fc97fc10602aa2bd464a14f404d5a0a0ce7a30641db3f3e4009b738ea2246fe0918434bd4399d8
+  metadata.gz: 2a506748ca559c13ae0c05204011be6bd5650c8982ef2fdd4e4874bc094664201a7d5856f1cceea5b5773956c74cb4d7e1a68c9b1c8165e3c1ce40d48fcef6ed
+  data.tar.gz: ae1eaa5e38b44e88244ab51782184f397050ce07d0ace89ef450777d4be4a7c1c2003b7d8e66df7c9f1a373b2ef1b1a27c0b8c5d26d03cbabe01645f3ecf6894

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.1.10)
+    json_schemer (0.2.0)
       ecma-re-validator (~> 0.2.0)
       hana (~> 1.3.3)
       regexp_parser (~> 1.2.0)
@@ -12,7 +12,7 @@ GEM
   specs:
     ecma-re-validator (0.2.0)
       regexp_parser (~> 1.2)
-    hana (1.3.4)
+    hana (1.3.5)
     minitest (5.11.1)
     rake (10.5.0)
     regexp_parser (1.2.0)

data/lib/json_schemer.rb

@@ -1,5 +1,17 @@
 # frozen_string_literal: true
 
+require 'base64'
+require 'json'
+require 'net/http'
+require 'pathname'
+require 'time'
+require 'uri'
+
+require 'ecma-re-validator'
+require 'hana'
+require 'ipaddr'
+require 'uri_template'
+
 require 'json_schemer/version'
 require 'json_schemer/format'
 require 'json_schemer/cached_ref_resolver'
@@ -7,11 +19,11 @@ require 'json_schemer/schema/base'
 require 'json_schemer/schema/draft4'
 require 'json_schemer/schema/draft6'
 require 'json_schemer/schema/draft7'
-require 'pathname'
 
 module JSONSchemer
   class UnsupportedMetaSchema < StandardError; end
   class UnknownRef < StandardError; end
+  class InvalidRefResolution < StandardError; end
   class InvalidFileURI < StandardError; end
   class InvalidSymbolKey < StandardError; end
 

data/lib/json_schemer/format.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require 'ecma-re-validator'
-require 'ipaddr'
-require 'json'
-require 'time'
-require 'uri_template'
-
 module JSONSchemer
   module Format
     # this is no good

data/lib/json_schemer/schema/base.rb

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require 'base64'
-require 'hana'
-require 'json'
-require 'net/http'
-require 'time'
-require 'uri'
-
 module JSONSchemer
   module Schema
     class Base
@@ -25,8 +18,8 @@ module JSONSchemer
       end
 
       ID_KEYWORD = '$id'
-      DEFAULT_REF_RESOLVER = proc { |uri| raise UnknownRef, uri.to_s }.freeze
-      NET_HTTP_REF_RESOLVER = proc { |uri| JSON.parse(Net::HTTP.get(uri)) }.freeze
+      DEFAULT_REF_RESOLVER = proc { |uri| raise UnknownRef, uri.to_s }
+      NET_HTTP_REF_RESOLVER = proc { |uri| JSON.parse(Net::HTTP.get(uri)) }
       BOOLEANS = Set[true, false].freeze
 
       RUBY_REGEX_ANCHORS_TO_ECMA_262 = {
@@ -43,7 +36,7 @@ module JSONSchemer
         keywords: nil,
         ref_resolver: DEFAULT_REF_RESOLVER
       )
-        raise InvalidSymbolKey, 'schemas must use string keys' if schema.is_a?(Hash) && schema.first.first.is_a?(Symbol)
+        raise InvalidSymbolKey, 'schemas must use string keys' if schema.is_a?(Hash) && !schema.first.first.is_a?(String)
         @root = schema
         @format = format
         @formats = formats
@@ -65,18 +58,17 @@ module JSONSchemer
         validate_instance(instance).none?
       end
 
-      def validate_instance(instance)
+      def validate_instance(instance, &block)
         return enum_for(:validate_instance, instance) unless block_given?
 
         schema = instance.schema
 
-        return if schema == true
         if schema == false
           yield error(instance, 'schema')
           return
         end
 
-        return if schema.empty?
+        return if schema == true || schema.empty?
 
         type = schema['type']
         enum = schema['enum']
@@ -94,12 +86,12 @@ module JSONSchemer
         instance.parent_uri = join_uri(instance.parent_uri, id)
 
         if ref
-          validate_ref(instance, ref, &Proc.new)
+          validate_ref(instance, ref, &block)
           return
         end
 
         if format? && custom_format?(format)
-          validate_custom_format(instance, formats.fetch(format), &Proc.new)
+          validate_custom_format(instance, formats.fetch(format), &block)
         end
 
         if keywords
@@ -107,7 +99,7 @@ module JSONSchemer
             if schema.key?(keyword)
               result = callable.call(data, schema, instance.pointer)
               if result.is_a?(Array)
-                result.each { |error| yield error }
+                result.each(&block)
               elsif !result
                 yield error(instance, keyword)
               end
@@ -120,25 +112,50 @@ module JSONSchemer
         yield error(instance, 'enum') if enum && !enum.include?(data)
         yield error(instance, 'const') if schema.key?('const') && schema['const'] != data
 
-        yield error(instance, 'allOf') if all_of && !all_of.all? { |subschema| valid_instance?(instance.merge(schema: subschema)) }
-        yield error(instance, 'anyOf') if any_of && !any_of.any? { |subschema| valid_instance?(instance.merge(schema: subschema)) }
-        yield error(instance, 'oneOf') if one_of && !one_of.one? { |subschema| valid_instance?(instance.merge(schema: subschema)) }
-        yield error(instance, 'not') if !not_schema.nil? && valid_instance?(instance.merge(schema: not_schema))
+        if all_of
+          all_of.each_with_index do |subschema, index|
+            validate_instance(instance.merge(schema: subschema, schema_pointer: "#{instance.schema_pointer}/allOf/#{index}"), &block)
+          end
+        end
+
+        if any_of
+          subschemas = any_of.lazy.with_index.map do |subschema, index|
+            validate_instance(instance.merge(schema: subschema, schema_pointer: "#{instance.schema_pointer}/anyOf/#{index}"))
+          end
+          subschemas.each { |subschema| subschema.each(&block) } unless subschemas.any?(&:none?)
+        end
+
+        if one_of
+          subschemas = one_of.map.with_index do |subschema, index|
+            validate_instance(instance.merge(schema: subschema, schema_pointer: "#{instance.schema_pointer}/oneOf/#{index}"))
+          end
+          valid_subschema_count = subschemas.count(&:none?)
+          if valid_subschema_count > 1
+            yield error(instance, 'oneOf')
+          elsif valid_subschema_count == 0
+            subschemas.each { |subschema| subschema.each(&block) }
+          end
+        end
+
+        unless not_schema.nil?
+          subinstance = instance.merge(schema: not_schema, schema_pointer: "#{instance.schema_pointer}/not")
+          yield error(subinstance, 'not') if valid_instance?(subinstance)
+        end
 
         if if_schema && valid_instance?(instance.merge(schema: if_schema))
-          yield error(instance, 'then') if !then_schema.nil? && !valid_instance?(instance.merge(schema: then_schema))
+          validate_instance(instance.merge(schema: then_schema, schema_pointer: "#{instance.schema_pointer}/then"), &block) unless then_schema.nil?
         elsif if_schema
-          yield error(instance, 'else') if !else_schema.nil? && !valid_instance?(instance.merge(schema: else_schema))
+          validate_instance(instance.merge(schema: else_schema, schema_pointer: "#{instance.schema_pointer}/else"), &block) unless else_schema.nil?
         end
 
         case type
         when nil
-          validate_class(instance, &Proc.new)
+          validate_class(instance, &block)
         when String
-          validate_type(instance, type, &Proc.new)
+          validate_type(instance, type, &block)
         when Array
           if valid_type = type.find { |subtype| valid_instance?(instance.merge(schema: { 'type' => subtype })) }
-            validate_type(instance, valid_type, &Proc.new)
+            validate_type(instance, valid_type, &block)
           else
             yield error(instance, 'type')
           end
@@ -179,8 +196,8 @@ module JSONSchemer
         )
       end
 
-      def error(instance, type)
-        {
+      def error(instance, type, details = nil)
+        error = {
           'data' => instance.data,
           'data_pointer' => instance.data_pointer,
           'schema' => instance.schema,
@@ -188,43 +205,45 @@ module JSONSchemer
           'root_schema' => root,
           'type' => type,
         }
+        error['details'] = details if details
+        error
       end
 
-      def validate_class(instance)
+      def validate_class(instance, &block)
         case instance.data
         when Integer
-          validate_integer(instance, &Proc.new)
+          validate_integer(instance, &block)
         when Numeric
-          validate_number(instance, &Proc.new)
+          validate_number(instance, &block)
         when String
-          validate_string(instance, &Proc.new)
+          validate_string(instance, &block)
         when Array
-          validate_array(instance, &Proc.new)
+          validate_array(instance, &block)
         when Hash
-          validate_object(instance, &Proc.new)
+          validate_object(instance, &block)
         end
       end
 
-      def validate_type(instance, type)
+      def validate_type(instance, type, &block)
         case type
         when 'null'
           yield error(instance, 'null') unless instance.data.nil?
         when 'boolean'
           yield error(instance, 'boolean') unless BOOLEANS.include?(instance.data)
         when 'number'
-          validate_number(instance, &Proc.new)
+          validate_number(instance, &block)
         when 'integer'
-          validate_integer(instance, &Proc.new)
+          validate_integer(instance, &block)
         when 'string'
-          validate_string(instance, &Proc.new)
+          validate_string(instance, &block)
         when 'array'
-          validate_array(instance, &Proc.new)
+          validate_array(instance, &block)
         when 'object'
-          validate_object(instance, &Proc.new)
+          validate_object(instance, &block)
         end
       end
 
-      def validate_ref(instance, ref)
+      def validate_ref(instance, ref, &block)
         ref_uri = join_uri(instance.parent_uri, ref)
 
         if valid_json_pointer?(ref_uri.fragment)
@@ -235,16 +254,16 @@ module JSONSchemer
               schema_pointer: ref_uri.fragment,
               parent_uri: pointer_uri(root, ref_pointer)
             )
-            validate_instance(subinstance, &Proc.new)
+            validate_instance(subinstance, &block)
           else
-            ref_root = ref_resolver.call(ref_uri)
+            ref_root = resolve_ref(ref_uri)
             ref_object = child(ref_root)
             subinstance = instance.merge(
               schema: ref_pointer.eval(ref_root),
               schema_pointer: ref_uri.fragment,
               parent_uri: pointer_uri(ref_root, ref_pointer)
             )
-            ref_object.validate_instance(subinstance, &Proc.new)
+            ref_object.validate_instance(subinstance, &block)
           end
         elsif id = ids[ref_uri.to_s]
           subinstance = instance.merge(
@@ -252,9 +271,9 @@ module JSONSchemer
             schema_pointer: id.fetch(:pointer),
             parent_uri: ref_uri
           )
-          validate_instance(subinstance, &Proc.new)
+          validate_instance(subinstance, &block)
         else
-          ref_root = ref_resolver.call(ref_uri)
+          ref_root = resolve_ref(ref_uri)
           ref_object = child(ref_root)
           id = ref_object.ids[ref_uri.to_s] || { schema: ref_root, pointer: '' }
           subinstance = instance.merge(
@@ -262,7 +281,7 @@ module JSONSchemer
             schema_pointer: id.fetch(:pointer),
             parent_uri: ref_uri
           )
-          ref_object.validate_instance(subinstance, &Proc.new)
+          ref_object.validate_instance(subinstance, &block)
         end
       end
 
@@ -278,7 +297,7 @@ module JSONSchemer
         yield error(instance, 'exclusiveMinimum') if instance.data <= exclusive_minimum
       end
 
-      def validate_numeric(instance)
+      def validate_numeric(instance, &block)
         schema = instance.schema
         data = instance.data
 
@@ -291,8 +310,8 @@ module JSONSchemer
         yield error(instance, 'maximum') if maximum && data > maximum
         yield error(instance, 'minimum') if minimum && data < minimum
 
-        validate_exclusive_maximum(instance, exclusive_maximum, maximum, &Proc.new) if exclusive_maximum
-        validate_exclusive_minimum(instance, exclusive_minimum, minimum, &Proc.new) if exclusive_minimum
+        validate_exclusive_maximum(instance, exclusive_maximum, maximum, &block) if exclusive_maximum
+        validate_exclusive_minimum(instance, exclusive_minimum, minimum, &block) if exclusive_minimum
 
         if multiple_of
           quotient = data / multiple_of.to_f
@@ -300,16 +319,16 @@ module JSONSchemer
         end
       end
 
-      def validate_number(instance)
+      def validate_number(instance, &block)
         unless instance.data.is_a?(Numeric)
           yield error(instance, 'number')
           return
         end
 
-        validate_numeric(instance, &Proc.new)
+        validate_numeric(instance, &block)
       end
 
-      def validate_integer(instance)
+      def validate_integer(instance, &block)
         data = instance.data
 
         if !data.is_a?(Numeric) || (!data.is_a?(Integer) && data.floor != data)
@@ -317,10 +336,10 @@ module JSONSchemer
           return
         end
 
-        validate_numeric(instance, &Proc.new)
+        validate_numeric(instance, &block)
       end
 
-      def validate_string(instance)
+      def validate_string(instance, &block)
         data = instance.data
 
         unless data.is_a?(String)
@@ -453,7 +472,10 @@ module JSONSchemer
 
         yield error(instance, 'maxProperties') if max_properties && data.size > max_properties
         yield error(instance, 'minProperties') if min_properties && data.size < min_properties
-        yield error(instance, 'required') if required && required.any? { |key| !data.key?(key) }
+        if required
+          missing_keys = required - data.keys
+          yield error(instance, 'required', 'missing_keys' => missing_keys) if missing_keys.any?
+        end
 
         regex_pattern_properties = nil
         data.each do |key, value|
@@ -570,6 +592,10 @@ module JSONSchemer
         end
         ids
       end
+
+      def resolve_ref(uri)
+        ref_resolver.call(uri) || raise(InvalidRefResolution, uri.to_s)
+      end
     end
   end
 end

data/lib/json_schemer/schema/draft4.rb

@@ -32,13 +32,13 @@ module JSONSchemer
         yield error(instance, 'exclusiveMinimum') if exclusive_minimum && instance.data <= minimum
       end
 
-      def validate_integer(instance)
+      def validate_integer(instance, &block)
         if !instance.data.is_a?(Integer)
           yield error(instance, 'integer')
           return
         end
 
-        validate_numeric(instance, &Proc.new)
+        validate_numeric(instance, &block)
       end
     end
   end

data/lib/json_schemer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONSchemer
-  VERSION = '0.1.10'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - David Harsha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,7 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: JSON Schema validator. Supports drafts 4, 6, and 7.