openc-json_schema 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f54658d07145fbb5008c4db3ff54233455bf6bd
-  data.tar.gz: 3388c3350f07c0827efd9277aaa166ea06b0ab3f
+SHA256:
+  metadata.gz: 35aa66d33975566ea5439d018d5b4463631568a8b95564b42f5ae5160632af54
+  data.tar.gz: 115abca9866e4495514336a1e4ae4ffe6614c517550bbdaaedf632fd01451771
 SHA512:
-  metadata.gz: 50910d269df9a4e70a74449a196dd51464b49169e8fd1dc6784f95ccc93993c75c7ee89eaf9f07c6f304bfe9bbd5dbcf4e6a97181a8eba1461af67723a78848e
-  data.tar.gz: 25f41b1db6d440c1ad9a1919bb45394151b888fe273d6670819cd1d61e7c74ac99e85c65d96fea448340311b4458ecd482cfc6a18d76fd4b7e59be30d17eea99
+  metadata.gz: 9e3d4962a784834ecf8e4dfe7df46680979f3b0c050169d8baabcc39215fefea43a28138b17fffb69013c539945a769cf9205612621225015f6229b9140112f5
+  data.tar.gz: 2215a26c49377402c58ca418ae5bc0922f3335fe0b3793bd390703cfdfbe3ea19444760f8847466f1d4dc0e0dee4cfb77860b11c78ccdbbf9365b601d1e0cf41

data/README.md

@@ -21,4 +21,9 @@ In [morph](https://github.com/sebbacon/morph), run:
     bundle update openc-json_schema
     git commit Gemfile.lock -m 'Bump openc-json_schema' && git push
 
+Bear in mind that a morph deploy doesn't restart the resque workers;
+you'll need to do this explicitly with:
+
+    cap production resque:restart
+
 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/date_converter.rb

@@ -6,14 +6,14 @@ module Openc
       def convert_dates(schema_path, record)
         validator = Utils.load_validator(schema_path, record)
         json_schema = Utils.extract_json_schema(validator)
-        _convert_dates(record, validator, json_schema, json_schema.schema)
+        _convert_dates(record, json_schema, json_schema.schema)
       end
 
-      def _convert_dates(record, validator, json_schema, schema)
+      def _convert_dates(record, json_schema, schema)
         return record if schema.nil?
 
         if (ref = schema['$ref'])
-          schema_uri = validator.absolutize_ref_uri(ref, json_schema.uri)
+          schema_uri = JSON::Util::URI.absolutize_ref(ref, json_schema.uri)
           json_schema = JSON::Validator.schema_reader.read(schema_uri)
           schema = json_schema.schema
         end
@@ -25,12 +25,12 @@ module Openc
             if properties.nil?
               [k, v]
             else
-              [k, _convert_dates(v, validator, json_schema, properties[k])]
+              [k, _convert_dates(v, json_schema, properties[k])]
             end
           end
           Hash[pairs]
         when Array
-          record.map {|e| _convert_dates(e, validator, json_schema, schema['items'])}
+          record.map {|e| _convert_dates(e, json_schema, schema['items'])}
         else
           if schema['format'] == 'date'
             begin

data/lib/openc/json_schema/version.rb

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

data/openc-json_schema.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "json-schema", "~> 2.6.0"
+  gem.add_dependency "json", "<= 2.1"
+  gem.add_dependency "json-schema", "~> 2.8"
   gem.add_dependency "json-pointer"
   gem.add_dependency "openc_json_schema_formats"
   gem.add_dependency "json_validation"

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: openc-json_schema
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: json-pointer
   requirement: !ruby/object:Gem::Requirement
@@ -164,10 +178,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Utilities for validating JSON
-test_files: []
-has_rdoc: 
+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