openc-json_schema 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmE0MDA3M2IxMWZhMTlhZGU5MDdhNmMzNzJmMjA3MzYzZGI5MjE5Mg==
+    MmM4OTcxOWE4NDM5YTcxYzQyYWMwYjNmYTczMzhkN2I2YjVjNDA2Nw==
   data.tar.gz: !binary |-
-    YjQyN2Q2YWYyMjgyYmJiZWJlN2YxMDk3MzU4ZWUzM2E5ZWMzZGI5ZA==
+    MThkMzRkMTNjYWYxYTNhYmRlNGFjYjg1YjQ3ZDc4OGNmOTZlZDBiOA==
 SHA512:
   metadata.gz: !binary |-
-    MTBjYTFhZTIyOWMyNzUzOTZkNTJkZTI5OTU2NzY4NWU0N2FiNzkxNWJiNjQ3
-    MTViOTg0ODVjZjg0YTY3MjdiMzExMzZjMjQxNDQyOWE2ZDJlNzI1NTk4Mjg2
-    ODI3YmRkZGJlMzg3NmMzZTBkNmM5ZTFmYTJkOTI0MmI4Njc5Yjg=
+    MjJjZWMzMjZlOWI4ODk2NDc4OGIyMjgyMzg5Y2Y5ZTNjOTY5OTcyMWZhNDkz
+    Y2MwZTI5ZTQ2ZGZhYjc5MTc1ODkzZTRiOGQ0Y2UyNzlkZjIzYmUxYjg3YzAw
+    YTgzOTFiNzg2ZmZmNzdhYjliMDUwMDIzNjdlMjk2MmFiYzc2YzY=
   data.tar.gz: !binary |-
-    OTBjNjliN2EzOWUzZmRhMDcyMzk0ZDkyMzc4OWFkNzZjMzFhNjUxYTM0ZTNh
-    MjFiODNlYTVlMTVkYzdhMDgxNjY0MzllMThjZTRkOGFjM2ZhYTMxMWQ4NTA1
-    N2RmNmVjNWJlYWJkNmRkMGM2N2VhZTZlNzMwYjQ0YWFhMjk1ZWQ=
+    ZjRjNDZhNTkyNGU5MGVhY2ExMTU4NzkyNGY0NTg2Mzc4N2UxYmFlZDdhMzFj
+    OTY1MjFlNDE4YzNlMGY4M2VhYjdhNjk2OGM2ZDE4OTIzM2MyMjYwZmUwYmVl
+    ZGFkMjcyOTZjNzU1YTZiMDNmYjVkMjgwOTgyZTk5MDQxYmNkMTI=

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    openc-json_schema (0.0.4)
+    openc-json_schema (0.0.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/openc/json_schema.rb

@@ -1,7 +1,10 @@
 require 'json-schema'
 
-require 'openc/json_schema/validator'
+require 'openc/json_schema/date_converter'
 require 'openc/json_schema/format_validators'
+require 'openc/json_schema/utils'
+require 'openc/json_schema/validator'
+require 'openc/json_schema/version'
 
 module Openc
   module JsonSchema
@@ -10,5 +13,9 @@ module Openc
     def validate(schema_path, record)
       Validator.validate(schema_path, record)
     end
+
+    def convert_dates(schema_path, record)
+      DateConverter.convert_dates(schema_path, record)
+    end
   end
 end

data/lib/openc/json_schema/date_converter.rb

@@ -0,0 +1,48 @@
+module Openc
+  module JsonSchema
+    module DateConverter
+      extend self
+
+      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)
+      end
+
+      def _convert_dates(record, validator, json_schema, schema)
+        return record if schema.nil?
+
+        if (ref = schema['$ref'])
+          schema_uri = validator.absolutize_ref_uri(ref, json_schema.uri)
+          json_schema = JSON::Validator.schema_reader.read(schema_uri)
+          schema = json_schema.schema
+        end
+
+        case record
+        when Hash
+          pairs = record.map do |k, v|
+            properties = schema['properties']
+            if properties.nil?
+              [k, v]
+            else
+              [k, _convert_dates(v, validator, json_schema, properties[k])]
+            end
+          end
+          Hash[pairs]
+        when Array
+          record.map {|e| _convert_dates(e, validator, json_schema, schema['items'])}
+        else
+          if schema['format'] == 'date'
+            begin
+              Date.strptime(record, '%Y-%m-%d').strftime('%Y-%m-%d')
+            rescue ArgumentError
+              record
+            end
+          else
+            record
+          end
+        end
+      end
+    end
+  end
+end

data/lib/openc/json_schema/utils.rb

@@ -0,0 +1,21 @@
+module Openc
+  module JsonSchema
+    module Utils
+      extend self
+
+      def load_validator(schema_path, record)
+        validator = JSON::Validator.new(
+          schema_path,
+          record,
+          :record_errors => true,
+          :errors_as_objects => true,
+          :validate_schema => true
+        )
+      end
+
+      def extract_json_schema(validator)
+        validator.instance_variable_get(:@base_schema)
+      end
+    end
+  end
+end

data/lib/openc/json_schema/validator.rb

@@ -4,13 +4,7 @@ module Openc
       extend self
 
       def validate(schema_path, record)
-        validator = JSON::Validator.new(
-          schema_path,
-          record,
-          :record_errors => true,
-          :errors_as_objects => true,
-          :validate_schema => true
-        )
+        validator = Utils.load_validator(schema_path, record)
         errors = validator.validate
 
         # For now, we just handle the first error.
@@ -25,7 +19,7 @@ module Openc
           if error[:message].match(/did not match any/)
             path_elements = fragment_to_path(error[:fragment]).split('.')
 
-            json_schema = validator.instance_variable_get(:@base_schema)
+            json_schema = Utils.extract_json_schema(validator)
             schema = json_schema.schema
 
             path_elements.each do |element|

data/lib/openc/json_schema/version.rb

@@ -1,5 +1,5 @@
 module Openc
   module JsonSchema
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/spec/openc_json_schema_spec.rb

@@ -457,4 +457,70 @@ describe Openc::JsonSchema do
       )
     end
   end
+
+  describe '.convert_dates' do
+    it 'converts dates when schema has no $refs' do
+      schema = {
+        '$schema' => 'http://json-schema.org/draft-04/schema#',
+        'type' => 'object',
+        'properties' => {
+          'aaa' => {
+            'type' => 'string',
+            'format' => 'date'
+          },
+          'bbb' => {
+            'type' => 'array',
+            'items' => {
+              'type' => 'string',
+              'format' => 'date'
+            }
+          },
+          'ccc' => {
+            'type' => 'object',
+            'properties' => {
+              'ddd' => {
+                'type' => 'string',
+                'format' => 'date'
+              }
+            }
+          }
+        }
+      }
+
+      record = {
+        'aaa' => '2015-01-01 extra',
+        'bbb' => ['2015-01-01 extra', '2015-01-01 extra'],
+        'ccc' => {
+          'ddd' =>  '2015-01-01 extra'
+        }
+      }
+
+      expect([schema, record]).to convert_dates_to({
+        'aaa' => '2015-01-01',
+        'bbb' => ['2015-01-01', '2015-01-01'],
+        'ccc' => {
+          'ddd' =>  '2015-01-01'
+        }
+      })
+    end
+
+    it 'converts dates when schema has $refs' do
+      schema_path = 'spec/schemas/yyy.json'
+      record = {
+        'aaa' => '2015-01-01 extra',
+        'bbb' => ['2015-01-01 extra', '2015-01-01 extra'],
+        'ccc' => {
+          'ddd' =>  '2015-01-01 extra'
+        }
+      }
+
+      expect([schema_path, record]).to convert_dates_to({
+        'aaa' => '2015-01-01',
+        'bbb' => ['2015-01-01', '2015-01-01'],
+        'ccc' => {
+          'ddd' =>  '2015-01-01'
+        }
+      })
+    end
+  end
 end

data/spec/schemas/includes/zzz.json

@@ -0,0 +1,11 @@
+{
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"type": "object",
+	"properties": {
+		"ddd": {
+			"type": "string",
+			"format": "date"
+		}
+	}
+}
+

data/spec/schemas/yyy.json

@@ -0,0 +1,20 @@
+{
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"type": "object",
+	"properties": {
+		"aaa": {
+			"type": "string",
+			"format": "date"
+		},
+		"bbb": {
+			"type": "array",
+			"items": {
+				"type": "string",
+				"format": "date"
+			}
+		},
+		"ccc": {
+			"$ref": "includes/zzz.json"
+		}
+	}
+}

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ SimpleCov.start
 
 require 'openc/json_schema'
 
-def get_error(schema_or_path, record)
+def get_schema_path(schema_or_path)
   case schema_or_path
   when Hash
     json_data = schema_or_path.to_json
@@ -16,13 +16,13 @@ def get_error(schema_or_path, record)
     raise
   end
 
-  error = Openc::JsonSchema.validate(schema_path, record)
+  schema_path
 end
 
 RSpec::Matchers.define(:fail_validation_with) do |expected|
   match do |actual|
     schema_or_path, record = actual
-    @error = get_error(schema_or_path, record)
+    @error = Openc::JsonSchema.validate(get_schema_path(schema_or_path), record)
     expect(@error).to eq(expected)
   end
 
@@ -34,7 +34,17 @@ end
 RSpec::Matchers.define(:be_valid) do
   match do |actual|
     schema_or_path, record = actual
-    error = get_error(schema_or_path, record)
+    error = Openc::JsonSchema.validate(get_schema_path(schema_or_path), record)
     expect(error).to eq(nil)
   end
 end
+
+RSpec::Matchers.define(:convert_dates_to) do |expected|
+  match do |actual|
+    schema_or_path, record = actual
+    schema_path = get_schema_path(schema_or_path)
+
+    converted_record = Openc::JsonSchema.convert_dates(schema_path, record)
+    expect(converted_record).to eq(expected)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openc-json_schema
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +65,9 @@ files:
 - README.md
 - Rakefile
 - lib/openc/json_schema.rb
+- lib/openc/json_schema/date_converter.rb
 - lib/openc/json_schema/format_validators.rb
+- lib/openc/json_schema/utils.rb
 - lib/openc/json_schema/validator.rb
 - lib/openc/json_schema/version.rb
 - openc-json_schema.gemspec
@@ -82,8 +84,10 @@ files:
 - 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
 - spec/tmp/.gitkeep
 homepage: 
@@ -123,8 +127,10 @@ test_files:
 - 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
 - spec/tmp/.gitkeep
 has_rdoc: