rack-json_schema 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71834752a3561e3bf63a60884a2335f172cc58ff
-  data.tar.gz: d631e1916036d2c632611d7f49571283cf01d069
+  metadata.gz: e1bc0b3aeb691e9f03410743681b3aeb47636727
+  data.tar.gz: 78f4809fbaa6d7732b5ba700f464be4187ad6263
 SHA512:
-  metadata.gz: 3496d7e180b999cfb6350ea7db3cfc12ca0f060390ba2715e72eb378cdcf0c52d850a42cc8eec6601dd79381f87f7578f3787520d9ab023066db284651146fc7
-  data.tar.gz: da8d31beb10245571b67fb7e955ee4fb9ffd1ce6ee35d46f47dd6e4ad2c65fa3bdf4c6b069bf62a3f509973d834a7786e867a6b63e971a0aa38ecee0729130c3
+  metadata.gz: 82933f6a328ccb1f7809880262f4f2119c19962c6830082ca188b768c995a55701f58f2e6f6d003c2522a3667d43f7eee91237bd844e4ccdc30da52733feb643
+  data.tar.gz: 694562757728e378acf77e615247bc480f51048b9f649eb4ccc9b503889a1a545d39ad5af3ce860cb485e390186ddcce14853dd55c35a97ccceac606b21da49d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.5.1
+- Fix error when request body is an Array in JSON
+
 ## 1.5.0
 - Separate :strict option into 2 other options
 

data/lib/rack/json_schema/request_validation.rb

@@ -56,7 +56,11 @@ module Rack
               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_hash_request_body?
+                  raise InvalidParameter, "Invalid request.\n#{schema_validation_error_message}"
+                else
+                  raise InvalidParameter, "Invalid request. Request body must be an Object in JSON."
+                end
               end
             end
           elsif !ignore_missing_path?
@@ -66,8 +70,12 @@ module Rack
 
         private
 
+        def has_hash_request_body?
+          parsed_body.is_a?(Hash)
+        end
+
         def has_valid_json?
-          parameters
+          parsed_body
           true
         rescue JSON::JSONError
           false
@@ -75,7 +83,7 @@ module Rack
 
         # @return [true, false] True if request parameters are all valid
         def has_valid_parameter?
-          schema_validation_result[0]
+          parsed_body.is_a?(Hash) && schema_validation_result[0]
         end
 
         # @return [true, false] True if any schema is defined for the current action
@@ -151,7 +159,7 @@ module Rack
         # @raise [JSON::JSONError]
         def parameters_from_body
           if has_body?
-            JSON.parse(body)
+            parsed_body
           else
             {}
           end
@@ -161,6 +169,10 @@ module Rack
         def parameters_from_query
           request.GET
         end
+
+        def parsed_body
+          @parsed_body ||= JSON.parse(body)
+        end
       end
 
       # Base error class for Rack::JsonSchema::RequestValidation

data/lib/rack/json_schema/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module JsonSchema
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
   end
 end

data/spec/rack/spec_spec.rb

@@ -155,6 +155,14 @@ describe Rack::JsonSchema do
       end
     end
 
+    context "with Array request body", :with_valid_post_request do
+      let(:params) do
+        [].to_json
+      end
+
+      it { should == 400 }
+    end
+
     context "with valid request property", :with_valid_post_request do
       it { should == 200 }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-json_schema
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ryo Nakamura