sinatra-param-validator 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f474d7b6ff2e2ed3de6f58e3bd0ab0b328cc11886ac36701c5a1557a8713e5be
-  data.tar.gz: 378f0b0bb00df8adca7f951175133833d68ce457066f79423aadb52cab1ba6fb
+  metadata.gz: 1312fa49d8b256875f1c6de21269a7be31ab1c3f2ca0a5efdb9902c31b5406d4
+  data.tar.gz: 4b483ce648a24026e26964b0cdd358a4f1256ffe7dc810770e8dbf2b98204306
 SHA512:
-  metadata.gz: 045a26ac9992b92e1dab3c63527b6ebfd2b70c84b554d20a7f38abfa070f0402da47776d663619c0ae1ff95c681a52ccfb7da34fa2f5c10928c28626c77f75a9
-  data.tar.gz: cefd05d4f4babca139755e05d891802e375732bc944d278a8313e14759e87cd58b300c567e236ccf844897233072ce37e79d9c70f27385babd8b35435008a5c3
+  metadata.gz: 2714270e73581d5beb88eb136516fc1d5275d05ebe2a3c5efca08d54b64bb2bcda467cb45cb4ab3fa7fee063606171356f9fe869cbedc0950afc7b92cb5dc8eb
+  data.tar.gz: 692691bde5e786c23897080967004fc5fb5b695d49942fd671db69ef6ec91c00771a0afbfc5e69954b5e22f8e585829c8e08a04b6a954cf14ec46b1c19dfdf8c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.5.0] - 2022-06-09
+
+- Allow the validator to be passed to the block for a valid parameter
+
 ## [0.4.0] - 2022-06-09
 
 - Allow custom error messages to be used when validation fails

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-param-validator (0.4.0)
+    sinatra-param-validator (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -115,6 +115,15 @@ end
 If you wish to indicate a validation failure within a block, raise `Sinatra::ParameterValidator::InvalidParameterError`
 with a message, and it will be passed through as an error for the parameter.
 
+If you need to do further validation with your parameter, the validator can be passed to the block:
+
+```ruby
+
+param :number, Integer, required: true do |validator|
+  validator.param :digit, Integer, min: params[:number]
+end
+```
+
 ## Rules
 
 Rules work on multiple parameters:
@@ -149,7 +158,6 @@ post '/new-user', validate_form: :new_user do
   # ...
 end
 
-
 get '/user/:id', validate_url_param: :user_id do
   # ...
 end
@@ -170,8 +178,6 @@ post '/number', validate: vi(:new_user, 10) do
 end
 ```
 
-
-
 ## Development
 
 After checking out the repo, run `bundle install` to install dependencies. Then, run `rake spec` to run the tests.

data/lib/sinatra/param_validator/parameter/common.rb

@@ -9,13 +9,17 @@ module Sinatra
 
         def initialize(value, **options)
           @errors = []
-          @coerced = coerce value
           @options = options
 
+          begin
+            @coerced = coerce value
+          rescue ArgumentError
+            @errors.push "'#{value}' is not a valid #{self.class}"
+            return
+          end
+
           validate_options
           validate unless nil_and_ok?
-        rescue ArgumentError
-          @errors.push "'#{value}' is not a valid #{self.class}"
         end
 
         def valid?

data/lib/sinatra/param_validator/parser.rb

@@ -47,7 +47,8 @@ module Sinatra
       end
 
       def run_block(key, block)
-        @context.instance_exec(&block)
+        args = block.arity == 1 ? [self] : []
+        @context.instance_exec(*args, &block)
       rescue InvalidParameterError => e
         add_error key, e.message
       end

data/lib/sinatra/param_validator/version.rb

@@ -2,6 +2,6 @@
 
 module Sinatra
   module ParamValidator
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param-validator
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Rick Selby