committee 1.0.7 → 1.0.8

data/lib/committee/errors.rb

@@ -11,6 +11,9 @@ module Committee
   class InvalidResponse < Error
   end
 
+  class NotFound < Error
+  end
+
   class ReferenceNotFound < Error
   end
 end

data/lib/committee/middleware/request_validation.rb

@@ -3,6 +3,7 @@ module Committee::Middleware
     def initialize(app, options={})
       super
       @prefix = options[:prefix]
+      @raise  = options[:raise]
       @strict = options[:strict]
 
       # deprecated
@@ -18,15 +19,20 @@ module Committee::Middleware
         @app.call(env)
       else
         if @strict
-          render_error(404, :not_found,
-            "That request method and path combination isn't defined.")
+          raise Committee::NotFound
         else
           @app.call(env)
         end
       end
     rescue Committee::BadRequest, Committee::InvalidRequest
+      raise if @raise
       render_error(400, :bad_request, $!.message)
+    rescue Committee::NotFound
+      raise if @raise
+      render_error(404, :not_found,
+        "That request method and path combination isn't defined.")
     rescue MultiJson::LoadError
+      raise Committee::InvalidRequest if @raise
       render_error(400, :bad_request, "Request body wasn't valid JSON.")
     end
   end

data/lib/committee/middleware/response_validation.rb

@@ -3,6 +3,7 @@ module Committee::Middleware
     def initialize(app, options={})
       super
       @prefix = options[:prefix]
+      @raise  = options[:raise]
     end
 
     def call(env)
@@ -15,8 +16,10 @@ module Committee::Middleware
       end
       [status, headers, response]
     rescue Committee::InvalidResponse
+      raise if @raise
       render_error(500, :invalid_response, $!.message)
     rescue MultiJson::LoadError
+      raise Commitee::InvalidResponse if @raise
       render_error(500, :invalid_response, "Response wasn't valid JSON.")
     end
   end

data/lib/committee/response_validator.rb

@@ -29,7 +29,10 @@ module Committee
     private
 
     def check_content_type!(headers)
-      unless headers["Content-Type"] =~ %r{application/json}
+      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 "application/json".}
       end

data/lib/committee/router.rb

@@ -27,6 +27,7 @@ module Committee
 
       schema.links.each do |link|
         method, href = parse_link(link)
+        next unless method
         routes[method] ||= []
         routes[method] << [%r{^#{href}$}, link]
       end
@@ -41,6 +42,7 @@ module Committee
     end
 
     def parse_link(link)
+      return nil, nil if !link.method || !link.href
       method = link.method.to_s.upcase
       # /apps/{id} --> /apps/([^/]+)
       href = link.href.gsub(/\{(.*?)\}/, "[^/]+")

data/test/middleware/request_validation_test.rb

@@ -69,6 +69,14 @@ describe Committee::Middleware::RequestValidation do
     assert_equal 404, last_response.status
   end
 
+  it "optionally raises an error" do
+    @app = new_rack_app(raise: true)
+    header "Content-Type", "application/json"
+    assert_raises(Committee::InvalidRequest) do
+      post "/apps", "{x:y}"
+    end
+  end
+
   private
 
   def new_rack_app(options = {})

data/test/middleware/response_validation_test.rb

@@ -41,6 +41,13 @@ describe Committee::Middleware::ResponseValidation do
     assert_equal 200, last_response.status
   end
 
+  it "rescues JSON errors" do
+    @app = new_rack_app("[{x:y}]", {}, raise: true)
+    assert(Committee::InvalidResponse) do
+      get "/apps"
+    end
+  end
+
   private
 
   def new_rack_app(response, headers = {}, options = {})

data/test/response_validator_test.rb

@@ -41,6 +41,11 @@ describe Committee::ResponseValidator do
     assert_equal message, e.message
   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.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors: