sinatra-param-validator 0.10.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 902453e928aa07fd3a259794b029cc20213aa73555f7cc7348bfb202239d7c29
-  data.tar.gz: 8e890aeaedfa9ad25dfb0a8b85181c70f817ec4371554d09a05dbfe409b23571
+  metadata.gz: 5cad00b1174bc3a3c95d063287d27226a96e06994238b4a350b1395316a708b1
+  data.tar.gz: 5133cf2b22163b3c3aff130f5151f3c249adae54c7c45f60bd02d6299bf6d50d
 SHA512:
-  metadata.gz: b61d1563c52d501972584a02a2a0c74373675108fab55ad6272958fe5b28938e59c20e3b3f3f06c734a9adc94e140e89bc41a7756a6e68281c567dd09b9e82f3
-  data.tar.gz: 2d0c36672894b4616092e63cd0771292f4c41f024c63bb01a5c6006e0a80a4824c6d0d8df2f2afa34c9854d89c0f871b85c13abac387c6219f85406775948261
+  metadata.gz: 95c479b20400a9652a011ded28cd2d4d1c470e5acc531c44e1d9f9c2c643e55d0c5f9c09346c800615ab8fe9d46dbe69111077370a41fa154159a699dadc2f72
+  data.tar.gz: 676ad92c188cbe7d24ba9bbb596e28d79857242df12e572f5376a4b3a2f5c719b41107ab0640b38f6d27bfdf9ebaf4e2a5cea0c292d0a84e2ed0bdd244ac5759

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [0.13.0] - 2022-07-15
+
+- Capture `InvalidParameterError`s raised when running the parser 
+
+## [0.12.0] - 2022-07-15
+
+- Switch from a delegator to extending the context
+
+## [0.11.0] - 2022-07-15
+
+- Fix setting param values to false
+
 ## [0.10.0] - 2022-07-12
 
 - Remove the `block` option from validators

data/Gemfile.lock

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

data/lib/sinatra/param_validator/parser.rb

@@ -8,64 +8,66 @@ require_relative 'rule'
 
 module Sinatra
   module ParamValidator
-    # Run the definition in the given scope
-    class Parser < SimpleDelegator
-      attr_reader :errors
-
-      def initialize(context)
-        super(context)
-        @context = context
-        @errors = {}
-      end
-
-      def parse(definition, *args)
-        instance_exec(*args, &definition)
-
-        self
-      end
-
-      def add_error(key, error)
-        @errors[key] = @errors.fetch(key, []).concat(Array(error))
+    # Methods to add to the context for handling parameters
+    module ValidatorMethods
+      def _add_error(key, error)
+        @__validator_errors[key] = @__validator_errors.fetch(key, []).concat(Array(error))
       end
 
       def param(key, type, default: nil, message: nil, **args, &block)
-        parameter = Parameter.new(@context.params[key], type, **args)
-        update_params_hash key, parameter, default
+        parameter = Parameter.new(params[key], type, **args)
+        _update_params_hash key, parameter, default
         if parameter.valid?
-          run_block(key, block) if block
+          _run_block(key, block) if block
         else
-          add_error key, message || parameter.errors
+          _add_error key, message || parameter.errors
         end
       rescue NameError
         raise 'Invalid parameter type'
       end
 
       def rule(name, *args, **kwargs)
-        rule = Rule.new(name, @context.params, *args, **kwargs)
+        rule = Rule.new(name, params, *args, **kwargs)
         unless rule.passes?
-          @errors[:rules] ||= []
-          @errors[:rules].push(rule.errors)
+          @__validator_errors[:rules] ||= []
+          @__validator_errors[:rules].push(rule.errors)
         end
       rescue NameError
         raise 'Invalid rule type'
       end
 
-      private
-
-      def run_block(key, block)
+      def _run_block(key, block)
         args = block.arity == 1 ? [self] : []
-        @context.instance_exec(*args, &block)
+        instance_exec(*args, &block)
       rescue InvalidParameterError => e
-        add_error key, e.message
+        _add_error key, e.message
       end
 
-      def update_params_hash(key, parameter, default)
-        if @context.params.key?(key)
-          @context.params[key] = parameter.coerced if parameter.coerced
+      def _update_params_hash(key, parameter, default)
+        if params.key?(key)
+          params[key] = parameter.coerced unless parameter.coerced.nil?
         elsif !default.nil?
-          @context.params[key] = default.respond_to?(:call) ? default.call : default
+          params[key] = default.respond_to?(:call) ? default.call : default
         end
       end
     end
+
+    # Run the definition in the given scope
+    class Parser
+      attr_reader :errors
+
+      def initialize(context)
+        @context = context
+      end
+
+      def parse(definition, *args)
+        @context.extend(ValidatorMethods)
+        @context.instance_variable_set(:@__validator_errors, {})
+        @context.instance_exec(*args, &definition)
+        @errors = @context.instance_variable_get(:@__validator_errors)
+
+        self
+      end
+    end
   end
 end

data/lib/sinatra/param_validator/validator.rb

@@ -17,6 +17,8 @@ module Sinatra
 
       def run(context, *args)
         @errors = Parser.new(context).parse(@definition, *args).errors
+      rescue InvalidParameterError => e
+        @errors[:general] = [e.message]
       end
 
       def success?

data/lib/sinatra/param_validator/version.rb

@@ -2,6 +2,6 @@
 
 module Sinatra
   module ParamValidator
-    VERSION = '0.10.0'
+    VERSION = '0.13.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param-validator
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Rick Selby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test