committee 1.6.5 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e19343ffb0ef2e64ac07c4cac4b0cfea513dfb1
-  data.tar.gz: db3766715d0b18b7ebfb4f36753f089c981a099e
+  metadata.gz: f1a97b0ff3619376580988532aad290aa2257c95
+  data.tar.gz: 991b2c60eed65c47dd3206ae7703c9a19a57d2d8
 SHA512:
-  metadata.gz: d28f2a33a2c378ec68b302c0391172cda7f2bc12e344abc250f7d42ec952833cdd8e0bf146d6019b965ca0f1ec577e66fcfbdec5d2d44497947a48f284ef4e05
-  data.tar.gz: 9f13aea9de25ad5b03968f249fb2052cb9b2eb0ba9eb4d2c43b82eaa21b3977dfa29e3112d82e211947b27a0afc15a4f8b3a52cfd678bf768a1424e52794b338
+  metadata.gz: 77ea946d592580572727954316cf802ee5012d442f7f0e2ded8f9e1c2854225f9287f13137451bf2cf1dbd187dadd507fdf1bb5fa9efab55f5fd7b4edc69d67e
+  data.tar.gz: ba57411ac8dc2110ad4ac17fe1e928f2370ba558b2c3648008369c4e5ebfabc478e4405aa23d9742e69932c7f4708e667e2a8b8593c050c4a50ebfcef2e727a0

data/lib/committee/response_validator.rb

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

data/test/response_validator_test.rb

@@ -35,19 +35,11 @@ describe Committee::ResponseValidator do
     assert_equal message, e.message
   end
 
-  it "detects a blank response Content-Type" do
-    @headers = {}
-    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 "detects an invalid response Content-Type" do
-    @headers = { "Content-Type" => "text/html" }
+    @headers = {}
     e = assert_raises(Committee::InvalidResponse) { call }
     message =
-      %{"Content-Type" response header must be set to "#{@link.enc_type}".}
+      %{"Content-Type" response header must be set to "application/json".}
     assert_equal message, e.message
   end
 
@@ -56,6 +48,11 @@ describe Committee::ResponseValidator do
     call
   end
 
+  it "allows application/schema+json in responses as well" do
+    @headers = { "Content-Type" => "application/schema+json" }
+    call
+  end
+
   it "raises errors generated by json_schema" do
     @data.merge!("name" => "%@!")
     e = assert_raises(Committee::InvalidResponse) { call }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.7.0
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -161,9 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A collection of Rack middleware to support JSON Schema.
 test_files: []
-has_rdoc: