openc-json_schema 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmI5ZTBkM2Q5MmNiNTc3M2QwNWRhZmU5ZDYzODA1MjBlOGEwYThhMg==
+    NTgxODJmMjgzZjgwNjhhMDQ4MmVkNTQzMTk4MTU4ZTUxMzM2NTlkZA==
   data.tar.gz: !binary |-
-    MWQ5ZGM5ZDUxYmM3NmM4ZjE2MTJiNTMyNDZhMDkyZjcwYWFiOGI4ZQ==
+    N2FhMDFhYTg5OTYzOWNhYzZhYzY5MWJkYTQwYTVhZTJhZWMyM2VmNg==
 SHA512:
   metadata.gz: !binary |-
-    OWM1ZGVkNDkyYzU5NzI5Mjg0NjcxNDY2MmM0ZDM1OTY2YzM4NjM0NDQxOGVi
-    ZDNiYTlkNTE3NzI3NTM2M2M3MzMzMzY3ZTliYjhiNGVmZjBkZjc4NzI1Zjdk
-    YmVlOTEyYzZjYmI2N2ZjYTQzNDZlNzIxYzY4MjkwYWQwMjE4NTg=
+    ODg5OTdmN2EzMDg1NzExNDdkMGRiMGYzNTJkNzhhYzg3OTA4ODllYjcyODUw
+    N2QwNGE0YzE2NGZmYjlmOGQwMWQ0MDk5NTMzMmQwNjBjM2QyNDIzYzc0MDRi
+    Yjk0NDcxMmMyYWVjMmJiZmVlYzFkNzEyNTQ1YjAyNDFhYmMwMmM=
   data.tar.gz: !binary |-
-    OGUxNDU0N2RmMWZmZDAyNmY0ZmUxNWNjZDg5OTdjMTI0ZmY4ZjMwN2I2NTI2
-    N2RjZmFjYWIxNDRjZDdkNDM1NTA5NDk4YjQ0NDRlNWVmNTU1MTQ4NGM2MWQ3
-    NGE5N2IwMGFhY2MzYWRkNTE0OTBkYjMyMzY2YjE3OWRlOTc5MzA=
+    NDQ5YTYxZTI5N2JjOWVlMjAzMzNiMmRiZDkyN2EzOGM5MzQ1MDFiZjE1YWFi
+    NWY5Njk2NTk5MGQ5ZmYxY2FlMDE2MTBiYzcxZDA1OGQ5NTExOGI0NGY2OTVk
+    Y2Y5NzA0ZTRhZDEzYzg5M2JiNDcyOTI4ZWU5ZGRkYTJlNWM5NjE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openc-json_schema (0.0.7)
+    openc-json_schema (0.0.8)
       json-schema-openc-fork (= 0.0.1)
 
 GEM

data/lib/openc/json_schema/validator.rb

@@ -77,53 +77,72 @@ module Openc
 
       def convert_error(error)
         path = fragment_to_path(error[:fragment])
+        extra_params = {}
 
         case error[:failed_attribute]
         when 'Required'
           match = error[:message].match(/required property of '(.*)'/)
           missing_property = match[1]
           path = fragment_to_path("#{error[:fragment]}/#{missing_property}")
-          "Missing required property: #{path}"
+          type = :missing
+          message = "Missing required property: #{path}"
         when 'AdditionalProperties'
           match = error[:message].match(/contains additional properties \["(.*)"\] outside of the schema/)
           additional_property = match[1].split('", "')[0]
           path = fragment_to_path("#{error[:fragment]}/#{additional_property}")
-          "Disallowed additional property: #{path}"
+          type = :additional
+          message = "Disallowed additional property: #{path}"
         when 'OneOf'
           if error[:message].match(/did not match any/)
-            "No match for property: #{path}"
+            type = :one_of_no_matches
+            message = "No match for property: #{path}"
           else
-            "Multiple possible matches for property: #{path}"
+            type = :one_of_many_matches
+            message = "Multiple possible matches for property: #{path}"
           end
         when 'AnyOf'
-          "No match for property: #{path}"
+          type = :any_of_no_matches
+          message = "No match for property: #{path}"
         when 'MinLength'
           match = error[:message].match(/minimum string length of (\d+) in/)
           min_length = match[1].to_i
-          "Property too short: #{path} (must be at least #{min_length} characters)"
+          type = :too_short
+          message = "Property too short: #{path} (must be at least #{min_length} characters)"
+          extra_params = {:length => min_length}
         when 'MaxLength'
           match = error[:message].match(/maximum string length of (\d+) in/)
           max_length = match[1].to_i
-          "Property too long: #{path} (must be at most #{max_length} characters)"
+          type = :too_long
+          message = "Property too long: #{path} (must be at most #{max_length} characters)"
+          extra_params = {:length => max_length}
         when 'TypeV4'
           match = error[:message].match(/the following types?: ([\w\s,]+) in schema/)
           allowed_types = match[1].split(',').map(&:strip)
-          "Property of wrong type: #{path} (must be of type #{allowed_types.join(', ')})"
+          type = :type_mismatch
+          message = "Property of wrong type: #{path} (must be of type #{allowed_types.join(', ')})"
+          extra_params = {:allowed_types => allowed_types}
         when 'Enum'
           match = error[:message].match(/the following values: ([\w\s,]+) in schema/)
           allowed_values = match[1].split(',').map(&:strip)
+          type = :enum_mismatch
           if allowed_values.size == 1
-            "Property must have value #{allowed_values[0]}: #{path}"
+            message = "Property must have value #{allowed_values[0]}: #{path}"
           else
-            "Property not an allowed value: #{path} (must be one of #{allowed_values.join(', ')})"
+            message = "Property not an allowed value: #{path} (must be one of #{allowed_values.join(', ')})"
           end
+          extra_params = {:allowed_values => allowed_values}
         else
           if error[:message].match(/must be of format yyyy-mm-dd/)
-            "Property not of expected format: #{path} (must be of format yyyy-mm-dd)"
+            type = :format_mismatch
+            message = "Property not of expected format: #{path} (must be of format yyyy-mm-dd)"
+            extra_params = {:expected_format => 'yyyy-mm-dd'}
           else
-            "Error of unknown type: #{path} (#{error[:message]})"
+            type = :unknown
+            message = "Error of unknown type: #{path} (#{error[:message]})"
           end
         end
+
+        {:type => type, :path => path, :message => message}.merge(extra_params)
       end
 
       def fragment_to_path(fragment)

data/lib/openc/json_schema/version.rb

@@ -1,5 +1,5 @@
 module Openc
   module JsonSchema
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ end
 RSpec::Matchers.define(:fail_validation_with) do |expected|
   match do |actual|
     schema_or_path, record = actual
-    @error = Openc::JsonSchema.validate(get_schema_path(schema_or_path), record)
+    @error = Openc::JsonSchema.validate(get_schema_path(schema_or_path), record)[:message]
     expect(@error).to eq(expected)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc-json_schema
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - OpenCorporates