sinatra-param-validator 0.7.0 → 0.10.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +12 -0
- data/Gemfile.lock +2 -2
- data/README.md +0 -9
- data/lib/sinatra/param_validator/parser.rb +5 -5
- data/lib/sinatra/param_validator/validator/form.rb +27 -0
- data/lib/sinatra/param_validator/validator.rb +1 -1
- data/lib/sinatra/param_validator/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 902453e928aa07fd3a259794b029cc20213aa73555f7cc7348bfb202239d7c29
|
4
|
+
data.tar.gz: 8e890aeaedfa9ad25dfb0a8b85181c70f817ec4371554d09a05dbfe409b23571
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b61d1563c52d501972584a02a2a0c74373675108fab55ad6272958fe5b28938e59c20e3b3f3f06c734a9adc94e140e89bc41a7756a6e68281c567dd09b9e82f3
|
7
|
+
data.tar.gz: 2d0c36672894b4616092e63cd0771292f4c41f024c63bb01a5c6006e0a80a4824c6d0d8df2f2afa34c9854d89c0f871b85c13abac387c6219f85406775948261
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,17 @@
|
|
1
1
|
## [Unreleased]
|
2
2
|
|
3
|
+
## [0.10.0] - 2022-07-12
|
4
|
+
|
5
|
+
- Remove the `block` option from validators
|
6
|
+
|
7
|
+
## [0.9.0] - 2022-07-09
|
8
|
+
|
9
|
+
- Change parser to parse the definition outside of the initialize block
|
10
|
+
|
11
|
+
## [0.8.0] - 2022-07-09
|
12
|
+
|
13
|
+
- Add form helpers for form validator
|
14
|
+
|
3
15
|
## [0.7.0] - 2022-06-09
|
4
16
|
|
5
17
|
- Add `default` option for parameters
|
data/Gemfile.lock
CHANGED
data/README.md
CHANGED
@@ -126,15 +126,6 @@ param :number, Integer, required: true do |validator|
|
|
126
126
|
end
|
127
127
|
```
|
128
128
|
|
129
|
-
If you need to run some code in the route context, you can just use the `block` keyword:
|
130
|
-
|
131
|
-
```ruby
|
132
|
-
block do |validator|
|
133
|
-
#...
|
134
|
-
validator.param :val, Integer
|
135
|
-
end
|
136
|
-
```
|
137
|
-
|
138
129
|
## Rules
|
139
130
|
|
140
131
|
Rules work on multiple parameters:
|
@@ -12,22 +12,22 @@ module Sinatra
|
|
12
12
|
class Parser < SimpleDelegator
|
13
13
|
attr_reader :errors
|
14
14
|
|
15
|
-
def initialize(
|
15
|
+
def initialize(context)
|
16
16
|
super(context)
|
17
17
|
@context = context
|
18
18
|
@errors = {}
|
19
|
+
end
|
19
20
|
|
21
|
+
def parse(definition, *args)
|
20
22
|
instance_exec(*args, &definition)
|
23
|
+
|
24
|
+
self
|
21
25
|
end
|
22
26
|
|
23
27
|
def add_error(key, error)
|
24
28
|
@errors[key] = @errors.fetch(key, []).concat(Array(error))
|
25
29
|
end
|
26
30
|
|
27
|
-
def block(&block)
|
28
|
-
run_block :block, block
|
29
|
-
end
|
30
|
-
|
31
31
|
def param(key, type, default: nil, message: nil, **args, &block)
|
32
32
|
parameter = Parameter.new(@context.params[key], type, **args)
|
33
33
|
update_params_hash key, parameter, default
|
@@ -5,6 +5,33 @@ module Sinatra
|
|
5
5
|
class Validator
|
6
6
|
# A form validator
|
7
7
|
class Form < Validator
|
8
|
+
# Helpers for Sinatra templates
|
9
|
+
module Helpers
|
10
|
+
def form_values(hash)
|
11
|
+
hash = IndifferentHash[hash]
|
12
|
+
flash.now[:params] = flash.now.key?(:params) ? hash.merge(flash.now[:params]) : hash
|
13
|
+
end
|
14
|
+
|
15
|
+
def form_value(field)
|
16
|
+
flash[:params]&.fetch(field, nil)
|
17
|
+
end
|
18
|
+
|
19
|
+
def form_error?(field = nil)
|
20
|
+
return !flash[:form_errors].nil? && !flash[:form_errors]&.empty? if field.nil?
|
21
|
+
|
22
|
+
(flash[:form_errors] || {}).key?(field)
|
23
|
+
end
|
24
|
+
|
25
|
+
def form_errors(field)
|
26
|
+
(flash[:form_errors] || {}).fetch(field, [])
|
27
|
+
end
|
28
|
+
|
29
|
+
def invalid_feedback(field, default = nil)
|
30
|
+
fields = Array(field)
|
31
|
+
fields.any? { |f| form_error? f } ? fields.map { |f| form_errors f }.flatten.join('<br />') : default
|
32
|
+
end
|
33
|
+
end
|
34
|
+
|
8
35
|
def handle_failure(context)
|
9
36
|
case context.request.preferred_type.to_s
|
10
37
|
when 'application/json' then return json_failure(context)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sinatra-param-validator
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.10.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rick Selby
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-07-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rack-test
|