sinatra-param-validator 0.7.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0704f790d84c6f56cc3f0d68f55ed3bcd95b5fa76fb9d185bb3b5421bb62348
-  data.tar.gz: 352199c3b098d9adb0e1666ee538b373a72afdb13c1cbd62ea686943fc7e4954
+  metadata.gz: 902453e928aa07fd3a259794b029cc20213aa73555f7cc7348bfb202239d7c29
+  data.tar.gz: 8e890aeaedfa9ad25dfb0a8b85181c70f817ec4371554d09a05dbfe409b23571
 SHA512:
-  metadata.gz: 8df45995e8e88d7ead9edfdd8985f2b43a5904e08005f205a815286f2fa0fb36acb98494538f5bb30ee7733db8f8faf061cfc09ce48763f26176538881c9135e
-  data.tar.gz: 03caf360ce521261397eca9558f5dfe8f74df3bd6a3c1932cd5fda802f257f3025199cbd0c8f29098b231ccf6fea982947ff52fc5b19ea5309e746a8e5384293
+  metadata.gz: b61d1563c52d501972584a02a2a0c74373675108fab55ad6272958fe5b28938e59c20e3b3f3f06c734a9adc94e140e89bc41a7756a6e68281c567dd09b9e82f3
+  data.tar.gz: 2d0c36672894b4616092e63cd0771292f4c41f024c63bb01a5c6006e0a80a4824c6d0d8df2f2afa34c9854d89c0f871b85c13abac387c6219f85406775948261

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [0.10.0] - 2022-07-12
+
+- Remove the `block` option from validators
+
+## [0.9.0] - 2022-07-09
+
+- Change parser to parse the definition outside of the initialize block
+
+## [0.8.0] - 2022-07-09
+
+- Add form helpers for form validator
+
 ## [0.7.0] - 2022-06-09
 
 - Add `default` option for parameters

data/Gemfile.lock

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

data/README.md

@@ -126,15 +126,6 @@ param :number, Integer, required: true do |validator|
 end
 ```
 
-If you need to run some code in the route context, you can just use the `block` keyword:
-
-```ruby
-block do |validator|
-  #...
-  validator.param :val, Integer
-end
-```
-
 ## Rules
 
 Rules work on multiple parameters:

data/lib/sinatra/param_validator/parser.rb

@@ -12,22 +12,22 @@ module Sinatra
     class Parser < SimpleDelegator
       attr_reader :errors
 
-      def initialize(definition, context, *args)
+      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))
       end
 
-      def block(&block)
-        run_block :block, block
-      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

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

@@ -5,6 +5,33 @@ module Sinatra
     class Validator
       # A form validator
       class Form < Validator
+        # Helpers for Sinatra templates
+        module Helpers
+          def form_values(hash)
+            hash = IndifferentHash[hash]
+            flash.now[:params] = flash.now.key?(:params) ? hash.merge(flash.now[:params]) : hash
+          end
+
+          def form_value(field)
+            flash[:params]&.fetch(field, nil)
+          end
+
+          def form_error?(field = nil)
+            return !flash[:form_errors].nil? && !flash[:form_errors]&.empty? if field.nil?
+
+            (flash[:form_errors] || {}).key?(field)
+          end
+
+          def form_errors(field)
+            (flash[:form_errors] || {}).fetch(field, [])
+          end
+
+          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
+          end
+        end
+
         def handle_failure(context)
           case context.request.preferred_type.to_s
           when 'application/json' then return json_failure(context)

data/lib/sinatra/param_validator/validator.rb

@@ -16,7 +16,7 @@ module Sinatra
       end
 
       def run(context, *args)
-        @errors = Parser.new(@definition, context, *args).errors
+        @errors = Parser.new(context).parse(@definition, *args).errors
       end
 
       def success?

data/lib/sinatra/param_validator/version.rb

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

metadata

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