sinatra-param-validator 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b9804f13269515b113bb73dfe65c20304145df75e20d00f41ed0c231d6fd99e
-  data.tar.gz: c0c522b2ad74c5c376a302ca4b9d141f981df498e42239fc1baa45baaab77e70
+  metadata.gz: b892596c037b0e00101f33a36c3fef30985e3514e3f0b74d706e55c27e03f921
+  data.tar.gz: 8c6d082dc416b889ca799fb49de1fef7f11af81656c5be29d30f8c191529a4c1
 SHA512:
-  metadata.gz: 321cd999434f06ed80943b059aabe476745981d84f0446a247691fea1e836cbdbb011ce8adabe3278f43c5ecfc248f59b603f39aa187e332188531d1030130f0
-  data.tar.gz: e7a9052b36681fe7f84e5b6b519f04db2ea915008511a23027ffa7c0134d9458e9df08b3f356507d149eda4f63c2ea4773c63dbb0acf90f9014a99c3d7a38635
+  metadata.gz: 85089ee9a10e79bd4cf56684e3e63a6487ea6015c093bebd17b720ea52851679790316f0c65bfc4b47bcfe399bc13d4a4c2062127c69c0c1743957663522cc14
+  data.tar.gz: 608f712978969fe990aefa8e2d1c90daa99871d9c9588c86b82fe0ae30873a256f8b27d4c834ad445014c32895a53a626090b32a1993469d8e40dd50bb079191

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [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

data/Gemfile.lock

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

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 unless parameter.coerced.nil?
+      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/version.rb

@@ -2,6 +2,6 @@
 
 module Sinatra
   module ParamValidator
-    VERSION = '0.11.0'
+    VERSION = '0.12.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param-validator
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Rick Selby