rack-json_schema 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e64c6e28164dfe606ffec931969f51da0d6e66a5
-  data.tar.gz: 7e19454007e9b43b4f3915bdf127e5276bd6fdb2
+  metadata.gz: ed0069997aafd754ac22502c6821479b8b8fdc2d
+  data.tar.gz: 9b85a306718476fe5578bd8c8dc00365047a91df
 SHA512:
-  metadata.gz: 7e7e277bc22ef4457488e12b36336ae96369ee9feeaf0c71b80291c1ec882c5941b3956435eb40bc2325c6841ae1424552379f55cfa9036dcbce21d5946eab4c
-  data.tar.gz: 1368238b6dc3f699709e591249d5fcdb8566ebff96b003707ba3b8effd7fda08e7be5103947f700c5f9526ea7f20c8f226ad6b64c142c1d0c0a4a3ea6c84dfda
+  metadata.gz: a53a19778c8406e0d7e33b32d10fc71f69d336df648c99371e5ba691f17dfe06773253bceb349ba24a6887006357ab787d4c4c14452490dfce7f822815cf4b21
+  data.tar.gz: 1d0177a90def3bd715b1ec662b7508c672432d0f99a9989bc6cdf652d2ce6588d614d5f621b9e8c3c7db46841fc4e5bbc0cb710228f79b4308b4da2fc56506f4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.6
+* Add :strict option to ignore undefined link
+
 ## 1.1.5
 * Check Content-Type on response validation
 

data/lib/rack/json_schema/request_validation.rb

@@ -4,16 +4,18 @@ module Rack
       # Behaves as a rack-middleware
       # @param app [Object] Rack application
       # @param schema [Hash] Schema object written in JSON schema format
+      # @param strict [Boolean] Strict mode or not (default: true)
       # @raise [JsonSchema::SchemaError]
-      def initialize(app, schema: nil)
+      def initialize(app, schema: nil, strict: nil)
         @app = app
         @schema = Schema.new(schema)
+        @strict = strict
       end
 
       # @raise [Rack::JsonSchema::RequestValidation::Error] Raises if given request is invalid to JSON Schema
       # @param env [Hash] Rack env
       def call(env)
-        Validator.call(env: env, schema: @schema)
+        Validator.call(env: env, schema: @schema, strict: @strict)
         @app.call(env)
       end
 
@@ -25,23 +27,27 @@ module Rack
 
         # @param env [Hash] Rack env
         # @param schema [JsonSchema::Schema] Schema object
-        def initialize(env: nil, schema: nil)
+        # @param strict [Boolean] Strict mode or not (default: true)
+        def initialize(env: nil, schema: nil, strict: nil)
           @env = env
           @schema = schema
+          @strict = strict
         end
 
         # Raises an error if any error detected
         # @raise [Rack::JsonSchema::RequestValidation::Error]
         def call
-          case
-          when !has_link_for_current_action?
+          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}"
+            end
+          elsif strict?
             raise LinkNotFound
-          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}"
           end
         end
 
@@ -131,6 +137,11 @@ module Rack
         def parameters_from_query
           request.GET
         end
+
+        # @return [Boolean] Strict mode or not.
+        def strict?
+          @strict != false
+        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.5"
+    VERSION = "1.1.6"
   end
 end

data/spec/rack/spec_spec.rb

@@ -141,7 +141,7 @@ describe Rack::JsonSchema do
         should == 400
         response.body.should be_json_as(
           id: "invalid_parameter",
-          message: %r<\AInvalid request\.\n#/name: failed schema .+: Expected string to match pattern>,
+          message: String,
         )
       end
     end
@@ -230,7 +230,7 @@ describe Rack::JsonSchema do
         should == 500
         response.body.should be_json_as(
           id: "invalid_response_type",
-          message: /Missing required keys "id" in object/,
+          message: String,
         )
       end
     end
@@ -244,7 +244,7 @@ describe Rack::JsonSchema do
         should == 500
         response.body.should be_json_as(
           id: "invalid_response_type",
-          message: /Expected data to match "uuid" format, value was: 123/,
+          message: String,
         )
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-json_schema
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis