rack-json_schema 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79d209276140e0736a40756b6505b4b8a6eeec02
-  data.tar.gz: e6f68298e2836bd614ceb53bf2d396282cb28148
+  metadata.gz: e64c6e28164dfe606ffec931969f51da0d6e66a5
+  data.tar.gz: 7e19454007e9b43b4f3915bdf127e5276bd6fdb2
 SHA512:
-  metadata.gz: e88d4285760b99907f5eeb0f14eeea65ab03e0b5f8e7136339139188918955e62b61b309530cfbca52c5848086c504685458552f0b24120340b03d74da218346
-  data.tar.gz: 417d7ef7f5029194670d29dc94ca3f3a7531b735f60c9363def5ee8874f1c1e07810ee3759a5e94d8f8d187f8a1343ec532da3ab3cfc438fb944b96c63217a7c
+  metadata.gz: 7e7e277bc22ef4457488e12b36336ae96369ee9feeaf0c71b80291c1ec882c5941b3956435eb40bc2325c6841ae1424552379f55cfa9036dcbce21d5946eab4c
+  data.tar.gz: 1368238b6dc3f699709e591249d5fcdb8566ebff96b003707ba3b8effd7fda08e7be5103947f700c5f9526ea7f20c8f226ad6b64c142c1d0c0a4a3ea6c84dfda

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.5
+* Check Content-Type on response validation
+
 ## 1.1.4
 * Skip validation of non-json request
 

data/lib/rack/json_schema/response_validation.rb

@@ -31,7 +31,7 @@ module Rack
         # Raises an error if any error detected, skipping validation for non-defined link
         # @raise [Rack::JsonSchema::ResponseValidation::InvalidResponse]
         def call
-          if !has_error_status? && has_link_for_current_action?
+          if !has_error_status? && has_link_for_current_action? && has_link_of_media_type_json?
             case
             when !has_json_content_type?
               raise InvalidResponseContentType
@@ -41,9 +41,14 @@ module Rack
           end
         end
 
+        # @return [true, false] True if Link mediaType is for JSON
+        def has_link_of_media_type_json?
+          mime_type_json?(link.media_type)
+        end
+
         # @return [true, false] True if response Content-Type is for JSON
         def has_json_content_type?
-          %r<\Aapplication/.*json> === headers["Content-Type"]
+          mime_type_json?(mime_type)
         end
 
         # @return [true, false] True if given data is valid to the JSON schema
@@ -93,6 +98,22 @@ module Rack
         def has_error_status?
           response_status >= 400
         end
+
+        # @return [String, nil] Response MIME Type specified in Content-Type header field
+        # @example
+        #   mime_type #=> "application/json"
+        def mime_type
+          headers["Content-Type"].split(";").first if headers["Content-Type"]
+        end
+
+        # @return [true, false] return true if mime type is for JSON
+        # @example
+        #   "application/json" #=> true
+        #   "application/calendar+json" #=> true
+        #   "application/vnd.myapp.custom-json" #=> false
+        def mime_type_json?(value)
+          %r<\Aapplication/(?:.*\+)?json> === value
+        end
       end
 
       # Base error class for Rack::JsonSchema::ResponseValidation

data/lib/rack/json_schema/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module JsonSchema
-    VERSION = "1.1.4"
+    VERSION = "1.1.5"
   end
 end

data/rack-json_schema.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "erubis"
   spec.add_dependency "jdoc", ">= 0.1.4"
-  spec.add_dependency "json_schema"
+  spec.add_dependency "json_schema", "~> 0.2"
   spec.add_dependency "rack"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "pry"

data/spec/fixtures/schema.json

@@ -68,6 +68,14 @@
           "rel": "self",
           "title": "Info"
         },
+        {
+          "description": "Info for existing apps in text format",
+          "href": "/apps/{(%23%2Fdefinitions%2Fapp%2Fdefinitions%2Fid)}/text",
+          "method": "GET",
+          "rel": "self",
+          "title": "Info",
+          "mediaType": "text/plain"
+        },
         {
           "description": "List existing apps.",
           "href": "/apps",

data/spec/rack/spec_spec.rb

@@ -202,12 +202,22 @@ describe Rack::JsonSchema do
         { "Content-Type" => "text/plain" }
       end
 
-      it "returns invalid_response_content_type error" do
-        should == 500
-        response.body.should be_json_as(
-          id: "invalid_response_content_type",
-          message: "Response Content-Type wasn't for JSON",
-        )
+      context "when mediaType is specified as text/plain" do
+        let(:path) do
+          "/apps/#{response_data[:id]}/text"
+        end
+
+        it { should == 200 }
+      end
+
+      context "when mediaType is not specified" do
+        it "returns invalid_response_content_type error" do
+          should == 500
+          response.body.should be_json_as(
+            id: "invalid_response_content_type",
+            message: "Response Content-Type wasn't for JSON",
+          )
+        end
       end
     end
 
@@ -238,5 +248,13 @@ describe Rack::JsonSchema do
         )
       end
     end
+
+    context "with response content type for JSON" do
+      let(:response_headers) do
+        { "Content-Type" => "application/json; charset=utf-8" }
+      end
+
+      it { should == 200 }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-json_schema
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -42,16 +42,16 @@ dependencies:
   name: json_schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement