schema_matcher 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51684856418fd56fd7ef6a7faabc9c46be7be6110a48110be1870cb2ee1038e5
-  data.tar.gz: 8e113af8073d7fa372c6411e568a73de2064776227c51f8f1ece2c688f62e36b
+  metadata.gz: 773842bd2566a9e84ec13aa802716985e701ff99412cceec55487830c175b787
+  data.tar.gz: c4a971362f1fc71ebcb19459b822bfeab0ec0cb222940e7f80c5d2a423cdfae2
 SHA512:
-  metadata.gz: 94cf1b55c50e0755ce16580e74fd193775f8863f884da398b15959ec4bdfe80abdeabf94a423b3df24f16a7355006ec579597e9b2ad2a648bcb3a41801aa8174
-  data.tar.gz: b4dc059a5d1de2ac2091fe791a669080d30c40d40ed8d19ea67676996c0fcae895b788d292ebeeefd65a93d575b79fbd177f81c4b2a9784db90a74e49f4021cb
+  metadata.gz: ccc99d4d80f7f4476cddbf75f01f3878fc017b71d0a8489c92d3794529bd9083afcca3d5a4296e27bec0ef4ce3a4c8644c9d380e26ed0277058242819e2add8d
+  data.tar.gz: 48189cecce55bc08bda9b43794a93f1a27167fae631193565ce1e165ddb33f6a66fcc4a57a19573077fc611bf577986c3fb1a77f3188cfb99db18ba4d3b52ea4

data/lib/schema_matcher/assertion.rb

@@ -23,16 +23,24 @@ module SchemaMatcher
     attr_reader :payload, :schema_name, :last_error_message, :options
 
     def schema
-      SchemaMatcher
-        .schema[schema_name]
+      entity_schema =
+        if array?
+          { 'type' => 'array', 'items' => SchemaMatcher.schema[schema_name] }
+        else
+          SchemaMatcher.schema[schema_name]
+        end
+      entity_schema
         .merge('$schema' => SchemaMatcher::ExtendedSchema::SCHEMA_URI)
         .merge!(definitions: SchemaMatcher.schema)
     end
 
+    def array?
+      options.key?(:array) ? options[:array] : payload.is_a?(Array)
+    end
+
     def validator_options
       {
-        strict: true,
-        list: options.key?(:array) ? options[:array] : payload.is_a?(Array)
+        strict: true
       }
     end
   end

data/lib/schema_matcher/extended_schema.rb

@@ -1,21 +1,21 @@
 require 'json-schema'
 
 module SchemaMatcher
-  class ExtendedSchema < JSON::Schema::Draft4
+  class ExtendedSchema < JSON::Schema::Draft3
     SCHEMA_URI = 'http://tempuri.org/schema_matcher/extended_schema'.freeze
 
     def initialize
       super
       @attributes['type'] = ExtendedTypeAttribute
-      @attributes['properties'] = JSON::Schema::PropertiesAttribute
+      @attributes['$ref'] = ExtendedRefAttribute
       @uri = URI.parse(SCHEMA_URI)
-      @names = ['draft4-custom', SCHEMA_URI]
+      @names = ['draft3-custom', SCHEMA_URI]
     end
   end
 
-  class ExtendedTypeAttribute < JSON::Schema::TypeV4Attribute
+  module NullablePossibility
     # rubocop:disable Metrics/ParameterLists
-    def self.validate(current_schema, data, fragments, processor, validator, options = {})
+    def validate(current_schema, data, fragments, processor, validator, options = {})
       return if data.nil? && current_schema.schema['x-nullable']
 
       super
@@ -23,5 +23,13 @@ module SchemaMatcher
     # rubocop:enable Metrics/ParameterLists
   end
 
+  class ExtendedTypeAttribute < JSON::Schema::TypeAttribute
+    extend NullablePossibility
+  end
+
+  class ExtendedRefAttribute < JSON::Schema::RefAttribute
+    extend NullablePossibility
+  end
+
   JSON::Validator.register_validator(ExtendedSchema.new)
 end

data/lib/schema_matcher/version.rb

@@ -1,3 +1,3 @@
 module SchemaMatcher
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_matcher
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ivan Rudskikh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema