rack-json_schema 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c359a173c8a15742899c048066568b9ba4e9dcc
-  data.tar.gz: 868a647466e9df56fd41302f74f4f768fbdccddd
+  metadata.gz: 2c02f8ffa259cdd0d9dc677025227bb679e904ec
+  data.tar.gz: 50f290b85d487fb9d46caaf928e14131712eb7b2
 SHA512:
-  metadata.gz: 31755c67da66e679a28434d7bc2fae80d1532dd56404f9a9419410e83dfd2047181c5b444dce1449d465bf24a9d74d1633df767df3b4ee078fa81cb2e582e252
-  data.tar.gz: 5220e8a448947182e56bf153969181ba0aa9fe81bee99b6abb943c5b13064a31d2292a9410100e6b62b3ea7949a98c0bb668fb5173ce518f14a8d63549909ea3
+  metadata.gz: 61102d656d4c4550f9e2e0d73322ffe7192aed237083a117c1c5cfe21d8c64dfcb9b58d64b65e30791d9d9804f5495115df3837dd4977e8d72742ad51c28a3e0
+  data.tar.gz: 33aec895164221bbe5e58f0fa9d77509e5e273bc22578ab3b68ecfe36dfd99b5f4f7cc6e68b95e5c90b76476ffe9203e7bbe2c7a0820ebb7f049d34f130fd521

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.3
+* Validate request parameters in URI query too
+
 ## 1.1.2
 * Support an empty array response at response validation
 

data/lib/rack/json_schema/request_validation.rb

@@ -40,7 +40,7 @@ module Rack
             raise InvalidContentType
           when has_body? && !has_valid_json?
             raise InvalidJson
-          when has_body? && has_schema? && !has_valid_parameter?
+          when has_schema? && !has_valid_parameter?
             raise InvalidParameter, "Invalid request.\n#{schema_validation_error_message}"
           end
         end
@@ -110,14 +110,23 @@ module Rack
         # @return [Hash] Request parameters decoded from JSON
         # @raise [JSON::JSONError]
         def parameters
-          @parameters ||= begin
-            if has_body?
-              JSON.parse(body)
-            else
-              {}
-            end
+          @parameters ||= parameters_from_query.merge(parameters_from_body)
+        end
+
+        # @return [Hash] Request parameters decoded from JSON
+        # @raise [JSON::JSONError]
+        def parameters_from_body
+          if has_body?
+            JSON.parse(body)
+          else
+            {}
           end
         end
+
+        # @return [Hash] Request parameters extracted from URI query
+        def parameters_from_query
+          request.GET
+        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.1.2"
+    VERSION = "1.1.3"
   end
 end

metadata

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