sinatra-param-validator 0.16.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78acd25fda0c630a67c5ce3e2b24a9300c70432b40621a1ebd2822e4d63a549b
-  data.tar.gz: 6ad51ab220feb9b3ec422532d1ae46bc2b812ec9969eec4e3b7a5b6b0387f4a6
+  metadata.gz: d4f1bc5e4d1f488a104acd1293e9473c1d942d43ff64da9d33572400fb0b2374
+  data.tar.gz: 320661e0e68e371beecd41c98e4405f654468b75936fd0cca5228c18e3d72d6d
 SHA512:
-  metadata.gz: 224a086b11dc650444326980951756850ae049e4f09b17dac6ae73881327ae694ca2c38f3855887300ebeeed6a9fc36d61651d61884cbe237f057d964858e6e2
-  data.tar.gz: 1b80d184a2e078f22a265cfcc3d38aa083f4cb6ad0e0850d193b5c39ef2bbe190ea87c7edbd628c9b3121472b7704367d58e9e9a8c4b357338daf14c0e70d8cf
+  metadata.gz: e2b98fcb24054495d43650468c82f95bfa296f59e2f8a72e71ebbef48a6c7c7aa1d82b5973173495c4c9118704df354d4a3844ad53c452b6b6758f609504ba8c
+  data.tar.gz: ac02e5fa56440c297fc9fb41cd1bcb186bf0b472f2bbc7eab49a7f62d803dcdebb44dffad4dd43549f72d4e931536564b9054a84e41c30981e3bccc86ba04991

data/.rubocop.yml

@@ -1,23 +1,8 @@
 ---
-require:
-  - rubocop-performance
-  - rubocop-rake
-  - rubocop-rspec
+inherit_gem:
+  rubocop-rickselby:
+    - config/default.yml
+    - config/rspec.yml
 
 AllCops:
-  DisplayStyleGuide: true
-  NewCops: enable
-  TargetRubyVersion: 2.6
-
-# Disable block-length check for rspec and gemspec
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*.rb'
-    - '*.gemspec'
-
-# Extend permitted line length
-Layout/LineLength:
-  Max: 120
-
-RSpec/NestedGroups:
-  Max: 4
+  TargetRubyVersion: 3.2

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.4.3

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.18.0] - 2025-04-26
+
+- Drop support for rubies < 3.2
+
+## [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

data/Gemfile

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in sinatra-param_validator-validator.gemspec
 gemspec
+
+gem "rack-test", "~> 2.2"
+gem "rake", "~> 13.2"
+gem "rspec", "~> 3.13"
+gem "rubocop-rickselby", "~> 0.56"
+gem "sinatra-contrib", "~> 4.1"

data/Gemfile.lock

@@ -1,88 +1,203 @@
 PATH
   remote: .
   specs:
-    sinatra-param-validator (0.16.1)
+    sinatra-param-validator (0.18.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    diff-lcs (1.5.0)
+    actionview (8.0.2)
+      activesupport (= 8.0.2)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.3)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    better_html (2.1.1)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      parser (>= 2.4)
+      smart_properties
+    bigdecimal (3.1.9)
+    builder (3.3.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.2)
+    crass (1.0.6)
+    diff-lcs (1.6.0)
+    drb (2.2.1)
+    erb_lint (0.9.0)
+      activesupport
+      better_html (>= 2.0.1)
+      parser (>= 2.7.1.4)
+      rainbow
+      rubocop (>= 1)
+      smart_properties
+    erubi (1.13.1)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    json (2.11.3)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    loofah (2.24.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    minitest (5.25.5)
     multi_json (1.15.0)
-    mustermann (1.1.1)
+    mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    nokogiri (1.18.8-x86_64-linux-gnu)
+      racc (~> 1.4)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
-    rack (2.2.3)
-    rack-protection (2.2.0)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+      racc
+    prism (1.4.0)
+    racc (1.8.1)
+    rack (3.1.13)
+    rack-protection (4.1.1)
+      base64 (>= 0.1.0)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.4.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rake (13.2.1)
+    regexp_parser (2.10.0)
+    rexml (3.4.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.29.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    rubocop (1.75.3)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.17.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.13.3)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (2.10.0)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.31.0)
+      activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
+      rack (>= 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails-accessibility (1.0.1)
+      rubocop (>= 1.0.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rickselby (0.56.0)
+      erb_lint (~> 0.9.0)
+      rexml (~> 3.3)
+      rubocop (~> 1.75.0)
+      rubocop-capybara (~> 2.22.0)
+      rubocop-factory_bot (~> 2.27.0)
+      rubocop-performance (~> 1.25.0)
+      rubocop-rails (~> 2.31.0)
+      rubocop-rails-accessibility (~> 1.0.0)
+      rubocop-rake (~> 0.7.0)
+      rubocop-rspec (~> 3.6.0)
+      rubocop-rspec_rails (~> 2.31.0)
+      rubocop-sequel (~> 0.4.0)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
+    rubocop-sequel (0.4.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1, < 2)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    sinatra (2.2.0)
-      mustermann (~> 1.0)
-      rack (~> 2.2)
-      rack-protection (= 2.2.0)
+    securerandom (0.4.1)
+    sinatra (4.1.1)
+      logger (>= 1.6.0)
+      mustermann (~> 3.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.1.1)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sinatra-contrib (2.2.0)
-      multi_json
-      mustermann (~> 1.0)
-      rack-protection (= 2.2.0)
-      sinatra (= 2.2.0)
+    sinatra-contrib (4.1.1)
+      multi_json (>= 0.0.2)
+      mustermann (~> 3.0)
+      rack-protection (= 4.1.1)
+      sinatra (= 4.1.1)
       tilt (~> 2.0)
-    tilt (2.0.10)
-    unicode-display_width (2.1.0)
+    smart_properties (1.17.0)
+    tilt (2.6.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  rack-test (~> 1.1)
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.0)
-  rubocop-performance (~> 1.0)
-  rubocop-rake (~> 0.5)
-  rubocop-rspec (~> 2.0)
-  sinatra-contrib (~> 2.0)
+  rack-test (~> 2.2)
+  rake (~> 13.2)
+  rspec (~> 3.13)
+  rubocop-rickselby (~> 0.56)
+  sinatra-contrib (~> 4.1)
   sinatra-param-validator!
 
 BUNDLED WITH
-   2.3.17
+   2.6.8

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/Rakefile

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-require 'rubocop/rake_task'
+require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 

data/lib/sinatra/param_validator/camelize.rb

@@ -5,7 +5,7 @@ module Sinatra
     # Helpers for validating parameters
     module Camelize
       def camelize(symbol)
-        symbol.to_s.split('_').map(&:capitalize).join
+        symbol.to_s.split("_").map(&:capitalize).join
       end
     end
   end

data/lib/sinatra/param_validator/helpers.rb

@@ -6,34 +6,35 @@ module Sinatra
     module Helpers
       def filter_params
         params.each do |(param, value)|
-          params[param] = nil if value == ''
-          params[param] = [] if value == ['']
+          params[param] = nil if value == ""
+          params[param] = [] if value == [""]
         end
       rescue StandardError => e
         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'
+        raise "Invalid parameter type"
       end
 
-      def rule(name, *args, **kwargs, &block)
-        rule = Rule.new(name, params, *args, **kwargs)
+      def rule(name, *, **, &block)
+        rule = Rule.new(name, params, *, **)
         if rule.passes?
           _run_block(:rules, block) if block
         else
           _handle_error :rules, rule.errors unless rule.passes?
         end
       rescue NameError
-        raise 'Invalid rule type'
+        raise "Invalid rule type"
       end
 
       def validate(klass, identifier)
@@ -51,22 +52,24 @@ module Sinatra
       end
 
       def _run_block(key, block)
-        args = block.arity == 1 ? [self] : []
+        args = (block.arity == 1) ? [self] : []
         instance_exec(*args, &block)
       rescue InvalidParameterError => e
         _handle_error key, e.message
       end
 
-      def _update_params_hash(key, parameter, default)
-        if params.key?(key) && !params[key].nil?
-          _set_param_to_coerced key, parameter
-        elsif !default.nil?
-          _set_param_to_default key, 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)
-        params[key] = parameter.coerced unless parameter.coerced.nil?
+      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)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'common'
+require_relative "common"
 
 module Sinatra
   module ParamValidator
@@ -15,7 +15,7 @@ module Sinatra
         def coerce(value)
           return nil if value.nil?
           return value if value.is_a? ::Array
-          return value.split(',') if value.is_a? ::String
+          return value.split(",") if value.is_a? ::String
 
           raise ArgumentError
         end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'common'
+require_relative "common"
 
 module Sinatra
   module ParamValidator

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

@@ -27,7 +27,7 @@ module Sinatra
         end
 
         def validate_options
-          @options.each { |key, _| raise "Unknown option '#{key}' for #{self.class}" unless respond_to? key }
+          @options.each_key { |key| raise "Unknown option '#{key}' for #{self.class}" unless respond_to? key }
         end
         private :validate_options
 
@@ -64,7 +64,7 @@ module Sinatra
         private :nil_and_ok?
 
         def required(enabled)
-          @errors.push 'Parameter is required' if enabled && @coerced.nil?
+          @errors.push "Parameter is required" if enabled && @coerced.nil?
         end
       end
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'date'
-require_relative 'common'
+require "date"
+require_relative "common"
 
 module Sinatra
   module ParamValidator

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'common'
+require_relative "common"
 
 module Sinatra
   module ParamValidator

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'common'
+require_relative "common"
 
 module Sinatra
   module ParamValidator
@@ -15,7 +15,7 @@ module Sinatra
         def coerce(value)
           return nil if value.nil?
           return value if value.is_a? ::Hash
-          return value.split(',').to_h { |s| s.split(':') } if value.is_a? ::String
+          return value.split(",").to_h { |s| s.split(":") } if value.is_a? ::String
 
           raise ArgumentError
         end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'common'
+require_relative "common"
 
 module Sinatra
   module ParamValidator

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'common'
+require_relative "common"
 
 module Sinatra
   module ParamValidator

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'time'
-require_relative 'common'
+require "time"
+require_relative "common"
 
 module Sinatra
   module ParamValidator

data/lib/sinatra/param_validator/parameter.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'camelize'
-require_relative 'parameter/array'
-require_relative 'parameter/boolean'
-require_relative 'parameter/date'
-require_relative 'parameter/float'
-require_relative 'parameter/hash'
-require_relative 'parameter/integer'
-require_relative 'parameter/string'
-require_relative 'parameter/time'
+require_relative "camelize"
+require_relative "parameter/array"
+require_relative "parameter/boolean"
+require_relative "parameter/date"
+require_relative "parameter/float"
+require_relative "parameter/hash"
+require_relative "parameter/integer"
+require_relative "parameter/string"
+require_relative "parameter/time"
 
 module Sinatra
   module ParamValidator

data/lib/sinatra/param_validator/rule/all_or_none_of.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'common'
+require_relative "common"
 
 module Sinatra
   module ParamValidator
@@ -12,7 +12,7 @@ module Sinatra
         def validate
           return if count.zero? || count == @fields.count
 
-          @errors.push "All or none of [#{@fields.join ', '}] must be provided"
+          @errors.push "All or none of [#{@fields.join ", "}] must be provided"
         end
       end
     end

data/lib/sinatra/param_validator/rule/any_of.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'common'
+require_relative "common"
 
 module Sinatra
   module ParamValidator
@@ -10,7 +10,7 @@ module Sinatra
         include Common
 
         def validate
-          @errors.push "One of [#{@fields.join ', '}] must be provided" if count < 1
+          @errors.push "One of [#{@fields.join ", "}] must be provided" if count < 1
         end
       end
     end

data/lib/sinatra/param_validator/rule/one_of.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'common'
+require_relative "common"
 
 module Sinatra
   module ParamValidator
@@ -10,8 +10,8 @@ module Sinatra
         include Common
 
         def validate
-          @errors.push "Only one of [#{@fields.join ', '}] is allowed" if count > 1
-          @errors.push "One of [#{@fields.join ', '}] must be provided" if count < 1
+          @errors.push "Only one of [#{@fields.join ", "}] is allowed" if count > 1
+          @errors.push "One of [#{@fields.join ", "}] must be provided" if count < 1
         end
       end
     end

data/lib/sinatra/param_validator/rule.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'camelize'
-require_relative 'rule/all_or_none_of'
-require_relative 'rule/any_of'
-require_relative 'rule/one_of'
+require_relative "camelize"
+require_relative "rule/all_or_none_of"
+require_relative "rule/any_of"
+require_relative "rule/one_of"
 
 module Sinatra
   module ParamValidator
@@ -12,10 +12,10 @@ module Sinatra
       class << self
         include Camelize
 
-        def new(name, params, *args, **kwargs)
+        def new(name, params, *, **)
           name = camelize(name) if name.is_a? Symbol
           klass = Object.const_get "Sinatra::ParamValidator::Rule::#{name}"
-          klass.new(params, *args, **kwargs)
+          klass.new(params, *, **)
         end
       end
     end

data/lib/sinatra/param_validator/validator/form.rb

@@ -28,14 +28,14 @@ module Sinatra
 
           def invalid_feedback(field, default = nil)
             fields = Array(field)
-            fields.any? { |f| form_error? f } ? fields.map { |f| form_errors f }.flatten.join('<br />') : default
+            (fields.any? { |f| form_error? f }) ? fields.map { |f| form_errors f }.flatten.join("<br />") : default
           end
         end
 
         def handle_failure(context)
           case context.request.preferred_type.to_s
-          when 'application/json' then return json_failure(context)
-          when 'text/html'
+          when "application/json" then return json_failure(context)
+          when "text/html"
             return flash_failure(context) if defined? Sinatra::Flash
           end
 
@@ -44,13 +44,13 @@ module Sinatra
 
         def run(context)
           @original_params = context.params
-          super(context)
+          super
         end
 
         private
 
         def json_failure(context)
-          context.halt 400, { error: 'Validation failed', fields: @errors }.to_json
+          context.halt 400, { error: "Validation failed", fields: @errors }.to_json
         end
 
         def flash_failure(context)

data/lib/sinatra/param_validator/validator.rb

@@ -15,9 +15,9 @@ module Sinatra
         raise ValidationFailedError, @errors
       end
 
-      def run(context, *args)
+      def run(context, *)
         context.instance_variable_set(:@_validator_errors, {})
-        context.instance_exec(*args, &@definition)
+        context.instance_exec(*, &@definition)
         @errors = context.remove_instance_variable(:@_validator_errors)
       rescue InvalidParameterError => e
         @errors[:general] = [e.message]
@@ -41,6 +41,6 @@ module Sinatra
   end
 end
 
-require_relative 'validation_failed_error'
-require_relative 'validator/form'
-require_relative 'validator/url_param'
+require_relative "validation_failed_error"
+require_relative "validator/form"
+require_relative "validator/url_param"

data/lib/sinatra/param_validator/version.rb

@@ -2,6 +2,6 @@
 
 module Sinatra
   module ParamValidator
-    VERSION = '0.16.1'
+    VERSION = "0.18.0"
   end
 end

data/lib/sinatra/param_validator.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative 'param_validator/camelize'
-require_relative 'param_validator/definitions'
-require_relative 'param_validator/helpers'
-require_relative 'param_validator/identifier'
-require_relative 'param_validator/invalid_parameter_error'
-require_relative 'param_validator/parameter'
-require_relative 'param_validator/rule'
-require_relative 'param_validator/snake_case'
-require_relative 'param_validator/validator'
-require_relative 'param_validator/version'
+require_relative "param_validator/camelize"
+require_relative "param_validator/definitions"
+require_relative "param_validator/helpers"
+require_relative "param_validator/identifier"
+require_relative "param_validator/invalid_parameter_error"
+require_relative "param_validator/parameter"
+require_relative "param_validator/rule"
+require_relative "param_validator/snake_case"
+require_relative "param_validator/validator"
+require_relative "param_validator/version"
 
 module Sinatra
   # Module to register in Sinatra app
@@ -20,8 +20,8 @@ module Sinatra
       settings.validator_definitions.add(identifier, definition)
     end
 
-    def vi(identifier, *args)
-      Identifier.new(identifier, *args)
+    def vi(identifier, *)
+      Identifier.new(identifier, *)
     end
 
     class << self
@@ -34,7 +34,7 @@ module Sinatra
         validator_conditional app, :validate, Sinatra::ParamValidator::Validator
 
         Sinatra::ParamValidator::Validator.validators.each do |validator|
-          validator_conditional app, :"validate_#{snake_case(validator.to_s.split('::').last)}", validator
+          validator_conditional app, :"validate_#{snake_case(validator.to_s.split("::").last)}", validator
         end
       end
 

data/sinatra-param-validator.gemspec

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require_relative 'lib/sinatra/param_validator/version'
+require_relative "lib/sinatra/param_validator/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'sinatra-param-validator'
+  spec.name = "sinatra-param-validator"
   spec.version = Sinatra::ParamValidator::VERSION
-  spec.authors = ['Rick Selby']
-  spec.email = ['rick@selby-family.co.uk']
+  spec.authors = ["Rick Selby"]
+  spec.email = ["rick@selby-family.co.uk"]
 
-  spec.summary = 'Validation of parameters for Sinatra'
-  spec.homepage = 'https://github.com/rickselby/sinatra-param-validator'
-  spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.summary = "Validation of parameters for Sinatra"
+  spec.homepage = "https://github.com/rickselby/sinatra-param-validator"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 3.2"
 
-  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'
-  spec.metadata['rubygems_mfa_required'] = 'true'
+  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"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -25,14 +25,5 @@ Gem::Specification.new do |spec|
       (f == __FILE__) || f.match(%r{\A(?:spec/|\.git|appveyor)})
     end
   end
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'rack-test', '~> 1.1'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 1.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.0'
-  spec.add_development_dependency 'rubocop-rake', '~> 0.5'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.0'
-  spec.add_development_dependency 'sinatra-contrib', '~> 2.0'
+  spec.require_paths = %w[lib]
 end

metadata

@@ -1,128 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param-validator
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Rick Selby
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: sinatra-contrib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-description: 
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 email:
 - rick@selby-family.co.uk
 executables: []
@@ -174,7 +60,6 @@ metadata:
   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: []
 require_paths:
 - lib
@@ -182,15 +67,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Validation of parameters for Sinatra
 test_files: []