sinatra-param-validator 0.15.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0635a378cefa1851f127f94720dbcdb8a6abe12093af7fcdafcccb5066c3a10d
-  data.tar.gz: 2a8fe28e566133d4e72aa0188824f184a02984475dc1f79796d3d7a98e914957
+  metadata.gz: cc96ce9554cce1728ccfe8611b8a32683f59ecab0cb0c30f2048a4f36546cb85
+  data.tar.gz: 5a9a45fee8f03500085750f0af21c30e0d36c1d66dcd7c0799049435aae9cba4
 SHA512:
-  metadata.gz: 4ff032b54cf35d989b81613ee6b965a40a8b18699d183fdeef32c08a5b0d8a520415ec43a270c6b84d288446bae8813fd17a8eb9f1d5c77fcee3ad8b8eb5bb63
-  data.tar.gz: adc4c502ff12a8730598c28c13871ecd52e4c8749bbe4c5ea7b9256727cd3997b9b31152e4d22c3e908ae39eca8c40b236a65ebf8c7e5ff1dfa41fd75b632b7d
+  metadata.gz: 87356c1bd08e3969b8e5d35709af6a18b4be740a38eedf9db3744741823fe4c00a7a494aaaece03cfe5495cd7acc149585f7eaa4036b4a36e91117063bf96fa8
+  data.tar.gz: d71e87ff1462b200e8a36a5f0d0fdd7321fa4b28356951baeba2704afa0246989c6bd95d517cb913b0bb66e2355cb332a5776c04108f7bbc1feb36d8e776047c

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [0.17.0] - 2022-07-19
+
+- `param` should return the coerced value
+- Add `transform` to alter a validated parameter
+
+## [0.16.1] - 2022-07-19
+
+- Fix URIs in gemspec
+
+## [0.16.0] - 2022-07-19
+
+- Set default value for nil parameters
+
 ## [0.15.0] - 2022-07-19
 
 - Pass message to raised exception

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-param-validator (0.15.0)
+    sinatra-param-validator (0.17.0)
 
 GEM
   remote: https://rubygems.org/
@@ -85,4 +85,4 @@ DEPENDENCIES
   sinatra-param-validator!
 
 BUNDLED WITH
-   2.3.17
+   2.3.16

data/README.md

@@ -76,6 +76,9 @@ All parameters have the following validations available:
   * If this is set, all other validations are skipped if the value is nil
 * `required`
   * The parameter must be present and cannot be nil
+* `transform`
+  * Run a method against the validated parameter, allowing it to be changed
+  * Anything that responds to `to_proc` will work; procs, lambdas, symbols...
 * `in`
   * The value is in the given array / range
 * `is`
@@ -89,6 +92,41 @@ All parameters have the following validations available:
 
 * `min` / `max`
 
+### Running as a helper
+
+`param` is available as a helper in routes, and will raise `Sinatra::ParamValidator::InvalidParameterError` if validation fails.
+It will return the parsed parameter, after coercion, defaults and transformations have been applied.
+
+```ruby
+get '/page' do
+  param :a, String
+end
+```
+
+## Rules
+
+Rules work on multiple parameters:
+
+```ruby
+rule :all_or_none_of, :a, :b
+```
+
+* `all_or_none_of`
+* `any_of`
+  * At least one of the given fields must be present
+* `one_of`
+  * Only one of the given fields can be present
+
+### Running as a helper
+
+`rule` is available as a helper in routes, and will raise `Sinatra::ParamValidator::InvalidParameterError` if validation fails.
+
+```ruby
+get '/page' do
+  rule :any_of, :a, :b
+end
+```
+
 ## Custom Messages
 
 It is possible to return a custom error message when a validation fails:
@@ -113,6 +151,10 @@ It is possible to run code after a validation succeeds, by passing a block to `p
 param :number, Integer, required: true do
   # ...
 end
+
+rule :any_of, :a, :b do
+  # ...
+end
 ```
 
 If you wish to indicate a validation failure within a block, raise `Sinatra::ParameterValidator::InvalidParameterError`
@@ -126,20 +168,6 @@ param :number, Integer, required: true do |validator|
 end
 ```
 
-## Rules
-
-Rules work on multiple parameters:
-
-```ruby
-rule :all_or_none_of, :a, :b
-```
-
-* `all_or_none_of`
-* `any_of`
-  * At least one of the given fields must be present
-* `one_of`
-  * Only one of the given fields can be present
-
 ## Validator Types
 
 The default validator will raise `Sinatra::ParamValidator::ValidationFailedError` when validation fails.
@@ -149,7 +177,7 @@ There are two other provided validators, that handle failure differently:
 * `url_param`
   * will `halt 403`
 * `form`
-  * if [sinatra-flash](https://github.com/SFEley/sinatra-flash) is available, it will flash the errors and `redirect back`
+  * if [sinatra-flash](https://rubygems.org/gems/sinatra-flash) is available, it will flash the errors and `redirect back`
   * will provide a JSON object with errors to an XHR request
   * will `halt 400`
 
@@ -165,6 +193,55 @@ get '/user/:id', validate_url_param: :user_id do
 end
 ```
 
