sinatra-param-validator 0.6.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f824395ffa6b3e38d61c1e4cd81ee2237987c47b04c51abb4cd43d2fdedd2ec
-  data.tar.gz: 9294cc7618a05d263df6f7e7415fdab88b0f6e846b05fce4cac2763d8a79b740
+  metadata.gz: f17b821ad13e5656480453ed3067bc2cb724cfc51dc71b89673ebbd29bf06cff
+  data.tar.gz: b4a333cc414c4fdb0ba9ba9cbc5da317037bbc0a08879f8f120c70996ce41073
 SHA512:
-  metadata.gz: 17ed2207a700e74b5114ac4b10fb9f8a3f6089d6661df044017a5b36ea558ffec2452e62d7ec0814a5ce30536ab039569cfa45f031960e791caaf57ae253afac
-  data.tar.gz: 8dd242fdf3f379612962ca5897e23e86782b061b16373bfc3dbf4b6e3e22b95e39787027e1499cca36872c9d88b7246871bbb882f6472caadbd5004de7763be4
+  metadata.gz: fd06efb152939cecc5ea1169426c4cded4177ad2a71b678a217899e246c4def5826457339b8a9f5a2afedc3044af53e4a41728f04ae6180cfdfc2efc5048e6f6
+  data.tar.gz: 90133f0e8bda179eafc1e193bcb4caa2466ece28efc20c17e3521e30a18a505d58d26f0ba6e0ff79fb88119bdcbeb9f2b4932ca7b6882e98c351eed0d1509a0d

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [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
+- Allow `default` option to be a proc or a lambda
+
 ## [0.6.0] - 2022-06-09
 
 - Add `block` to run blocks of code in the route context

data/Gemfile.lock

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

data/README.md

@@ -69,6 +69,9 @@ param :number, Integer, required: true, in: 0..100
 
 All parameters have the following validations available:
 
+* `default`
+  * Set a default value if this parameter was not provided 
+  * This can be a lambda or a proc if required
 * `nillable`
   * If this is set, all other validations are skipped if the value is nil
 * `required`

data/lib/sinatra/param_validator/parser.rb

@@ -12,12 +12,16 @@ 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)
@@ -28,9 +32,9 @@ module Sinatra
         run_block :block, block
       end
 
-      def param(key, type, message: nil, **args, &block)
+      def param(key, type, default: nil, message: nil, **args, &block)
         parameter = Parameter.new(@context.params[key], type, **args)
-        @context.params[key] = parameter.coerced if @context.params.key?(key) && parameter.coerced
+        update_params_hash key, parameter, default
         if parameter.valid?
           run_block(key, block) if block
         else
@@ -50,12 +54,22 @@ module Sinatra
         raise 'Invalid rule type'
       end
 
+      private
+
       def run_block(key, block)
         args = block.arity == 1 ? [self] : []
         @context.instance_exec(*args, &block)
       rescue InvalidParameterError => e
         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
+        elsif !default.nil?
+          @context.params[key] = default.respond_to?(:call) ? default.call : default
+        end
+      end
     end
   end
 end

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.6.0'
+    VERSION = '0.9.0'
   end
 end

metadata

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