openc-json_schema 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjc2NjM2ZGVkOGMwZmEyYzBiZDRjN2U2ZDIxNmQ0OGJjYTI3NGM1Ng==
+    YjczNDczZDkzN2I5NTkyNjc1Mzk1ZGJjNzIyOWMwYzI5NTk1ODA3YQ==
   data.tar.gz: !binary |-
-    ODA1YjNmZTgwNWUwNTg1YzE2OWVmNmE3ZTA5ZWZkZGJiZjczMzU1Yw==
+    ZjcxODZkNjdlMTc4YmQ0MGZhNGJlOGUwNTA2ZWYyZDEwZmE3MzRlMQ==
 SHA512:
   metadata.gz: !binary |-
-    MThmY2IyMGNlODZkODk0NWQzNzM2ZTNjMDkyY2M2MjYzYWZiMmM1OTM5MWY1
-    ZjhmYjY2YjcyODlkZTFlMTZmNGE3MTc4MzBkNWJhMTJlN2Q5NzNmMjZlOWFi
-    MTcxNzJlYTQyZGViNjhhZDY5ZDBkYmFmODc4YTgwZTViMTZmOWI=
+    YWU4YzY3ZmY5MzlhNzE2MDVlNzVlMmI5MGZmOTY1NWQyYjcxMzkzOWU3N2M5
+    MzBiYmM4NGExYmFkMTIwODZjZGY2NTBmYzk1OGIwYmFkOTExY2Y1ZDZjM2I4
+    MjY0ZjlhNzZjNjVmZjE1NThhOWZmZjNkMDVhNWNiZmZmNWYyYzg=
   data.tar.gz: !binary |-
-    ODQyZjE2OTFjN2E3NjRkMTM5OWUxMzQwZWJiYjJjMTlmYjZlNzY2MzM4OTY2
-    ZDU5ODcwZWE0ZTVhZDhiY2I3MjdiYzYxYzc2YjhjMmRjMjdiMmE4ZTJjMDNk
-    MWM2MzVkYzNiNzVlNjI3OThiOGI3ODkzN2QyNWE1ZjY3MDZlNDE=
+    YmJhNThmYTY5ZDAzZmNlZmMzM2VlOGY0YzNmMGI2YTU5ODc5ZWUzY2M1NDVj
+    OWUwM2I4OGQ0MDFhNjMwOWQ2NTBjZGY3YmRkOGRlZmU5ZDE3MDc1NDIzMzVm
+    OTUxZTAwMDhlNmRlMWM5M2ZkZTZjMjU3OWE2MjQ5OTZkM2VhOTk=

data/Gemfile.lock

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

data/lib/openc/json_schema/format_validators.rb

@@ -9,3 +9,9 @@ date_format_validator = -> value {
 }
 
 JSON::Validator.register_format_validator('date', date_format_validator)
+
+non_blank_format_validator = -> value {
+  raise JSON::Schema::CustomFormatError.new('must not be blank') if value.strip == ''
+}
+
+JSON::Validator.register_format_validator('non-blank', non_blank_format_validator)

data/lib/openc/json_schema/validator.rb

@@ -136,6 +136,9 @@ module Openc
             type = :format_mismatch
             message = "Property not of expected format: #{path} (must be of format yyyy-mm-dd)"
             extra_params = {:expected_format => 'yyyy-mm-dd'}
+          elsif error[:message].match(/must not be blank/)
+            type = :format_mismatch
+            message = "Property not of expected format: #{path} (must not be blank)"
           else
             type = :unknown
             message = "Error of unknown type: #{path} (#{error[:message]})"

data/lib/openc/json_schema/version.rb

@@ -1,5 +1,5 @@
 module Openc
   module JsonSchema
-    VERSION = '0.0.9'
+    VERSION = '0.0.10'
   end
 end

data/spec/openc_json_schema_spec.rb

@@ -277,7 +277,7 @@ describe Openc::JsonSchema do
       expect([schema, record]).to fail_validation_with(error)
     end
 
-    specify 'when property of wrong format' do
+    specify 'when date property of wrong format' do
       schema = {
         '$schema' => 'http://json-schema.org/draft-04/schema#',
         'type' => 'object',
@@ -291,7 +291,7 @@ describe Openc::JsonSchema do
       expect([schema, record]).to fail_validation_with(error)
     end
 
-    specify 'when property with format is empty' do
+    specify 'when date property is empty' do
       schema = {
         '$schema' => 'http://json-schema.org/draft-04/schema#',
         'type' => 'object',
@@ -305,6 +305,20 @@ describe Openc::JsonSchema do
       expect([schema, record]).to fail_validation_with(error)
     end
 
+    specify 'when non-blank property of wrong format' do
+      schema = {
+        '$schema' => 'http://json-schema.org/draft-04/schema#',
+        'type' => 'object',
+        'properties' => {
+          'aaa' => {'type' => 'string', 'format' => 'non-blank'}
+        }
+      }
+      record = {'aaa' => '   '}
+
+      error = 'Property not of expected format: aaa (must not be blank)'
+      expect([schema, record]).to fail_validation_with(error)
+    end
+
     context 'when schema includes $ref' do
       specify 'when data is valid' do
         schema_path = 'spec/schemas/aaa.json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openc-json_schema
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler