Return errors for nested schemas

Another idea for fixing davishmcclurg#1.

Author: David Harsha

lib/json_schemer/schema/base.rb

@@ -120,15 +120,42 @@ def validate_instance(instance)
         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
+          subschemas = all_of.lazy.with_index.map do |subschema, index|
+            validate_instance(instance.merge(schema: subschema, schema_pointer: "#{instance.schema_pointer}/allOf/#{index}"))
+          end
+          subschemas.each { |subschema| subschema.each(&Proc.new) } unless subschemas.all?(&:none?)
+        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(&Proc.new) } unless subschemas.any?(&:none?)
+        end
+
+        if one_of
+          subschemas = one_of.lazy.with_index.map do |subschema, index|
+            validate_instance(instance.merge(schema: subschema, schema_pointer: "#{instance.schema_pointer}/oneOf/#{index}"))
+          end
+          unless subschemas.one?(&:none?)
+            if subschemas.all?(&:none?)
+              yield error(instance, 'oneOf')
+            else
+              subschemas.each { |subschema| subschema.each(&Proc.new) }
+            end
+          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"), &Proc.new) 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"), &Proc.new) unless else_schema.nil?
         end
 
         case type

test/json_schemer_test.rb

@@ -439,6 +439,55 @@ def test_it_handles_regex_anchors
     assert !schema.valid?('fooz')
   end
 
+  def test_it_returns_nested_errors
+    root = {
+      'type' => 'object',
+      'required' => [
+        'numberOfModules'
+      ],
+      'properties' => {
+        'numberOfModules' => {
+          'allOf' => [
+            {
+              'not' => {
+                'type' => 'integer',
+                'minimum' => 38
+              }
+            },
+            {
+              'not' => {
+                'type' => 'integer',
+                'maximum' => 37,
+                'minimum' => 25
+              }
+            },
+            {
+              'not' => {
+                'type' => 'integer',
+                'maximum' => 24,
+                'minimum' => 12
+              }
+            }
+          ]
+        }
+      }
+    }
+    schema = JSONSchemer.schema(root)
+    errors = schema.validate({ 'numberOfModules' => 32 }).to_a
+    assert errors.first == {
+      'data' => 32,
+      'data_pointer' => '/numberOfModules',
+      'schema' => {
+        'type' => 'integer',
+        'maximum' => 37,
+        'minimum' => 25
+      },
+      'schema_pointer' => '/properties/numberOfModules/allOf/1/not',
+      'root_schema' => root,
+      'type' => 'not'
+    }
+  end
+
   {
     'draft4' => JSONSchemer::Schema::Draft4,
     'draft6' => JSONSchemer::Schema::Draft6,