+### Form Helpers
+
+There are some general helpers for handling values after validation.
+These require the [sinatra-flash](https://rubygems.org/gems/sinatra-flash) gem.
+
+* `form_values(hash)`
+  * Set the values that will be returned by `form_value`.
+  * These will be overridden by any values flashed to the session in the `:params` hash
+* `form_value(field)`
+  * Get the form value for the given field
+* `form_error?(field = nil)`
+  * With a field: returns if that field had any validation errors
+  * Without a field: returns if any field had validation errors
+* `form_errors(field)`
+  * Get the list of validation errors for the given field
+* `invalid_feedback(field, default = nil)`
+  * Get the invalid feedback (error message) for the given field, defaulting to the default parameter.
+
+#### Usage
+
+For a form to edit something, you can define the values that the form should use:
+
+```ruby
+get '/edit/:thing' do
+  thing = #...
+  form_values thing
+end
+```
+
+This is an example form input with bootstrap styling:
+
+```html
+<form method="post" <%== 'class="was-validated"' if form_error? %>>
+  <div class="mb-3">
+    <label class="form-label" for="name">Name</label>
+    <input type="text" name="name" id="name" 
+           class="form-control <%= 'is-invalid' if form_error? :name %>"
+           value="<%= form_value :name %>">
+    <div class="invalid-feedback">
+      <%== invalid_feedback :name, 'Please provide a name.' %>
+    </div>
+  </div>
+</form>
+```
+
+When the form is submitted, validation may fail, and the page will redirect back to the edit form.
+The redirect will flash the submitted parameters.
+`form_value` will now prefer the flashed parameters over the original values for `thing`.
+
 ## Validators with parameters
 
 It is possible to define a validator with a parameter.

data/lib/sinatra/param_validator/helpers.rb

@@ -13,14 +13,15 @@ module Sinatra
         raise "Filter params failed: #{e}"
       end
 
-      def param(key, type, default: nil, message: nil, **args, &block)
+      def param(key, type, default: nil, message: nil, transform: nil, **args, &block) # rubocop:disable Metrics/ParameterLists
         parameter = Parameter.new(params[key], type, **args)
-        _update_params_hash key, parameter, default
         if parameter.valid?
+          _update_params_hash key, parameter, default, transform
           _run_block(key, block) if block
         else
           _handle_error key, message || parameter.errors
         end
+        params[key]
       rescue NameError
         raise 'Invalid parameter type'
       end
@@ -57,13 +58,23 @@ module Sinatra
         _handle_error key, e.message
       end
 
-      def _update_params_hash(key, parameter, default)
-        if params.key?(key)
-          params[key] = parameter.coerced unless parameter.coerced.nil?
-        elsif !default.nil?
-          params[key] = default.respond_to?(:call) ? default.call : default
+      def _update_params_hash(key, parameter, default, transform)
+        if !params.key?(key) || params[key].nil?
+          _set_param_to_default key, default unless default.nil?
+        else
+          _set_param_to_coerced key, parameter, transform
         end
       end
+
+      def _set_param_to_coerced(key, parameter, transform)
+        return if parameter.coerced.nil?
+
+        params[key] = transform.nil? ? parameter.coerced : transform.to_proc.call(parameter.coerced)
+      end
+
+      def _set_param_to_default(key, default)
+        params[key] = default.respond_to?(:call) ? default.call : default
+      end
     end
   end
 end

data/lib/sinatra/param_validator/version.rb

@@ -2,6 +2,6 @@
 
 module Sinatra
   module ParamValidator
-    VERSION = '0.15.0'
+    VERSION = '0.17.0'
   end
 end

data/sinatra-param-validator.gemspec

@@ -9,13 +9,13 @@ Gem::Specification.new do |spec|
   spec.email = ['rick@selby-family.co.uk']
 
   spec.summary = 'Validation of parameters for Sinatra'
-  spec.homepage = 'https://github.com/rickselby/sinatra-param_validator-validator'
+  spec.homepage = 'https://github.com/rickselby/sinatra-param-validator'
   spec.license = 'MIT'
   spec.required_ruby_version = '>= 2.6.0'
 
-  spec.metadata['changelog_uri'] = 'https://github.com/rickselby/sinatra-param_validator-validator/CHANGELOG.md'
+  spec.metadata['changelog_uri'] = 'https://github.com/rickselby/sinatra-para-validator/CHANGELOG.md'
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/rickselby/sinatra-param_validator-validator'
+  spec.metadata['source_code_uri'] = 'https://github.com/rickselby/sinatra-param-validator'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
   # Specify which files should be added to the gem when it is released.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param-validator
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Rick Selby
@@ -166,13 +166,13 @@ files:
 - lib/sinatra/param_validator/validator/url_param.rb
 - lib/sinatra/param_validator/version.rb
 - sinatra-param-validator.gemspec
-homepage: https://github.com/rickselby/sinatra-param_validator-validator
+homepage: https://github.com/rickselby/sinatra-param-validator
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://github.com/rickselby/sinatra-param_validator-validator/CHANGELOG.md
-  homepage_uri: https://github.com/rickselby/sinatra-param_validator-validator
-  source_code_uri: https://github.com/rickselby/sinatra-param_validator-validator
+  changelog_uri: https://github.com/rickselby/sinatra-para-validator/CHANGELOG.md
+  homepage_uri: https://github.com/rickselby/sinatra-param-validator
+  source_code_uri: https://github.com/rickselby/sinatra-param-validator
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []