json_schemer 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f1555ed0ddacfa334c2a2635b4cce09c532aae3121539c28086e27ddf3c22fe
-  data.tar.gz: 5e49a8c68c44f40ac3ac9b3766b49f8f1c5d21ff5560dd1e2dd8f3d994183655
+  metadata.gz: ddb07f2bbccb28d21477a4514b460b385363ff5a3c7d1b981c538408228ae796
+  data.tar.gz: 374a24a40fd3c6714a24be1ef248a79143cb36121d60996017ac4cd2858b5dbb
 SHA512:
-  metadata.gz: e5e79032c18e1e4f9ba1a21be3d7b6afc48a7decdd37f7b2f9d4a9984b85684b1b115e2b16a4497955ec0d0d696d082dcd346f0443b3494f415718323f3beb86
-  data.tar.gz: 229375ee9837355c3225080db7b88eed7dce26a3fb608ded003453b9765de4a3d1546d3ea0eb6e7649698fcbe8ba58b49157cab7817f6a71ae66963abb5f45a4
+  metadata.gz: 0e34958d512ef4093d360a9596cd15ec51a90ea30d4b346453379c2d749496b83be9d237e34c332d225302a6fecf5fc156785d3aae4fe2be95f47fa00ee1e1e4
+  data.tar.gz: fa555c0ed341eae0bcd861c4be770eca06e8aa136dfcb4b4d4bad83661b9042dcfdc5dcc76ed5c59b40946cd2930323710153740ef315f32587105f252caa88b

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.ruby-version

data/.gitmodules

@@ -1,3 +1,4 @@
 [submodule "JSON-Schema-Test-Suite"]
 	path = JSON-Schema-Test-Suite
 	url = https://github.com/json-schema-org/JSON-Schema-Test-Suite
+	branch = master

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.1.4)
+    json_schemer (0.1.5)
       ecma-re-validator (~> 0.1.2)
       hana (~> 1.3.3)
       uri_template (~> 0.7.0)
@@ -11,10 +11,10 @@ GEM
   specs:
     ecma-re-validator (0.1.2)
       regexp_parser (~> 0.2)
-    hana (1.3.3)
+    hana (1.3.4)
     minitest (5.11.1)
     rake (10.5.0)
-    regexp_parser (0.4.9)
+    regexp_parser (0.5.0)
     uri_template (0.7.0)
 
 PLATFORMS
@@ -27,4 +27,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/lib/json_schemer/format.rb

@@ -66,7 +66,7 @@ module JSONSchemer
     IHIER_PART = Regexp.compile("(?:(?://#{IAUTHORITY}#{IPATH_ABEMPTY})|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_ROOTLESS})|(?:#{IPATH_EMPTY}))").freeze
     IRI = Regexp.compile("^#{SCHEME}:(?:#{IHIER_PART})(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
 
-    def valid_format?(data, format)
+    def valid_spec_format?(data, format)
       case format
       when 'date-time'
         valid_date_time?(data)

data/lib/json_schemer/schema/base.rb

@@ -66,7 +66,9 @@ module JSONSchemer
           return
         end
 
-        validate_format(data, schema, pointer, format, &Proc.new) if format && format?
+        if format? && custom_format?(format)
+          validate_custom_format(data, schema, pointer, formats.fetch(format), &Proc.new)
+        end
 
         if keywords
           keywords.each do |keyword, callable|
@@ -127,6 +129,14 @@ module JSONSchemer
         !!@format
       end
 
+      def custom_format?(format)
+        !!(formats && formats.key?(format))
+      end
+
+      def spec_format?(format)
+        !custom_format?(format) && supported_format?(format)
+      end
+
       def child(schema)
         JSONSchemer.schema(
           schema,
@@ -201,14 +211,8 @@ module JSONSchemer
         end
       end
 
-      def validate_format(data, schema, pointer, format)
-        valid = if formats && formats.key?(format)
-          format_option = formats[format]
-          format_option == false || format_option.call(data, schema)
-        elsif supported_format?(format)
-          valid_format?(data, format)
-        end
-        yield error(data, schema, pointer, 'format') unless valid
+      def validate_custom_format(data, schema, pointer, custom_format)
+        yield error(data, schema, pointer, 'format') if custom_format != false && !custom_format.call(data, schema)
       end
 
       def validate_exclusive_maximum(data, schema, pointer, exclusive_maximum, maximum)
@@ -265,12 +269,14 @@ module JSONSchemer
         max_length = schema['maxLength']
         min_length = schema['minLength']
         pattern = schema['pattern']
+        format = schema['format']
         content_encoding = schema['contentEncoding']
         content_media_type = schema['contentMediaType']
 
         yield error(data, schema, pointer, 'maxLength') if max_length && data.size > max_length
         yield error(data, schema, pointer, 'minLength') if min_length && data.size < min_length
         yield error(data, schema, pointer, 'pattern') if pattern && Regexp.new(pattern) !~ data
+        yield error(data, schema, pointer, 'format') if format? && spec_format?(format) && !valid_spec_format?(data, format)
 
         if content_encoding || content_media_type
           decoded_data = data

data/lib/json_schemer/schema/draft4.rb

@@ -10,7 +10,8 @@ module JSONSchemer
         'hostname',
         'ipv4',
         'ipv6',
-        'uri'
+        'uri',
+        'regex'
       ].freeze
 
     private

data/lib/json_schemer/schema/draft6.rb

@@ -12,7 +12,8 @@ module JSONSchemer
         'uri',
         'uri-reference',
         'uri-template',
-        'json-pointer'
+        'json-pointer',
+        'regex'
       ].freeze
 
     private

data/lib/json_schemer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONSchemer
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - David Harsha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler