openc-json_schema 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjYwZDVlMmQ4MWVhNmI2MDY1OTAzOWYzMTMwY2JmOWI0MTBkN2ZlOA==
+    OWJiYzM4NmZlYzYxNzU5MmNjODQ0NTI3ODhmODcyNTAyZGU2MTZhNQ==
   data.tar.gz: !binary |-
-    ZmQyZjNiMmIzZTg0N2VjNGRlNmYxOTM4ZjllNDJjMjQwMGY5MzFhMQ==
+    NzFhYzk0MGQ0ODZlMWQ4Mjg4Njg0YjZkNWVlYWZiZDcyMGVhZjQzNw==
 SHA512:
   metadata.gz: !binary |-
-    NGM1ZmZkNmJjN2ExMGJlMzhhMWUzMDI2MTdjNDZiZDE0NDkwNDc0MzVhMGQw
-    NTVmZGU5Yzc4NzdiN2MwNjkwN2NhMDFlYTA2YWEzMTY2ZGEzZjA1YmEyZjM1
-    NmJhOWVhNmQ3OGY1OTYwZTk4NjhkNzJkYzg1MDU2MGJkMDAyZWI=
+    NjM0ZTVlZDRjZGVlY2NkMWQyZjQ1YWNiZDdmYzg1MmJjNTllZmNhOTgwYWNj
+    M2NlNGE0OGM0MzJhY2I5MmE0ZDRmZWIzMDQzZjkwYjYwZmJmNTA5YzRlMzk1
+    OGQyZjZmZDdjMGI4YWE1ODYzM2JkZGNmOWM5OGIwMTllY2VmNDE=
   data.tar.gz: !binary |-
-    OTdmYmMwODc0MTQ1OWYwZmQxZDdhMzQ3NzZjZDI3ZGQ1OWI4YWE3OWY4OTg5
-    ZWMxN2FhY2EwNmI2YjExZmY0NDkyNGQ0ZGZmMWE4OWRmNDBhNGEzZThjYjg2
-    YjhjODA5OGY2NzRiZDAwNmM5OWJhNzQxMDU3ODc3OGY2OWFmYmY=
+    NTE0OWZhNWMwNTJkOGYxOGFmN2M0NWY2NzJlZWViYzczODM4YWZiMjc2YzE1
+    MTgwZmQ0MTc0ZGNiYjBhZDFhNzI4NDM1NWQ0ZTlkMTA4MDRiZmM4MTljMWY3
+    YTFkOWFhYWFmOWMxY2UzOGE3NzY2OWEwNGM4NjdiYThkZTg5YjU=

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    openc-json_schema (0.0.2)
+    openc-json_schema (0.0.3)
       json-schema (= 2.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.3.7)
     diff-lcs (1.2.5)
     json-schema (2.5.0)
       addressable (~> 2.3)

data/lib/openc/json_schema/validator.rb

@@ -34,19 +34,24 @@ module Openc
           if error[:message].match(/did not match any/)
             path_elements = fragment_to_path(error[:fragment]).split('.')
 
-            raise "Deeply nested OneOf error at: #{error[:fragment]}" unless path_elements.size == 1
+            record_fragment = record
+            schema_fragment = schema
 
-            record_fragment = record[path_elements[0]]
-            schema_fragments = schema['properties'][path_elements[0]]['oneOf']
+            path_elements.each do |element|
+              record_fragment = record_fragment[element]
+              schema_fragment = schema_fragment['properties'][element]
+            end
+
+            one_of_schemas = schema_fragment['oneOf']
 
-            unless schema_fragments.nil?
-              schema_fragments.each do |s|
+            unless one_of_schemas.nil?
+              one_of_schemas.each do |s|
                 s['properties'].each do |k, v|
                   next if v['enum'].nil?
 
                   if v['enum'].include?(record_fragment[k])
                     error1 = validate(s, schema_dir, record_fragment)
-                    return error1.merge(:path => "#{path_elements[0]}.#{error1[:path]}")
+                    return error1.merge(:path => "#{path_elements.join('.')}.#{error1[:path]}")
                   end
                 end
               end

data/lib/openc/json_schema/version.rb

@@ -1,5 +1,5 @@
 module Openc
   module JsonSchema
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/publish.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+gem build openc-json_schema.gemspec
+gem push $(ls *gem|tail -1)
+
+function clean {
+rm *gem
+}
+trap clean EXIT

data/spec/openc_json_schema_spec.rb

@@ -89,6 +89,51 @@ describe Openc::JsonSchema do
         )
       end
 
+      specify 'and we are switching on a nested enum field' do
+        schema = {
+          '$schema' => 'http://json-schema.org/draft-04/schema#',
+          'type' => 'object',
+          'properties' => {
+            'xxx' => {
+              'type' => 'object',
+              'properties' => {
+                'aaa' => {
+                  'type' => 'object',
+                  'oneOf' => [{
+                    'properties' => {
+                      'a_type' => {
+                        'enum' => ['a1']
+                      },
+                      'a_properties' => {
+                        'type' => 'object',
+                        'required' => ['bbb'],
+                      }
+                    }
+                  }, {
+                    'properties' => {
+                      'a_type' => {
+                        'enum' => ['a2']
+                      },
+                      'a_properties' => {
+                        'type' => 'object',
+                        'required' => ['ccc']
+                      }
+                    }
+                  }]
+                }
+              }
+            }
+          }
+        }
+
+        record = {'xxx' => {'aaa' => {'a_type' => 'a1', 'a_properties' => {}}}}
+
+        expect([schema, record]).to fail_validation_with(
+          :type => :missing,
+          :path => 'xxx.aaa.a_properties.bbb'
+        )
+      end
+
       specify 'and we are not switching on an enum field' do
         schema = {
           '$schema' => 'http://json-schema.org/draft-04/schema#',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc-json_schema
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - OpenCorporates
@@ -83,6 +83,7 @@ files:
 - lib/openc/json_schema/validator.rb
 - lib/openc/json_schema/version.rb
 - openc-json_schema.gemspec
+- publish.sh
 - spec/openc_json_schema_spec.rb
 - spec/schemas/aaa.json
 - spec/schemas/ccc.json