committee 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21f051249450debd2c219dc07399401ab15a4d65
-  data.tar.gz: 91721da33a3abfec0f4a24fe4ec2555758465c37
+  metadata.gz: 6b93ed460e34afc046f016a0b28c53c221bb4eb5
+  data.tar.gz: 0670a4037229f06312799901ade0e94bf416a95e
 SHA512:
-  metadata.gz: b45011a0c6bc3e36f2e05317ee7888692c621452234cead0c1d06fe522d700229af7b9541873b580794de71a8d1e616376ba05e6b3fe96759f27b3b3777e9cb3
-  data.tar.gz: 15d57615ecfe1b5a53315269a8cc534b5bbbed99de2a12e6167263faf4abc84fb9c888f4bb5795da08a124ca2b41e53a738ccec44ff9c38328596d5b916c25e2
+  metadata.gz: c64af87f69eeeb24ba0b6dd0e9baa873c436d67e452dfde3c432e318d3cf583ec536dd1faed3c136ce1e4d0a2b90aac17083b861492ce0ed518d24ea2ede4f36
+  data.tar.gz: 9fcc322cc7e10fa8299fc0025dada82a5222c3546988737ed344f06d9e809ccf1c6a010a193d1e49378ba3c2767b0e340652793bcd8f22edf0d7c2590795a96e

data/lib/committee/middleware/response_validation.rb

@@ -1,6 +1,8 @@
 module Committee::Middleware
   class ResponseValidation < Base
-    def initialize(app, options={})
+    attr_reader :validate_errors
+
+    def initialize(app, options = {})
       super
       @validate_errors = options[:validate_errors]
     end
@@ -14,7 +16,7 @@ module Committee::Middleware
           full_body << chunk
         end
         data = JSON.parse(full_body)
-        Committee::ResponseValidator.new(link).call(status, headers, data)
+        Committee::ResponseValidator.new(link, validate_errors: validate_errors).call(status, headers, data)
       end
 
       [status, headers, response]
@@ -27,7 +29,7 @@ module Committee::Middleware
     end
 
     def validate?(status)
-      Committee::ResponseValidator.validate?(status)
+      Committee::ResponseValidator.validate?(status, validate_errors: validate_errors)
     end
   end
 end

data/lib/committee/response_validator.rb

@@ -1,7 +1,10 @@
 module Committee
   class ResponseValidator
-    def initialize(link)
+    attr_reader :validate_errors
+
+    def initialize(link, options = {})
       @link = link
+      @validate_errors = options[:validate_errors]
 
       # we should eventually move off of validating against parent schema too
       # ... this is a Herokuism and not in the specification
@@ -9,8 +12,10 @@ module Committee
       @validator = JsonSchema::Validator.new(schema)
     end
 
-    def self.validate?(status)
-      status != 204 and @validate_errors || (200...300).include?(status)
+    def self.validate?(status, options = {})
+      validate_errors = options[:validate_errors]
+
+      status != 204 and validate_errors || (200...300).include?(status)
     end
 
     def call(status, headers, data)
@@ -32,7 +37,7 @@ module Committee
         return if data == nil
       end
 
-      if self.class.validate?(status) && !@validator.validate(data)
+      if self.class.validate?(status, validate_errors: validate_errors) && !@validator.validate(data)
         errors = JsonSchema::SchemaError.aggregate(@validator.errors).join("\n")
         raise InvalidResponse, "Invalid response.\n\n#{errors}"
       end

data/test/middleware/response_validation_test.rb

@@ -26,6 +26,14 @@ describe Committee::Middleware::ResponseValidation do
     assert_equal 404, last_response.status
   end
 
+  it "optionally validates non-2xx invalid responses" do
+    @app = new_rack_app("", {}, {app_status: 404, validate_errors: true})
+
+    get "/apps"
+    assert_equal 500, last_response.status
+    assert_match /valid JSON/i, last_response.body
+  end
+
   it "passes through a 204 (no content) response" do
     @app = new_rack_app("", {}, app_status: 204)
     get "/apps"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A collection of Rack middleware to support JSON Schema.