openc-json_schema 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccb1b4275ae9645554976a7b87d2b5b6cdb73e5c
-  data.tar.gz: 3b95c93c17c65d7c5d6b0b183fc3e03d8937692a
+  metadata.gz: 6f54658d07145fbb5008c4db3ff54233455bf6bd
+  data.tar.gz: 3388c3350f07c0827efd9277aaa166ea06b0ab3f
 SHA512:
-  metadata.gz: 3e7489d1dc42eb390e3d8d6e1b9993aa4ec377b6ad4a9bff89092ffdbb591a29da0128b052ef10450c42fef470fd36d9693bccf20503118432c27b539bb056f7
-  data.tar.gz: fa296c3de7ea00c77736db7e9d409d1ee6412b4dd4d38cebd77931c0daa3665151b0f06598f5e7f0ed7ed8d76b183b7b39bd920a250275ada466a6458150fbfd
+  metadata.gz: 50910d269df9a4e70a74449a196dd51464b49169e8fd1dc6784f95ccc93993c75c7ee89eaf9f07c6f304bfe9bbd5dbcf4e6a97181a8eba1461af67723a78848e
+  data.tar.gz: 25f41b1db6d440c1ad9a1919bb45394151b888fe273d6670819cd1d61e7c74ac99e85c65d96fea448340311b4458ecd482cfc6a18d76fd4b7e59be30d17eea99

data/.gitignore

@@ -1,4 +1,7 @@
-spec/tmp/*.json
+*.gem
+.bundle
+.yardoc
 coverage
 Gemfile.lock
+doc/*
 pkg/*

data/.yardopts

@@ -0,0 +1,3 @@
+--hide-void-return
+--embed-mixin ClassMethods
+--markup=markdown

data/README.md

@@ -16,4 +16,9 @@ Bump the version in `lib/openc/json_schema/version.rb` according to the [Semanti
     git commit lib/openc/json_schema/version.rb -m 'Release new version'
     rake release # requires Rubygems credentials
 
-Finally, [rebuild the Docker image](https://github.com/openc/morph-docker-ruby#readme).
+In [morph](https://github.com/sebbacon/morph), run:
+
+    bundle update openc-json_schema
+    git commit Gemfile.lock -m 'Bump openc-json_schema' && git push
+
+Finally, [rebuild the Docker image](https://github.com/openc/morph-docker-ruby#readme) and deploy [morph](https://github.com/sebbacon/morph).

data/lib/openc/json_schema.rb

@@ -1,6 +1,9 @@
 require 'json-pointer'
 require 'json-schema'
 
+require 'json_validation'
+require 'openc_json_schema_formats'
+
 require 'openc/json_schema/date_converter'
 require 'openc/json_schema/format_validators'
 require 'openc/json_schema/utils'
@@ -11,8 +14,21 @@ module Openc
   module JsonSchema
     extend self
 
-    def validate(schema_path, record)
-      Validator.validate(schema_path, record)
+    def validate(schema, record)
+      if schema.is_a?(String)
+        validator = JsonValidation.load_validator(schema)
+      else
+        validator = JsonValidation.build_validator(schema)
+      end
+      fast_validation_ok = validator.validate(record)
+      if fast_validation_ok
+        nil
+      else
+        # Currently JsonValidation doesn't support error messages,
+        # just returns true or false; so on a failure, we have to fall
+        # back to the slower version
+        Validator.validate(schema, record)
+      end
     end
 
     def convert_dates(schema_path, record)

data/lib/openc/json_schema/validator.rb

@@ -38,8 +38,8 @@ module Openc
             record = JsonPointer.new(record, error[:fragment][1..-1]).value
             schema = JSON::Validator.schema_for_uri(error[:schema]).schema
 
-            path = fragment_to_path(error[:fragment]).split('.')
-            one_of = walk_schema(schema, path).each_with_index
+            path = fragment_to_path(error[:fragment])
+            one_of = walk_schema(schema, path.split('.')).each_with_index
 
             # Try to report errors for relevant `oneOf` schemas only.
             schemas_matching_type = case record
@@ -52,7 +52,7 @@ module Openc
             when Array
               one_of.select{|schema, _| schema['type'] == 'array'}
             else
-              raise "Unexpected type: #{record}"
+              raise "Unexpected type #{record.class.name} for #{record.inspect} at #{path}"
             end
 
             matches = schemas_matching_type.size

data/lib/openc/json_schema/version.rb

@@ -1,5 +1,5 @@
 module Openc
   module JsonSchema
-    VERSION = '0.0.14'
+    VERSION = '0.0.15'
   end
 end

data/openc-json_schema.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "json-schema", "~> 2.6.0"
   gem.add_dependency "json-pointer"
+  gem.add_dependency "openc_json_schema_formats"
+  gem.add_dependency "json_validation"
 
-  gem.add_development_dependency "bundler", "~> 1.7"
   gem.add_development_dependency "coveralls"
   gem.add_development_dependency "rake", "~> 10.0"
   gem.add_development_dependency "rspec", "~> 3.0"

data/spec/openc_json_schema_spec.rb

@@ -90,7 +90,7 @@ describe Openc::JsonSchema do
             }
           }
         }
-      
+
         record = {'aaa' => {'a_type' => 'a1', 'a_properties' => {}}}
 
         error = 'Missing required property: aaa.a_properties.bbb'
@@ -166,7 +166,7 @@ describe Openc::JsonSchema do
             }
           }
         }
-      
+
         record = {'aaa' => {'bbb' => {}}}
 
         error = 'No match for property: aaa'
@@ -305,6 +305,96 @@ describe Openc::JsonSchema do
       expect([schema, record]).to fail_validation_with(error)
     end
 
+    specify 'when date property has a timestamp' do
+      schema = {
+        '$schema' => 'http://json-schema.org/draft-04/schema#',
+        'type' => 'object',
+        'properties' => {
+          'aaa' => {'type' => 'string', 'format' => 'date'}
+        }
+      }
+      record = {'aaa' => '2016-01-12T21:52:11Z'}
+
+      expect([schema, record]).to be_valid
+    end
+
+    specify 'when date property has a timestamp and a bad date' do
+      schema = {
+        '$schema' => 'http://json-schema.org/draft-04/schema#',
+        'type' => 'object',
+        'properties' => {
+          'aaa' => {'type' => 'string', 'format' => 'date'}
+        }
+      }
+      dates = ["2016-03-13",
+"2016-03-21",
+"2016-03-12T14:58:51.941787",
+"2016-03-15",
+"2016-03-12T15:01:27.767907",
+"2016-03-12T13:28:59.947478",
+"2016-03-12T11:30:18.731536",
+"2016-03-13",
+"2016-03-13",
+"2016-03-12T11:17:52.814474",
+"2016-03-12T15:12:46.227805",
+"2016-03-12T15:45:03.405024",
+"2016-03-12T13:17:15.362714",
+"2016-03-15",
+"2016-03-13",
+"2016-03-23",
+"2016-03-12T08:20:02.088387",
+"2016-03-21",
+"2016-03-13",
+"2016-03-21",
+"2016-03-11T17:54:20.247649",
+"2016-03-12",
+"2016-03-12T15:07:20.572849",
+"2016-03-20",
+"2016-03-13",
+"2016-03-12T11:24:07.573208",
+"2016-03-20",
+"2016-03-11T17:31:38.482306",
+"2016-03-16",
+"2016-03-12T15:15:13.430171",
+"2016-03-11T17:07:26.781185",
+"2016-03-12T13:33:24.754198",
+"2016-03-15",
+"2016-03-20",
+"2016-03-12",
+"2016-03-15",
+"2016-03-12T14:04:36.597795",
+"2016-03-24",
+"2016-03-11T13:20:40.231104",
+"2016-03-16",
+"2016-03-20",
+"2016-03-12",
+"2016-03-23",
+"2016-03-15",
+"2016-03-24",
+"2016-03-24",
+"2016-03-23",
+"2015-10-02 10:15:56 +0000",
+"2015-02-28 17:32:37 +0000",
+"2016-03-18 10:35:30 +0000",
+"2016-03-07 09:48:23 +0000",
+"2016-03-10 12:27:33 +0000",
+"2015-02-28 18:04:19 +0000",
+"2015-03-04 18:14:14 +0000",
+"2015-03-09 10:44:52 +0000",
+"2015-04-29 17:49:37 +0000",
+"2015-09-04 13:35:52 +0000",
+"2016-03-10 09:39:21 +0000",
+"2016-03-11 12:28:38 +0000",
+"2016-03-11 10:37:50 +0000",
+"2015-09-18 11:48:50 +0000"]
+      dates.each do |d|
+        puts d
+        record = {'aaa' => d}
+
+        expect([schema, record]).to be_valid
+      end
+    end
+
     specify 'when non-blank property of wrong format' do
       schema = {
         '$schema' => 'http://json-schema.org/draft-04/schema#',

data/spec/spec_helper.rb

@@ -9,12 +9,17 @@ require 'openc/json_schema'
 
 RSpec::Matchers.define(:fail_validation_with) do |expected|
   match do |(schema_or_path, record)|
-    @actual = Openc::JsonSchema.validate(schema_or_path, record)[:message]
-    expect(@actual).to eq(expected)
+    @actual = Openc::JsonSchema.validate(schema_or_path, record)
+    expect(@actual).to_not be(nil)
+    expect(@actual[:message]).to eq(expected)
   end
 
   failure_message do |actual|
-    "Expected error to be #{expected}, but was #{@actual}"
+    if actual.nil?
+      "Expected error, but there was none"
+    else
+      "Expected error to be #{expected}, but was #{actual}"
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openc-json_schema
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: openc_json_schema_formats
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json_validation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +116,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE
 - README.md
@@ -154,22 +169,5 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Utilities for validating JSON
-test_files:
-- spec/openc_json_schema_spec.rb
-- spec/schemas/aaa.json
-- spec/schemas/ccc.json
-- spec/schemas/fff.json
-- spec/schemas/iii.json
-- spec/schemas/includes/bbb.json
-- spec/schemas/includes/ddd.json
-- spec/schemas/includes/eee.json
-- spec/schemas/includes/ggg.json
-- spec/schemas/includes/hhh.json
-- spec/schemas/includes/jjj.json
-- spec/schemas/includes/mmm.json
-- spec/schemas/includes/zzz.json
-- spec/schemas/kkk.json
-- spec/schemas/lll.json
-- spec/schemas/yyy.json
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: