committee 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac4862a247a545f17b0c5838d564fa541c3a17d
-  data.tar.gz: dfa29382e51d4eacd43d05a14ed09dbc8fa13381
+  metadata.gz: 5e19343ffb0ef2e64ac07c4cac4b0cfea513dfb1
+  data.tar.gz: db3766715d0b18b7ebfb4f36753f089c981a099e
 SHA512:
-  metadata.gz: 3bf123acebdcab88a882410be484dcf849ecd304807d3263916a23da0bdea43461d23fe1b8842c423bda9db8f8a98bdec012abe534708914ed847460372eb537
-  data.tar.gz: 6b631a8e6b1fd64d027b6da68e029f31d5d1725325b3440deb3b7ed5700c01d18dc2727f872fdca559b42d6c762913b996b120f0296a3290bda90e8a662f9b94
+  metadata.gz: d28f2a33a2c378ec68b302c0391172cda7f2bc12e344abc250f7d42ec952833cdd8e0bf146d6019b965ca0f1ec577e66fcfbdec5d2d44497947a48f284ef4e05
+  data.tar.gz: 9f13aea9de25ad5b03968f249fb2052cb9b2eb0ba9eb4d2c43b82eaa21b3977dfa29e3112d82e211947b27a0afc15a4f8b3a52cfd678bf768a1424e52794b338

data/lib/committee/request_unpacker.rb

@@ -11,7 +11,7 @@ module Committee
     def call
       # if Content-Type is empty or JSON, and there was a request body, try to
       # interpret it as JSON
-      params = if !@request.content_type || @request.content_type =~ %r{application/json}
+      params = if !@request.media_type || @request.media_type =~ %r{application/.*json}
         parse_json
       elsif @optimistic_json
         parse_json rescue MultiJson::LoadError nil
@@ -19,7 +19,7 @@ module Committee
 
       params = if params
         params
-      elsif @allow_form_params && @request.content_type == "application/x-www-form-urlencoded"
+      elsif @allow_form_params && @request.media_type == "application/x-www-form-urlencoded"
         # Actually, POST means anything in the request body, could be from
         # PUT or PATCH too. Silly Rack.
         indifferent_params(@request.POST)

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.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema