openapi_validator 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03d06da470bc735d01636c06b916e5247d961cb6c1ba45927bed48b052ea8063
-  data.tar.gz: a1eb96abfb80219e9bf1019b6210a9b92a47a56be8db4887c6d6fdc59e97af6d
+  metadata.gz: 9ee3a6bfb7172dc7ba0758635a8a4303a5c4ea79c5548057340772ec3b41af5b
+  data.tar.gz: 9bda0a6bde8325778ba45494c70030919ae96b7422fab576c57404483463e9c2
 SHA512:
-  metadata.gz: f8136a756581e5409821f4ca8d3ea10f9e1334b47dd1027af66415ab850f5db96bd69ed996d9e647ac41712bd22c7e6f0408c0fffef6c8a0edfef7a5f01d70f6
-  data.tar.gz: 607e50ebd480b4e0b2cdb6f91494ead6c33e781ca290b901f457fc3731e118a17366fac841811ae5f6755856726c4d96bfbf9bc62ad4082da4b53ad193798cd9
+  metadata.gz: 9f3e2bad86407dd53b7fc0723b6e7149aa2b7f97ddb0b942e9e19407f0c8e3b064165373250eb12432255eed1374f19da9ee5dddbd89e13a15ce6f7a031143e9
+  data.tar.gz: 0fc7db57b782c4727adcf3494412779c328038bba545d216370d52f5eeddb1c67f3bab7b0aee15a67c89bf045c762036fe4d9e9b8299a1a4a994bbd891ff921b

data/lib/openapi_validator/documentation_validator.rb

@@ -1,5 +1,6 @@
 require "json-schema"
 require "openapi_validator/file_loader"
+require "openapi_validator/schema/json_validator"
 
 module OpenapiValidator
   class DocumentationValidator
@@ -30,7 +31,7 @@ module OpenapiValidator
     # @return [DocumentationValidator]
     def validate
       parsed_schemas.each do |schema|
-        errors.concat JSON::Validator.fully_validate(schema, api_doc)
+        errors.concat JsonValidator.fully_validate(schema, api_doc)
       end
 
       self

data/lib/openapi_validator/extended_schema.rb

@@ -1,16 +1,19 @@
-require "openapi_validator/extended_type_attribute"
 require "json-schema"
+require "openapi_validator/schema/json_validator"
+require "openapi_validator/schema/required_attribute"
+require "openapi_validator/schema/type_attribute"
 
 module OpenapiValidator
   class ExtendedSchema < JSON::Schema::Draft4
     def initialize
       super
-      @attributes['type'] = ExtendedTypeAttribute
-      @uri = URI.parse('http://tempuri.org/apivore/extended_schema')
-      @names = ['http://tempuri.org/apivore/extended_schema']
+      @attributes['type'] = TypeAttribute
+      @attributes['required'] = RequiredAttribute
+      @uri = URI.parse('http://example.com/extended_schema')
+      @names = ['http://example.com/extended_schema']
     end
 
-    JSON::Validator.register_validator(self.new)
-    JSON::Validator.register_default_validator(self.new)
+    JsonValidator.register_validator(self.new)
+    JsonValidator.register_default_validator(self.new)
   end
 end

data/lib/openapi_validator/request_validator.rb

@@ -1,4 +1,5 @@
 require 'openapi_validator/path_validator'
+require 'openapi_validator/schema/json_validator'
 
 module OpenapiValidator
   class RequestValidator
@@ -26,7 +27,7 @@ module OpenapiValidator
       if path_validator.empty_schema?
         @errors << "Path #{request.path} should return empty response." unless body.empty?
       else
-        @errors += JSON::Validator.fully_validate(validator.api_doc, body, fragment: path_validator.fragment)
+        @errors += JsonValidator.fully_validate(validator.api_doc, body, fragment: path_validator.fragment, response: true)
       end
 
       validator.remove_validated_path(path_validator.path) if @errors.empty?

data/lib/openapi_validator/schema/json_validator.rb

@@ -0,0 +1,6 @@
+
+module OpenapiValidator
+  class JsonValidator < JSON::Validator
+    attr_reader :options
+  end
+end

data/lib/openapi_validator/schema/required_attribute.rb

@@ -0,0 +1,28 @@
+require "json-schema/attributes/required"
+
+module OpenapiValidator
+  class RequiredAttribute < JSON::Schema::RequiredAttribute
+    def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      return unless data.is_a?(Hash)
+
+      schema = current_schema.schema
+      defined_properties = schema['properties']
+
+      schema['required'].each do |property, _property_schema|
+        next if data.has_key?(property.to_s)
+        prop_defaults = options[:insert_defaults] &&
+          defined_properties &&
+          defined_properties[property] &&
+          !defined_properties[property]["default"].nil? &&
+          !defined_properties[property]["readonly"]
+
+        skip_error = processor.options[:response] && defined_properties[property]["writeOnly"]
+
+        if !prop_defaults && !skip_error
+          message = "The property '#{build_fragment(fragments)}' did not contain a required property of '#{property}'"
+          validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
+        end
+      end
+    end
+  end
+end

data/lib/openapi_validator/{extended_type_attribute.rb → schema/type_attribute.rb}

@@ -1,7 +1,7 @@
 require "json-schema/attributes/type_v4"
 
 module OpenapiValidator
-  class ExtendedTypeAttribute < JSON::Schema::TypeV4Attribute
+  class TypeAttribute < JSON::Schema::TypeV4Attribute
     def self.validate(current_schema, data, fragments, processor, validator, options = {})
       return if data.nil? && current_schema.schema["nullable"] == true
       super

data/lib/openapi_validator/version.rb

@@ -1,3 +1,3 @@
 module OpenapiValidator
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_validator
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Svyatoslav Kryukov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -79,11 +79,13 @@ files:
 - lib/openapi_validator.rb
 - lib/openapi_validator/documentation_validator.rb
 - lib/openapi_validator/extended_schema.rb
-- lib/openapi_validator/extended_type_attribute.rb
 - lib/openapi_validator/file_loader.rb
 - lib/openapi_validator/path_validator.rb
 - lib/openapi_validator/request.rb
 - lib/openapi_validator/request_validator.rb
+- lib/openapi_validator/schema/json_validator.rb
+- lib/openapi_validator/schema/required_attribute.rb
+- lib/openapi_validator/schema/type_attribute.rb
 - lib/openapi_validator/validator.rb
 - lib/openapi_validator/version.rb
 homepage: https://github.com/medsolutions/openapi_validator