sinatra-wanted 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cebe8a6afda6c950d71167b5656d2456c22c8894d06a224a969f49c8f01e6f4
-  data.tar.gz: 32ef7d621342e14718c5d4a4f18ae769d3141fa6bfea17b098e257f61b02aa94
+  metadata.gz: 9101f145fd635df26d860b131adc7d6fbe0f1196d228016dbd010c52bb939a33
+  data.tar.gz: b859f5eec52397e2ac3b7dde629f0fe2e9c78d28a3fe2ed452da9c8755ef69a8
 SHA512:
-  metadata.gz: 0aa57b280ce6d9dc9f56def9bb3dd8a09f1e99269bcd968ad298c63f130b5390b269f94e4dc6e04fba3752727945e94c0f502897694ad4a28ca96478e006309b
-  data.tar.gz: f8688d782efd075a6748485d12740c58b0369c1e6f1702db6006f4ec9dc2ab29020f78e37258047309a33a2e6451bb18494297dac7eafc91b45c261470f45ab7
+  metadata.gz: 3172c6004a66b9065ddbd488e9e1f96ee1b402cc1c0764901197401490a679324226ba9a800e7ead3ae4d9096eb318675dc88414aad75c0135f34ec87c061fd0
+  data.tar.gz: 851153cad21081aa85292ce156fa6e4ae17bbde52f4a4503c8a56c04406faf6c5cbb2dc68f9b8e745565a415f547a35c26a23c49adb7a5db2b44b6922fd361dc

data/lib/sinatra/helpers/wanted/version.rb

@@ -2,7 +2,7 @@ module Sinatra
 module Helpers
 module Wanted
     # Version
-    VERSION = "0.8.2"
+    VERSION = "0.8.4"
 end
 end
 end

data/lib/sinatra/helpers/wanted.rb

@@ -11,6 +11,9 @@ module Sinatra::Helpers::Wanted
                    end
                }.freeze
 
+    # List of exception that should be deal as Not Found
+    NotFoundList = []
+
     # Generic exception.
     # Only the inherited exceptions are raised.
     class WantedError < StandardError
@@ -110,8 +113,11 @@ module Sinatra::Helpers::Wanted
                       end
         value, id   = if param.kind_of?(Symbol)
                           if params.include?(param)
-                          then [ params.fetch(param) { NO_VALUE }, param ]
-                          else [ nil,                              param ]
+                          then
+                              v = params[param]
+                              [ v.nil? ? NO_VALUE : v, param ]
+                          else
+                              [ nil, param ]
                           end
                       else
                           [ param, nil ]
@@ -141,14 +147,23 @@ module Sinatra::Helpers::Wanted
                 value = Dry::Types::Undefined
             end
         end
-        
+
         # Build value from various check/conversion
         if type_method
             value = type.public_send(type_method, value) 
         end
         if !value.nil? && get_method
             val    = value
-            value  = getter.public_send(get_method, value)
+            value  = if NotFoundList.empty?
+                         getter.public_send(get_method, value)
+                     else
+                         begin
+                             getter.public_send(get_method, value)
+                         rescue *NotFoundList
+                             nil
+                         end
+                     end
+
             # Check if we consider it as not found
             if value.nil?
                 case not_found

data/sinatra-wanted.gemspec

@@ -9,13 +9,9 @@ Gem::Specification.new do |s|
     s.description =  <<~EOF
       Ease processing of parameters in Sinatra framework.
       Integrates well with dry-types, sequel, ...
-
-      Example:
-        want! :user,    Dry::Types::String, User
-        want? :expired, Dry::Types::Params::Bool.default(true)
       EOF
 
-    s.homepage    = 'https://gitlab.com/sdalu/sinatra-wanted'
+    s.homepage    = 'https://github.com/sdalu/sinatra-wanted'
     s.license     = 'MIT'
 
     s.authors     = [ "Stéphane D'Alu" ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-wanted
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors:
 - Stéphane D'Alu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -55,10 +55,6 @@ dependencies:
 description: |
   Ease processing of parameters in Sinatra framework.
   Integrates well with dry-types, sequel, ...
-
-  Example:
-    want! :user,    Dry::Types::String, User
-    want? :expired, Dry::Types::Params::Bool.default(true)
 email:
 - stephane.dalu@insa-lyon.fr
 executables: []
@@ -69,7 +65,7 @@ files:
 - lib/sinatra/helpers/wanted.rb
 - lib/sinatra/helpers/wanted/version.rb
 - sinatra-wanted.gemspec
-homepage: https://gitlab.com/sdalu/sinatra-wanted
+homepage: https://github.com/sdalu/sinatra-wanted
 licenses:
 - MIT
 metadata: {}