committee 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4db940a56b1cd87d070a6d084aad49a6c3ea75d7
-  data.tar.gz: 7cec1cdb5da554e7cd9851c8edfaed73e3007d52
+  metadata.gz: 08d72b960842e3d882e0f819b9f8464d9a7932dc
+  data.tar.gz: 6c6a91b3a7abac8af97f9656772682657bd0ac14
 SHA512:
-  metadata.gz: 1593142fbaee0fe7ec0aa232ed517546a4ad5a612d92e7fc370791b164dab2e0529c378d6385a477adf4aa765c4f92249d58ce202bcb963b9e39cb2fb1801053
-  data.tar.gz: 7e83215c71913202b83d0304baebe3f742b8d74a8d22addef2361d947643bd86b3e838e2f745d4cc0ae62195a16cadb6b2541c9b7f863a048cf0df0de7ce0711
+  metadata.gz: 6d9a2d07de3c322de9095c4f60d5c23321ed732c587b78f6b8ce6a5d91be9142e57a186b7b1cda0fe7ae28be3c8667da136744da81c3674baa4b27d22d8a4081
+  data.tar.gz: b0776703f87405d4dd0f1b5b770e913820afe8ed6ea1da7cd73841c31e44cc805da9cfa9cdf3dd21ac9c41a1e1f89b2a7dc03a1365899a8f6783ed8e42405f37

data/lib/committee/middleware/response_validation.rb

@@ -28,7 +28,7 @@ module Committee::Middleware
     end
 
     def validate?(status)
-      status != 204 and @validate_errors || (200...300).include?(status)
+      Committee::ResponseValidator.validate?(status)
     end
   end
 end

data/lib/committee/response_validator.rb

@@ -9,6 +9,10 @@ module Committee
       @validator = JsonSchema::Validator.new(schema)
     end
 
+    def self.validate?(status)
+      status != 204 and @validate_errors || (200...300).include?(status)
+    end
+
     def call(status, headers, data)
       unless status == 204 # 204 No Content
         response = Rack::Response.new(data, status, headers)
@@ -28,7 +32,7 @@ module Committee
         return if data == nil
       end
 
-      if !@validator.validate(data)
+      if self.class.validate?(status) && !@validator.validate(data)
         errors = JsonSchema::SchemaError.aggregate(@validator.errors).join("\n")
         raise InvalidResponse, "Invalid response.\n\n#{errors}"
       end

data/lib/committee/test/methods.rb

@@ -18,8 +18,10 @@ module Committee::Test
         raise Committee::InvalidResponse.new(response)
       end
 
-      data = MultiJson.decode(last_response.body)
-      Committee::ResponseValidator.new(link).call(last_response.status, last_response.headers, data)
+      if validate_response?(last_response.status)
+        data = MultiJson.decode(last_response.body)
+        Committee::ResponseValidator.new(link).call(last_response.status, last_response.headers, data)
+      end
     end
 
     def assert_schema_content_type
@@ -44,5 +46,9 @@ module Committee::Test
     def warn_string_deprecated
       Committee.warn_deprecated("Committee: returning a string from `#schema_contents` is deprecated; please return a deserialized hash instead.")
     end
+
+    def validate_response?(status)
+      Committee::ResponseValidator.validate?(status)
+    end
   end
 end

data/test/response_validator_test.rb

@@ -32,6 +32,11 @@ describe Committee::ResponseValidator do
     call
   end
 
+  it "passes through a 204 No Content response" do
+    @status, @headers, @data = 204, {}, nil
+    call
+  end
+
   it "detects an improperly formatted list response" do
     @link = @list_link
     @link.target_schema = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema