json_schemer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8a7a9d5181f0da2becb05779a587291aaa9fdcdf1ce2eeb2745165f860ff4c4
-  data.tar.gz: a287a3ce5b40ad941b114e4c95c4ad613c3372b3aa30549078ce998b9405c913
+  metadata.gz: 0c60e714e579a94981d17cf588f7b036ff39b95f95c6a4080b291c335e7ad4a4
+  data.tar.gz: b902418e60c5e98d19456aed4ae6aad09e787b4074a9b08177b9cb1fa967cb4f
 SHA512:
-  metadata.gz: cb6bb847b36e285d969c160462d0a42d3fb0ba1cce7f479f13b6bfe759df299591f86bb05d1f6a6e545a96508c27fb1cb48e828ec431e07c3b8036392dbc20c0
-  data.tar.gz: 53a14606a501034d0693f54e2dd56706a573d950c26fddc9950effcc9dbc4762eaf929756b1d609a9e7bf0c0a5507dd8913e5c6078fbf0ff5b68eae7b851a6e9
+  metadata.gz: 56f2f16354a2d1aff6565de44517b67722b8abc764dab185da0f4a46813a73599d32c7fdc1792790ad2cd1eaa08c92bda13b77ac76847da1c53b59bde0850c9b
+  data.tar.gz: efd9edf9ab76f389107ec9d02964ed4904655c3e5d2f2e6aec66cad668b6d034a5d61a7fea77f56b7f10d7c8a8f8ceb2635316d7987f41ac96f34c4bf1d25fc5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.1.2)
+    json_schemer (0.1.3)
       ecma-re-validator (~> 0.1.2)
       hana (~> 1.3.3)
       uri_template (~> 0.7.0)

data/lib/json_schemer.rb

@@ -23,13 +23,21 @@ module JSONSchemer
     NET_HTTP_REF_RESOLVER = proc { |uri| JSON.parse(Net::HTTP.get(uri)) }.freeze
     BOOLEANS = Set[true, false].freeze
 
-    def initialize(schema, format: true, ref_resolver: DEFAULT_REF_RESOLVER)
+    def initialize(
+      schema,
+      format: true,
+      formats: nil,
+      keywords: nil,
+      ref_resolver: DEFAULT_REF_RESOLVER
+    )
       if schema.is_a?(Hash) && schema.key?('$schema') && schema['$schema'] != META_SCHEMA
         raise InvalidMetaSchema, "draft-07 is the only supported meta-schema (#{META_SCHEMA})"
       end
 
       @root = schema
       @format = format
+      @formats = formats
+      @keywords = keywords
       @ref_resolver = ref_resolver == 'net/http' ? NET_HTTP_REF_RESOLVER : ref_resolver
     end
 
@@ -70,6 +78,19 @@ module JSONSchemer
 
       validate_format(data, schema, pointer, format, &Proc.new) if format && format?
 
+      if keywords
+        keywords.each do |keyword, callable|
+          if schema.key?(keyword)
+            result = callable.call(data, schema, pointer)
+            if result.is_a?(Array)
+              result.each { |error| yield error }
+            elsif !result
+              yield error(data, schema, pointer, keyword)
+            end
+          end
+        end
+      end
+
       yield error(data, schema, pointer, 'enum') if enum && !enum.include?(data)
       yield error(data, schema, pointer, 'const') if schema.key?('const') && schema['const'] != data
 
@@ -106,12 +127,22 @@ module JSONSchemer
 
   private
 
-    attr_reader :root, :ref_resolver
+    attr_reader :root, :formats, :keywords, :ref_resolver
 
     def format?
       !!@format
     end
 
+    def child(schema)
+      self.class.new(
+        schema,
+        format: format?,
+        formats: formats,
+        keywords: keywords,
+        ref_resolver: ref_resolver
+      )
+    end
+
     def error(data, schema, pointer, type)
       {
         'data' => data,
@@ -164,54 +195,59 @@ module JSONSchemer
           validate(data, ref_pointer.eval(root), pointer, pointer_uri(root, ref_pointer), &Proc.new)
         else
           ref_root = ref_resolver.call(ref_uri)
-          ref_object = self.class.new(ref_root)
+          ref_object = child(ref_root)
           ref_object.validate(data, ref_pointer.eval(ref_root), pointer, pointer_uri(ref_root, ref_pointer), &Proc.new)
         end
       elsif ids.key?(ref_uri.to_s)
         validate(data, ids.fetch(ref_uri.to_s), pointer, ref_uri, &Proc.new)
       else
         ref_root = ref_resolver.call(ref_uri)
-        ref_object = self.class.new(ref_root)
+        ref_object = child(ref_root)
         ref_object.validate(data, ref_object.ids.fetch(ref_uri.to_s, ref_root), pointer, ref_uri, &Proc.new)
       end
     end
 
     def validate_format(data, schema, pointer, format)
-      valid = case format
-      when 'date-time'
-        valid_date_time?(data)
-      when 'date'
-        valid_date_time?("#{data}T04:05:06.123456789+07:00")
-      when 'time'
-        valid_date_time?("2001-02-03T#{data}")
-      when 'email'
-        data.ascii_only? && valid_email?(data)
-      when 'idn-email'
-        valid_email?(data)
-      when 'hostname'
-        data.ascii_only? && valid_hostname?(data)
-      when 'idn-hostname'
-        valid_hostname?(data)
-      when 'ipv4'
-        valid_ip?(data, :v4)
-      when 'ipv6'
-        valid_ip?(data, :v6)
-      when 'uri'
-        data.ascii_only? && valid_iri?(data)
-      when 'uri-reference'
-        data.ascii_only? && (valid_iri?(data) || valid_iri_reference?(data))
-      when 'iri'
-        valid_iri?(data)
-      when 'iri-reference'
-        valid_iri?(data) || valid_iri_reference?(data)
-      when 'uri-template'
-        valid_uri_template?(data)
-      when 'json-pointer'
-        valid_json_pointer?(data)
-      when 'relative-json-pointer'
-        valid_relative_json_pointer?(data)
-      when 'regex'
-        EcmaReValidator.valid?(data)
+      valid = if formats && formats.key?(format)
+        format_option = formats[format]
+        format_option == false || format_option.call(data, schema)
+      else
+        case format
+        when 'date-time'
+          valid_date_time?(data)
+        when 'date'
+          valid_date_time?("#{data}T04:05:06.123456789+07:00")
+        when 'time'
+          valid_date_time?("2001-02-03T#{data}")
+        when 'email'
+          data.ascii_only? && valid_email?(data)
+        when 'idn-email'
+          valid_email?(data)
+        when 'hostname'
+          data.ascii_only? && valid_hostname?(data)
+        when 'idn-hostname'
+          valid_hostname?(data)
+        when 'ipv4'
+          valid_ip?(data, :v4)
+        when 'ipv6'
+          valid_ip?(data, :v6)
+        when 'uri'
+          data.ascii_only? && valid_iri?(data)
+        when 'uri-reference'
+          data.ascii_only? && (valid_iri?(data) || valid_iri_reference?(data))
+        when 'iri'
+          valid_iri?(data)
+        when 'iri-reference'
+          valid_iri?(data) || valid_iri_reference?(data)
+        when 'uri-template'
+          valid_uri_template?(data)
+        when 'json-pointer'
+          valid_json_pointer?(data)
+        when 'relative-json-pointer'
+          valid_relative_json_pointer?(data)
+        when 'regex'
+          EcmaReValidator.valid?(data)
+        end
       end
       yield error(data, schema, pointer, 'format') unless valid
     end

data/lib/json_schemer/version.rb

@@ -1,3 +1,3 @@
 module JSONSchemer
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

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