sinatra-param-validator 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f94e83b8a50e45743393eff54f46c692095fbad50942f68e047713b55397512
-  data.tar.gz: 1394c62c964ad2e4bc51dbd44abf98313757babbbe13748c09f32dc2a2e8863d
+  metadata.gz: 0635a378cefa1851f127f94720dbcdb8a6abe12093af7fcdafcccb5066c3a10d
+  data.tar.gz: 2a8fe28e566133d4e72aa0188824f184a02984475dc1f79796d3d7a98e914957
 SHA512:
-  metadata.gz: '09cd666c97ce8ffd0750361ca52cfa04b2687351bd4db39918ba6d393ce476917943a16311817cddd50507939978687a4820d8aeb2fbda130dfd64d01a12ac72'
-  data.tar.gz: 2589470cf72e955854bc68ade46b6ccb1ddf2a5e9d1a7ad142e3fcfa5a2f714aa547b850090ee26caec29d33bf3d8c5b476809cb6ef392e3dad20222588bd6b9
+  metadata.gz: 4ff032b54cf35d989b81613ee6b965a40a8b18699d183fdeef32c08a5b0d8a520415ec43a270c6b84d288446bae8813fd17a8eb9f1d5c77fcee3ad8b8eb5bb63
+  data.tar.gz: adc4c502ff12a8730598c28c13871ecd52e4c8749bbe4c5ea7b9256727cd3997b9b31152e4d22c3e908ae39eca8c40b236a65ebf8c7e5ff1dfa41fd75b632b7d

data/CHANGELOG.md

@@ -1,12 +1,17 @@
 ## [Unreleased]
 
-## [0.14.0] - 2022-07-15
+## [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.15.0)
 
 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

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.15.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param-validator
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 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