openapi_validator 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ee3a6bfb7172dc7ba0758635a8a4303a5c4ea79c5548057340772ec3b41af5b
-  data.tar.gz: 9bda0a6bde8325778ba45494c70030919ae96b7422fab576c57404483463e9c2
+  metadata.gz: 93502f2aa2c08a5117fc3415e972b5f6899e2b4314e4c08ce4e6c8255f1a97ad
+  data.tar.gz: 48687e1b4d85050e42c3d654fb05976d6b1c09c036988c24518e147b4d970612
 SHA512:
-  metadata.gz: 9f3e2bad86407dd53b7fc0723b6e7149aa2b7f97ddb0b942e9e19407f0c8e3b064165373250eb12432255eed1374f19da9ee5dddbd89e13a15ce6f7a031143e9
-  data.tar.gz: 0fc7db57b782c4727adcf3494412779c328038bba545d216370d52f5eeddb1c67f3bab7b0aee15a67c89bf045c762036fe4d9e9b8299a1a4a994bbd891ff921b
+  metadata.gz: b1fd3b961f82298c075bdd1f55de01dd8954eeca93a59844161e02d2552dcebeb95049626f8372af9d84db771977a633f732c9692e71ddef66a30e7b92767ab4
+  data.tar.gz: 87cc000fbf5151e40844ca29dc710418a5f8a5b7a1364447ee1634ad2e9f9a3444317200e2c73f58026a6fc0f37a89abeb0a22950d7ee3bc1f90b79fc665f11e

data/lib/openapi_validator/request.rb

@@ -8,7 +8,7 @@ module OpenapiValidator
     end
 
     def path_key
-      path[/(\/[-_\/\{\}\w]*)/]
+      path[%r{(/[-_/\{\}\w]*)}]
     end
 
     private

data/lib/openapi_validator/request_validator.rb

@@ -27,7 +27,9 @@ module OpenapiValidator
       if path_validator.empty_schema?
         @errors << "Path #{request.path} should return empty response." unless body.empty?
       else
-        @errors += JsonValidator.fully_validate(validator.api_doc, body, fragment: path_validator.fragment, response: true)
+        @errors += OpenapiValidator::ResponseValidator.call(
+          request: request, schema: validator.api_doc, data: body, fragment: path_validator.fragment, response: true
+        ).errors
       end
 
       validator.remove_validated_path(path_validator.path) if @errors.empty?

data/lib/openapi_validator/response_validator.rb

@@ -0,0 +1,48 @@
+require "openapi_validator/response_validators/json_validator"
+require "openapi_validator/response_validators/image_validator"
+
+module OpenapiValidator
+  class ResponseValidator
+
+    attr_reader :errors
+
+    def valid?
+      errors.empty?
+    end
+
+    def self.call(**params)
+      new(**params).call
+    end
+
+    def call
+      validate_response
+      self
+    end
+
+    private
+
+    attr_reader :request, :schema, :data, :fragment, :response
+
+    def initialize(request:, schema:, data:, fragment:, response:)
+      @request = request
+      @schema = schema
+      @data = data
+      @fragment = fragment
+      @response = response
+      @errors = []
+    end
+
+    def validate_response
+      @errors += validator.new(schema: schema, data: data, fragment: fragment, media_type: request.media_type, response: response).validate
+    end
+
+    def validator
+      case request.media_type
+      when 'application/json'
+        OpenapiValidator::ResponseValidator::JsonValidator
+      when %r{^image/[^/]*$}
+        OpenapiValidator::ResponseValidator::ImageValidator
+      end
+    end
+  end
+end

data/lib/openapi_validator/response_validators/image_validator.rb

@@ -0,0 +1,41 @@
+module OpenapiValidator
+  class ResponseValidator
+    class ImageValidator
+      def initialize(schema:, data:, fragment:, media_type:, response:)
+        @schema = schema
+        @data = data
+        @fragment = fragment
+        @media_type = media_type
+        @response = response
+        @property_name = JSON::Schema::Attribute.build_fragment([fragment])
+        @errors = []
+      end
+
+      def validate
+        validate_media_type
+        validate_schema
+
+        @errors
+      end
+
+      private
+
+      attr_reader :schema, :data, :fragment, :media_type, :response, :property_name
+
+      def validate_media_type
+        type, sub_type = media_type.split('/')
+        content = MimeMagic.by_magic(data)
+
+        if content&.mediatype != type && (content&.subtype == sub_type || sub_type == '*')
+          @errors << "Content-type of property '#{property_name}' did not match the following content-type: #{media_type}"
+        end
+      end
+
+      def validate_schema
+        unless JSON::Schema::Attribute.data_valid_for_type?(data, 'string')
+           @errors << "The property '#{property_name}' did not match the following type: #{type}"
+        end
+      end
+    end
+  end
+end

data/lib/openapi_validator/response_validators/json_validator.rb

@@ -0,0 +1,21 @@
+module OpenapiValidator
+  class ResponseValidator
+    class JsonValidator
+      def initialize(schema:, data:, fragment:, media_type:, response:)
+        @schema = schema
+        @data = data
+        @fragment = fragment
+        @media_type = media_type
+        @response = response
+      end
+
+      def validate
+        OpenapiValidator::JsonValidator.fully_validate(schema, data, fragment: fragment, response: response)
+      end
+
+      private
+
+      attr_reader :schema, :data, :fragment, :media_type, :response, :errors
+    end
+  end
+end

data/lib/openapi_validator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_validator
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Svyatoslav Kryukov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-30 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -83,6 +83,9 @@ files:
 - lib/openapi_validator/path_validator.rb
 - lib/openapi_validator/request.rb
 - lib/openapi_validator/request_validator.rb
+- lib/openapi_validator/response_validator.rb
+- lib/openapi_validator/response_validators/image_validator.rb
+- lib/openapi_validator/response_validators/json_validator.rb
 - lib/openapi_validator/schema/json_validator.rb
 - lib/openapi_validator/schema/required_attribute.rb
 - lib/openapi_validator/schema/type_attribute.rb