rack-json_schema 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff47484c2c4c5c2aa4b576f3ae2973ed9330308c
-  data.tar.gz: a9b9edd703d900683a5d05a8a78571351a99cf13
+  metadata.gz: 71a875cdb899f6012d3925ff4eb241c096365e39
+  data.tar.gz: ecfd5744142dc70b32ea668c2c31ac8050a2d772
 SHA512:
-  metadata.gz: f0dfd8e634d117c97c808a4084de7b63ebbd1e69c8cbe85566e736023d4695ddb7156ec3923e559ce0dc48803dfbb298556a0242feb064652dc258c1ecf56a05
-  data.tar.gz: 721c53040d685f5a07d96370b891e4e5917ec3fcbc21c41802a57fddd2d3cad61e6adbb4e76fc6fb50c298fc60a060ed56a4ebb93fad7a679a4644ff0fcada49
+  metadata.gz: 57f39fdc41445c42dc183d8d62ca9876e0c01d0acad3ed247b1122e069d00f7984c5363584c351bb8cbc14d723d5767fdbf85179e003e0c0a20621784c9dfcf8
+  data.tar.gz: fbbb0eed5084b41c827589d7b80b661d301eb308e6ea0ed57e97180989ef6931bb3d6ccd7be0965bc0bef0ee74596504e3c87682fc8b014cafaa99ad12e45883

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.2.0
+- Skip content_type check if strict mode is turned off (thx @tomoya55)
+
 ## 1.1.8
 - Improve error message on LinkNotFound (thx @take)
 

data/lib/rack/json_schema/request_validation.rb

@@ -38,16 +38,20 @@ module Rack
         # @raise [Rack::JsonSchema::RequestValidation::Error]
         def call
           if has_link_for_current_action?
-            case
-            when has_body? && !has_valid_content_type?
-              raise InvalidContentType
-            when content_type_json? && has_body? && !has_valid_json?
-              raise InvalidJson
-            when content_type_json? && has_schema? && !has_valid_parameter?
-              raise InvalidParameter, "Invalid request.\n#{schema_validation_error_message}"
+            if has_body? && !has_valid_content_type?
+              if strict?
+                raise InvalidContentType
+              end
+            else
+              case
+              when content_type_json? && has_body? && !has_valid_json?
+                raise InvalidJson
+              when content_type_json? && has_schema? && !has_valid_parameter?
+                raise InvalidParameter, "Invalid request.\n#{schema_validation_error_message}"
+              end
             end
           elsif strict?
-            raise LinkNotFound.new("Could not find the link definition for request path #{path}.")
+            raise LinkNotFound, "Could not find the link definition for request path #{path}."
           end
         end
 
@@ -80,6 +84,7 @@ module Rack
           mime_type.nil? || Rack::Mime.match?(link.enc_type, mime_type)
         end
 
+        # @return [true, false] True if the current link supports json format
         def content_type_json?
           Rack::Mime.match?(link.enc_type, "application/json")
         end

data/lib/rack/json_schema/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module JsonSchema
-    VERSION = "1.1.8"
+    VERSION = "1.2.0"
   end
 end

data/spec/rack/spec_spec.rb

@@ -5,11 +5,12 @@ describe Rack::JsonSchema do
 
   let(:app) do
     local_schema = schema
+    local_strict = strict
     local_response_body = response_body
     local_response_headers = response_headers
     Rack::Builder.app do
       use Rack::JsonSchema::ErrorHandler
-      use Rack::JsonSchema::RequestValidation, schema: local_schema
+      use Rack::JsonSchema::RequestValidation, schema: local_schema, strict: local_strict
       use Rack::JsonSchema::ResponseValidation, schema: local_schema
       run ->(env) do
         [200, local_response_headers, [local_response_body]]
@@ -45,6 +46,10 @@ describe Rack::JsonSchema do
     File.expand_path("../../fixtures/schema.json", __FILE__)
   end
 
+  let(:strict) do
+    true
+  end
+
   let(:response) do
     last_response
   end
@@ -119,6 +124,16 @@ describe Rack::JsonSchema do
           message: "Invalid content type",
         )
       end
+
+      context "when strict is false" do
+        let(:strict) do
+          false
+        end
+
+        it "skips content_type check" do
+          should == 200
+        end
+      end
     end
 
     context "with valid request property", :with_valid_post_request do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-json_schema
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis