sinatra-wanted 0.8 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bb6e4a003636fbb934a4b36e249ac757ba1cd450e4d632ea2016b61095d3752
-  data.tar.gz: 6493f6270ae54b97c3df03df9b02146b3a40f43c9e8ca667cdd242033da8232a
+  metadata.gz: 36dd224a2e9a878f60e34b32192e512a5359fe0e8dce37654b43fc8693932004
+  data.tar.gz: '08e02cfe3f691cf1bac73947c6cc007c18b604ea0658595320d783b86021b805'
 SHA512:
-  metadata.gz: f9d6e85a50bd7ac41da1160142ddb6932a00527dea08f57204683506a586792e30ac246c08f64e399e6201678a9e035202c7abaff6a1e1153253923bef6403fb
-  data.tar.gz: 5453e53c9250895bdf081bca06864a06c2fc06771a28a0a05fcf7457ab8eaaeedad933450d5586790246108050684ad6281febe9b498094bda3162c470a4de27
+  metadata.gz: 419d1b4c42c2c7c3ac3f4e35a797c25eee14c2c67a7488f8c5e9f80891e5ab425a2e106a893a84368cbe15358d98a5b7a7d09d998008ea1e509f597003577596
+  data.tar.gz: c4678ed4ada73ee0fbd4735db716e879f69be8a44f6009925bff132bb0d66d7af91a002c42a31db152097a93cedcbf04b13ea324ea4f83bbcbfbeae0214e31bf

data/lib/sinatra/helpers/wanted.rb

@@ -19,18 +19,29 @@ module Sinatra::Helpers::Wanted
             @value = value
             @id    = id
         end
+        attr_reader :id
+        attr_reader :value
     end
 
     # Exception to notify of syntax error
     class WantedSyntaxError < WantedError
+        def initialize(msg=nil, id: nil, value: nil)
+            super(msg || "syntax error", id: id, value: value)
+        end
     end
 
     # Exception to notify of missing parameter
     class WantedMissing < WantedError
+        def initialize(msg=nil, id: nil)
+            super(msg || "missing parameter", id: id)
+        end
     end
 
     # Exception to notify of object not found
     class WantedNotFound < WantedError
+        def initialize(msg=nil, id: nil, value: nil)
+            super(msg || "object not found", id: id, value: value)
+        end
     end
 
     
@@ -59,18 +70,16 @@ module Sinatra::Helpers::Wanted
     def want(param, type=nil, getter=nil, id: nil,
              default: nil, no_value: NO_VALUE,
              missing: :ignore, not_found: :ignore, &block)
-        error_handler do
             _want(param, type, getter, id: id,
                   default: default, no_value: no_value,
                   missing: missing, not_found: not_found, &block)
-        end
     end
     
     # (see #want)
     def want!(param, type=nil, getter=nil, id: nil,
               default: nil, no_value: NO_VALUE,
               missing: :raise, not_found: :raise, &block)
-        want(param, type, getter, id: id,
+        _want(param, type, getter, id: id,
              default: default, no_value: no_value,
              missing: missing, not_found: not_found, &block)
     end
@@ -79,7 +88,7 @@ module Sinatra::Helpers::Wanted
     def want?(param, type=nil, getter=nil, id: nil,
               default: nil, no_value: NO_VALUE,
               missing: :return, not_found: :ignore, &block)
-        want(param, type, getter,
+        _want(param, type, getter,
              default: default, id: id, no_value: no_value,
              missing: missing, not_found: not_found, &block)
     end
@@ -138,11 +147,12 @@ module Sinatra::Helpers::Wanted
             value = type.public_send(type_method, value) 
         end
         if !value.nil? && get_method
-            value = getter.public_send(get_method, value)
+            val    = value
+            value  = getter.public_send(get_method, value)
             # Check if we consider it as not found
             if value.nil?
                 case not_found
-                when :raise     then raise WantedNotFound, id: id
+                when :raise     then raise WantedNotFound, id: id, value: val
                 when :not_found then self.not_found
                 when :pass      then self.pass
                 when :ignore
@@ -156,20 +166,16 @@ module Sinatra::Helpers::Wanted
 
         # Return value
         value
-    rescue Dry::Types::CoercionError, Dry::Types::ConstraintError
-        raise WantedSyntaxError, value: value, id: id
-    end
 
-    def error_handler
+    rescue StandardError => e
         if defined?(Dry::Types)
-            begin
-                yield
-            rescue Dry::Types::CoercionError, Dry::Types::ConstraintError
+            case e
+            when Dry::Types::CoercionError, Dry::Types::ConstraintError
                 raise WantedSyntaxError, value: value, id: id
             end
-        else
-            yield
         end
+
+        raise
     end
    
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-wanted
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: 0.8.1
 platform: ruby
 authors:
 - Stéphane D'Alu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra