rack-json_schema 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c02f8ffa259cdd0d9dc677025227bb679e904ec
-  data.tar.gz: 50f290b85d487fb9d46caaf928e14131712eb7b2
+  metadata.gz: 79d209276140e0736a40756b6505b4b8a6eeec02
+  data.tar.gz: e6f68298e2836bd614ceb53bf2d396282cb28148
 SHA512:
-  metadata.gz: 61102d656d4c4550f9e2e0d73322ffe7192aed237083a117c1c5cfe21d8c64dfcb9b58d64b65e30791d9d9804f5495115df3837dd4977e8d72742ad51c28a3e0
-  data.tar.gz: 33aec895164221bbe5e58f0fa9d77509e5e273bc22578ab3b68ecfe36dfd99b5f4f7cc6e68b95e5c90b76476ffe9203e7bbe2c7a0820ebb7f049d34f130fd521
+  metadata.gz: e88d4285760b99907f5eeb0f14eeea65ab03e0b5f8e7136339139188918955e62b61b309530cfbca52c5848086c504685458552f0b24120340b03d74da218346
+  data.tar.gz: 417d7ef7f5029194670d29dc94ca3f3a7531b735f60c9363def5ee8874f1c1e07810ee3759a5e94d8f8d187f8a1343ec532da3ab3cfc438fb944b96c63217a7c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.4
+* Skip validation of non-json request
+
 ## 1.1.3
 * Validate request parameters in URI query too
 

data/lib/rack/json_schema/request_validation.rb

@@ -38,9 +38,9 @@ module Rack
             raise LinkNotFound
           when has_body? && !has_valid_content_type?
             raise InvalidContentType
-          when has_body? && !has_valid_json?
+          when content_type_json? && has_body? && !has_valid_json?
             raise InvalidJson
-          when has_schema? && !has_valid_parameter?
+          when content_type_json? && has_schema? && !has_valid_parameter?
             raise InvalidParameter, "Invalid request.\n#{schema_validation_error_message}"
           end
         end
@@ -74,6 +74,10 @@ module Rack
           mime_type.nil? || Rack::Mime.match?(link.enc_type, mime_type)
         end
 
+        def content_type_json?
+          Rack::Mime.match?(link.enc_type, "application/json")
+        end
+
         # @return [Array] A result of schema validation for the current action
         def schema_validation_result
           @schema_validation_result ||= link.schema.validate(parameters)

data/lib/rack/json_schema/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module JsonSchema
-    VERSION = "1.1.3"
+    VERSION = "1.1.4"
   end
 end

data/spec/fixtures/schema.json

@@ -28,6 +28,12 @@
           "type": [
             "string"
           ]
+        },
+        "file": {
+          "description": "an attachment of app",
+          "example": "",
+          "readOnly": false,
+          "type": "string"
         }
       },
       "links": [
@@ -85,6 +91,24 @@
             ]
           },
           "title": "Update"
+        },
+        {
+          "description": "Upload an attachment file for an app",
+          "href": "/apps/{(%23%2Fdefinitions%2Fapp%2Fdefinitions%2Fid)}/files",
+          "method": "POST",
+          "rel": "create",
+          "encType": "multipart/form-data",
+          "schema": {
+            "properties": {
+              "file": {
+                "$ref": "#/definitions/app/definitions/file"
+              }
+            },
+            "type": [
+              "object"
+            ]
+          },
+          "title": "Create"
         }
       ],
       "properties": {

data/spec/rack/spec_spec.rb

@@ -146,6 +146,27 @@ describe Rack::JsonSchema do
       end
     end
 
+    context "with non-json content type with non-json request body", :with_valid_post_request do
+
+      let(:path) do
+        "/apps/#{app_id}/files"
+      end
+
+      let(:app_id) do
+        1
+      end
+
+      let(:params) do
+        { file: Rack::Test::UploadedFile.new(schema_path, 'text/x-yaml') }
+      end
+
+      before do
+        env["CONTENT_TYPE"] = "multipart/form-data"
+      end
+
+      it { should == 200 }
+    end
+
     context "with malformed JSON request body", :with_valid_post_request do
       let(:params) do
         "malformed"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-json_schema
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis