committee 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80631a912a39fd3bfe5334456acb5c6dcaf8a30a
-  data.tar.gz: 61ded3be6affcb5f842a168a27823bc646f00776
+  metadata.gz: becdf8694f016697cfe01ac64b851bf45c90c64e
+  data.tar.gz: 88e687a7af19cf547342bacce32b5fb72212f0b5
 SHA512:
-  metadata.gz: 51cd02c1fedb4fa660e88e3f1d56580a3d3c425e8cb0736903ed6b50a7564ff0e46a4a5aa447af7077132893f1b174e6e4becff245edd80d73da6f961adf04bb
-  data.tar.gz: 735ce3684a203194307b638c35201fbd59aaef38813ffa7e076fc17e6ee3ddc7fc3c954cba93930d5ef7e263149fa90c776c70beeba821e81e077e9f1052a47e
+  metadata.gz: 7b618b8007da0078eeba04958a12e11f4fd1d87f55e631f1d2585c483a762b513ffc58e4f41e89f9b6b6f63f6ae984e425bff59070e8fba13603ef3a95295ce2
+  data.tar.gz: 45007433833b8e24b943662060c9f156dc951b41107859686639352b4d99a8956f9ec705d176f493583d9013dcdca5e63eba2a9c90456347404284590dfefc6c

data/lib/committee/middleware/response_validation.rb

@@ -2,13 +2,14 @@ module Committee::Middleware
   class ResponseValidation < Base
     def initialize(app, options={})
       super
-      @raise  = options[:raise]
+      @raise = options[:raise]
+      @validate_errors = options[:validate_errors]
     end
 
     def handle(request)
       status, headers, response = @app.call(request.env)
 
-      if link = @router.find_request_link(request)
+      if validate?(status) && link = @router.find_request_link(request)
         full_body = ""
         response.each do |chunk|
           full_body << chunk
@@ -16,6 +17,7 @@ module Committee::Middleware
         data = MultiJson.decode(full_body)
         Committee::ResponseValidator.new(link).call(headers, data)
       end
+
       [status, headers, response]
     rescue Committee::InvalidResponse
       raise if @raise
@@ -24,5 +26,9 @@ module Committee::Middleware
       raise Committee::InvalidResponse if @raise
       render_error(500, :invalid_response, "Response wasn't valid JSON.")
     end
+
+    def validate?(status)
+      @validate_errors || (200...300).include?(status)
+    end
   end
 end

data/test/middleware/response_validation_test.rb

@@ -20,6 +20,12 @@ describe Committee::Middleware::ResponseValidation do
     assert_match /valid JSON/i, last_response.body
   end
 
+  it "ignores a non-2xx invalid response" do
+    @app = new_rack_app("[]", {}, app_status: 404)
+    get "/apps"
+    assert_equal 404, last_response.status
+  end
+
   it "rescues JSON errors" do
     @app = new_rack_app("[{x:y}]")
     get "/apps"
@@ -60,7 +66,7 @@ describe Committee::Middleware::ResponseValidation do
     Rack::Builder.new {
       use Committee::Middleware::ResponseValidation, options
       run lambda { |_|
-        [200, headers, [response]]
+        [options.fetch(:app_status, 200), headers, [response]]
       }
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema