rswag-specs 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ad505db2b445cd38fdcdd4c78aadefe9b996b63
-  data.tar.gz: 822fc014d46cb7c1b70e98caa330d41020b2a909
+  metadata.gz: 2643849549d65f9a5854dad6d177588db4390bd9
+  data.tar.gz: c164db99213ff0543cb2359a629bba5c9e162a64
 SHA512:
-  metadata.gz: 5001a2a51c3bbd6693466d5f6674ffa7a2662c5e9017814df96e2461a20aa854df6e8ffd63ff483f4e17f9ca62da6ee3ff35f37f23eff35b6d632530d7de095d
-  data.tar.gz: 6d939b5b8bdb64cb2542e4012bad4c4bc14166bc2a92f3ed6da1a0eb4d8af0632c3257ee94fddd4bdc9c9938db5b01fbba2967c8c50222346b5af50d85e6e2c0
+  metadata.gz: 8f96616d29280adf887600c0c33cf31cac2899de178101ec27641e5f32a3f685ec02108016925fac17899b2663f155c197852d3c8932db8da7f6932300ce8bba
+  data.tar.gz: b85ec04810dfb22c059f61a1519ffeb4c7dcdc28ed675b98bbe7ec314680eb31dd70476d9fe03e0c04eda2634cc117027692280c2de2c1c4999360d08f5f2f1a

data/lib/rswag/specs/extended_schema.rb

@@ -0,0 +1,25 @@
+require 'json-schema'
+
+module Rswag
+  module Specs
+    class ExtendedSchema < JSON::Schema::Validator
+
+      def initialize
+        super
+        extend_schema_definition("http://json-schema.org/draft-04/schema#")
+        @attributes['type'] = ExtendedTypeAttribute
+        @uri = URI.parse('http://tempuri.org/rswag/specs/extended_schema')
+      end
+    end
+
+    class ExtendedTypeAttribute < JSON::Schema::TypeV4Attribute
+
+      def self.validate(current_schema, data, fragments, processor, validator, options={})
+        return if data.nil? && current_schema.schema['x-nullable'] == true
+        super
+      end
+    end
+
+    JSON::Validator.register_validator(ExtendedSchema.new)
+  end
+end

data/lib/rswag/specs/response_validator.rb

@@ -1,4 +1,6 @@
+require 'active_support/core_ext/hash/slice'
 require 'json-schema'
+require 'rswag/specs/extended_schema'
 
 module Rswag
   module Specs
@@ -23,10 +25,14 @@ module Rswag
       end
 
       def validate_body!(body)
-        schema = @api_metadata[:response][:schema]
-        return if schema.nil?
+        response_schema = @api_metadata[:response][:schema]
+        return if response_schema.nil?
+
         begin
-          JSON::Validator.validate!(schema.merge(@global_metadata), body)
+          validation_schema = response_schema
+            .merge('$schema' => 'http://tempuri.org/rswag/specs/extended_schema')
+            .merge(@global_metadata.slice(:definitions))
+          JSON::Validator.validate!(validation_schema, body)
         rescue JSON::Schema::ValidationError => ex
           raise UnexpectedResponse, "Expected response body to match schema: #{ex.message}" 
         end

data/lib/rswag/specs/version.rb

@@ -1,5 +1,5 @@
 module Rswag
   module Specs
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rswag-specs
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Richie Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,6 +81,7 @@ files:
 - lib/rswag/specs/configuration.rb
 - lib/rswag/specs/example_group_helpers.rb
 - lib/rswag/specs/example_helpers.rb
+- lib/rswag/specs/extended_schema.rb
 - lib/rswag/specs/railtie.rb
 - lib/rswag/specs/request_factory.rb
 - lib/rswag/specs/response_validator.rb