sinatra-params 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bda631e901b268d9cba511c671088dc909f06d69
-  data.tar.gz: 12d04e02ba4eb00bf0a263b300414d7efedd462e
+SHA256:
+  metadata.gz: 39ccc057aea4dafe50c70dd995b80b1e2497195844169021579ae11887c8e6ec
+  data.tar.gz: cb03a5ef8fedeccb224d0a8e9cd494fc227298c28f7d0962473951083622ba03
 SHA512:
-  metadata.gz: c3385f06b2b369f652073fcf806b607ab65ee6a05333260c500359ebf4e5c3ff938c228cb2cbc518ec3ff6a2153fd06d4902ea1d908433e4278a781a821a5f31
-  data.tar.gz: '07848feccca292e83e2ed724693adf9b39f9dd1317ef2178cfc2ad89f90c50f42cf3656e4dadea529efdec03cd5fe2dc26637949c1fcb7a2691e1c477bbe8ee4'
+  metadata.gz: 324d8d867d456ac009ed8e636254c88128c39ee7c2bdb19f572b1005929d6f7eb12ecc006e4d6d1931cda5d868e7f99ce184acbaf6c5213235dee8db36803838
+  data.tar.gz: 29822ff11739c19f9905ee71c9a38d5c26a0d432756f89f7e47eb66c2cf954da8a63600b182696c7a662190961dd4ecebf83f18d60a773e6cd210e1be9d92871

data/lib/sinatra/params/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Params
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

data/lib/sinatra/params.rb

@@ -25,10 +25,12 @@ Conversion.convert = {
 module Sinatra
   module Params
     def param (name, type, args = {})
-      raise ParameterNotFoundError(name) unless params.key? name
-
       params.define_singleton_method(name.to_sym) { self[name] }
 
+      present = !params[name].nil?
+
+      raise ParameterNotFoundError(name) unless params.key? name or args[:optional]
+
       if params[name].class == type
         # Do nothing
       elsif Conversion.respond_as[type] and params[name].respond_to? Conversion.respond_as[type]
@@ -39,6 +41,8 @@ module Sinatra
         raise ParameterNotFoundError(name) unless args[:optional]
       end
 
+      return unless present
+
       raise ParameterOutOfRangeError(name) if args[:in] and args[:in].include? params[name]
       raise ParameterOutOfRangeError(name) if args[:max] and args[:max] < params[name]
       raise ParameterOutOfRangeError(name) if args[:min] and args[:min] > params[name]

data/test/server_test.rb

@@ -6,7 +6,7 @@ helpers Sinatra::Params
 
 post '/' do
   param :content, String
-  param :birthday, Date, :max => Date.today.prev_year(18)
+  param :birthday, Date, :max => Date.today.prev_year(18), :optional => true
 
-  json :content => params.content
+  json :content => params.content, :present => !params.birthday.nil?
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-params
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Felipe Cabrera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Parameter validation for Sinatra.