committee 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a97b0ff3619376580988532aad290aa2257c95
-  data.tar.gz: 991b2c60eed65c47dd3206ae7703c9a19a57d2d8
+  metadata.gz: 3e94b1d2b86d37d5a8caf1038b86f586b1abcc0e
+  data.tar.gz: 6c8eeb7064f3153067f00a0435a5a05531e054e9
 SHA512:
-  metadata.gz: 77ea946d592580572727954316cf802ee5012d442f7f0e2ded8f9e1c2854225f9287f13137451bf2cf1dbd187dadd507fdf1bb5fa9efab55f5fd7b4edc69d67e
-  data.tar.gz: ba57411ac8dc2110ad4ac17fe1e928f2370ba558b2c3648008369c4e5ebfabc478e4405aa23d9742e69932c7f4708e667e2a8b8593c050c4a50ebfcef2e727a0
+  metadata.gz: 409d877ea286153b57ca5b3492c53ea86b2b307777c01f64f84612fc5ce22c7125d3ab9f1ec9baab9ebcacbd27bf6d0f18526e847b5b1d34d5853255ca4c69b5
+  data.tar.gz: 04777cf0d9a53e69f9cbc702cd1c6f83c338fbb2e4c1d7e65d40c387e8428fdc16071a2c7397642a2af508b49704fc2234d74c0890d1cb4daa2d3f4aacbea77c

data/lib/committee/response_validator.rb

@@ -11,7 +11,8 @@ module Committee
 
     def call(status, headers, data)
       unless status == 204 # 204 No Content
-        check_content_type!(headers)
+        response = Rack::Response.new(data, status, headers)
+        check_content_type!(response)
       end
 
       if @link.rel == "instances" && !@link.target_schema
@@ -35,13 +36,10 @@ module Committee
 
     private
 
-    def check_content_type!(headers)
-      match = [%r{application/json}, %r{application/schema\+json}].any? { |m|
-        headers["Content-Type"] =~ m
-      }
-      unless match
+    def check_content_type!(response)
+      unless Rack::Mime.match?(response.content_type.to_s, @link.enc_type)
         raise Committee::InvalidResponse,
-          %{"Content-Type" response header must be set to "application/json".}
+          %{"Content-Type" response header must be set to "#{@link.enc_type}".}
       end
     end
   end

data/test/response_validator_test.rb

@@ -35,21 +35,24 @@ describe Committee::ResponseValidator do
     assert_equal message, e.message
   end
 
-  it "detects an invalid response Content-Type" do
+  it "detects a blank response Content-Type" do
     @headers = {}
     e = assert_raises(Committee::InvalidResponse) { call }
     message =
-      %{"Content-Type" response header must be set to "application/json".}
+      %{"Content-Type" response header must be set to "#{@link.enc_type}".}
     assert_equal message, e.message
   end
 
-  it "allows no Content-Type for 204 No Content" do
-    @status, @headers = 204, {}
-    call
+  it "detects an invalid response Content-Type" do
+    @headers = { "Content-Type" => "text/html" }
+    e = assert_raises(Committee::InvalidResponse) { call }
+    message =
+      %{"Content-Type" response header must be set to "#{@link.enc_type}".}
+    assert_equal message, e.message
   end
 
-  it "allows application/schema+json in responses as well" do
-    @headers = { "Content-Type" => "application/schema+json" }
+  it "allows no Content-Type for 204 No Content" do
+    @status, @headers = 204, {}
     call
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema