sinatra-param-validator 0.14.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f94e83b8a50e45743393eff54f46c692095fbad50942f68e047713b55397512
-  data.tar.gz: 1394c62c964ad2e4bc51dbd44abf98313757babbbe13748c09f32dc2a2e8863d
+  metadata.gz: 78acd25fda0c630a67c5ce3e2b24a9300c70432b40621a1ebd2822e4d63a549b
+  data.tar.gz: 6ad51ab220feb9b3ec422532d1ae46bc2b812ec9969eec4e3b7a5b6b0387f4a6
 SHA512:
-  metadata.gz: '09cd666c97ce8ffd0750361ca52cfa04b2687351bd4db39918ba6d393ce476917943a16311817cddd50507939978687a4820d8aeb2fbda130dfd64d01a12ac72'
-  data.tar.gz: 2589470cf72e955854bc68ade46b6ccb1ddf2a5e9d1a7ad142e3fcfa5a2f714aa547b850090ee26caec29d33bf3d8c5b476809cb6ef392e3dad20222588bd6b9
+  metadata.gz: 224a086b11dc650444326980951756850ae049e4f09b17dac6ae73881327ae694ca2c38f3855887300ebeeed6a9fc36d61651d61884cbe237f057d964858e6e2
+  data.tar.gz: 1b80d184a2e078f22a265cfcc3d38aa083f4cb6ad0e0850d193b5c39ef2bbe190ea87c7edbd628c9b3121472b7704367d58e9e9a8c4b357338daf14c0e70d8cf

data/CHANGELOG.md

@@ -1,12 +1,25 @@
 ## [Unreleased]
 
-## [0.14.0] - 2022-07-15
+## [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
+- Allow rules to run blocks
+
+## [0.14.0] - 2022-07-18
 
 - Fix parameter coercion if a parameter is validated multiple times
 - Refactor `param` and `rule` functions into helpers
 - Allow `param` and `rule` to be run independently
 
-## [0.13.0] - 2022-07-15
+## [0.13.0] - 2022-07-18
 
 - Capture `InvalidParameterError`s raised when running the parser 
 

data/Gemfile.lock

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

data/lib/sinatra/param_validator/helpers.rb

@@ -25,9 +25,13 @@ module Sinatra
         raise 'Invalid parameter type'
       end
 
-      def rule(name, *args, **kwargs)
+      def rule(name, *args, **kwargs, &block)
         rule = Rule.new(name, params, *args, **kwargs)
-        _handle_error :rules, rule.errors unless rule.passes?
+        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'
       end
@@ -41,7 +45,7 @@ module Sinatra
       end
 
       def _handle_error(key, error)
-        raise InvalidParameterError unless defined? @_validator_errors
+        raise InvalidParameterError, error unless defined? @_validator_errors
 
         @_validator_errors[key] = @_validator_errors.fetch(key, []).concat(Array(error))
       end
@@ -54,12 +58,20 @@ module Sinatra
       end
 
       def _update_params_hash(key, parameter, default)
-        if params.key?(key)
-          params[key] = parameter.coerced unless parameter.coerced.nil?
+        if params.key?(key) && !params[key].nil?
+          _set_param_to_coerced key, parameter
         elsif !default.nil?
-          params[key] = default.respond_to?(:call) ? default.call : default
+          _set_param_to_default key, default
         end
       end
+
+      def _set_param_to_coerced(key, parameter)
+        params[key] = parameter.coerced unless parameter.coerced.nil?
+      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/rule/all_or_none_of.rb

@@ -1,29 +1,18 @@
 # frozen_string_literal: true
 
+require_relative 'common'
+
 module Sinatra
   module ParamValidator
     class Rule
       # Rule to enforce all given params, or none of them
       class AllOrNoneOf
-        attr_reader :errors
-
-        def initialize(params, *fields, **_kwargs)
-          @errors = []
-          @params = params
-          @fields = fields
-
-          validate(fields)
-        end
-
-        def passes?
-          @errors.empty?
-        end
+        include Common
 
-        def validate(fields)
-          count = fields.count { |f| @params.key? f }
-          return if count.zero? || count == fields.count
+        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,27 +1,16 @@
 # frozen_string_literal: true
 
+require_relative 'common'
+
 module Sinatra
   module ParamValidator
     class Rule
       # Rule to enforce at least one of the given params exists
       class AnyOf
-        attr_reader :errors
-
-        def initialize(params, *fields, **_kwargs)
-          @errors = []
-          @params = params
-          @fields = fields
-
-          validate(fields)
-        end
-
-        def passes?
-          @errors.empty?
-        end
+        include Common
 
-        def validate(fields)
-          count = fields.count { |f| @params.key? f }
-          @errors.push "One of [#{fields.join ', '}] must be provided" if count < 1
+        def validate
+          @errors.push "One of [#{@fields.join ', '}] must be provided" if count < 1
         end
       end
     end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Sinatra
+  module ParamValidator
+    class Rule
+      # Common validation methods shared between rules
+      module Common
+        attr_reader :errors
+
+        def initialize(params, *fields, **_kwargs)
+          @errors = []
+          @params = params
+          @fields = fields
+
+          validate
+        end
+
+        def count
+          @count ||= (@fields & @params.keys.map(&:to_sym)).count
+        end
+
+        def passes?
+          @errors.empty?
+        end
+      end
+    end
+  end
+end

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

@@ -1,28 +1,17 @@
 # frozen_string_literal: true
 
+require_relative 'common'
+
 module Sinatra
   module ParamValidator
     class Rule
       # Rule to enforce only one of the given params has been given
       class OneOf
-        attr_reader :errors
-
-        def initialize(params, *fields, **_kwargs)
-          @errors = []
-          @params = params
-          @fields = fields
-
-          validate(fields)
-        end
-
-        def passes?
-          @errors.empty?
-        end
+        include Common
 
-        def validate(fields)
-          count = fields.count { |f| @params.key? f }
-          @errors.push "Only one of [#{fields.join ', '}] is allowed" if count > 1
-          @errors.push "One of [#{fields.join ', '}] must be provided" if count < 1
+        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
         end
       end
     end

data/lib/sinatra/param_validator/version.rb

@@ -2,6 +2,6 @@
 
 module Sinatra
   module ParamValidator
-    VERSION = '0.14.0'
+    VERSION = '0.16.1'
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param-validator
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Rick Selby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
@@ -157,6 +157,7 @@ files:
 - lib/sinatra/param_validator/rule.rb
 - lib/sinatra/param_validator/rule/all_or_none_of.rb
 - lib/sinatra/param_validator/rule/any_of.rb
+- lib/sinatra/param_validator/rule/common.rb
 - lib/sinatra/param_validator/rule/one_of.rb
 - lib/sinatra/param_validator/snake_case.rb
 - lib/sinatra/param_validator/validation_failed_error.rb
@@ -165,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: []