validate-params 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2d071e5e303d7093044e9d93df803d42cbab04a50d3982930d1a2caa5b430da
-  data.tar.gz: a3c75285f19ca61d41206e6714ce87884e9219f897d2293120438c9aa8affe50
+  metadata.gz: 1cc4a4179e78c2c12842ddac40a4745028bbbf7f5f90cc0031fcaa3ae5db1422
+  data.tar.gz: 33e7a943d361d305a14e1a4c6f0d97f8f20f078d89ee872857238db5b947ab90
 SHA512:
-  metadata.gz: a88e088ed079b06bed177dbdd9fdcf1ce01af371923b0539fa23336c7a8db32ec153f45bd191eba9d80b3990709e85f32441558886b09f26edf77f88b474f436
-  data.tar.gz: 5ba5d625af372572ac1060c5e181a5931a68a3c8a3ef725409899fda8638c21493d4223bc27ca04b77fc83fdd3922a52a1a17794fb713992f235587a53c69ce6
+  metadata.gz: 2d081f19216d1a04527a13366857f37a25c818398dffa4703540b4f806593942d75d6759b4a8892fc2512dd72fa6a882d3a5ef7f9b57ac178b6c160b5d26896f
+  data.tar.gz: c484a35d91d3b3d3ff7c96b301063bb497e25dfea5621b3db3ade98b36a5981cae8555b451eff9d9b8240a579826b762f91025a5f86859d4e33476e9325ccd86

data/Gemfile

@@ -6,4 +6,4 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
-gem "rubocop", "~> 1.21"
+gem "rubocop", "~> 1.51"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    validate-params (0.5.0)
+    validate-params (0.5.1)
       activesupport (>= 6.1.0)
 
 GEM
@@ -72,7 +72,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.50.2)
+    rubocop (1.51.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
@@ -98,7 +98,7 @@ DEPENDENCIES
   bundler (~> 2.0)
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (~> 1.21)
+  rubocop (~> 1.51)
   validate-params!
 
 BUNDLED WITH

data/README.md

@@ -23,8 +23,9 @@ class TestController < ActionController::Base
   include ValidateParams::ParamsValidator
 
   validate_params :index do |p|
-    p.param :occurred_on, Date, required: true
-    p.param :quantity, Integer
+    p.param :name, String, default: "John Doe"
+    p.param :occurred_on, Date, required: true, default: proc { Date.today }
+    p.param :quantity, Integer, required: true, in: [1, 2, 3]
     p.param :date_of_birth, Hash do |pp|
       pp.param :gt, Date
       pp.param :lt, Date

data/lib/validate_params/params_validator.rb

@@ -14,12 +14,13 @@ module ValidateParams
 
       def param(field, type, options = {}, &block)
         @params_validations ||= []
-        @params_validations <<
-          if block
-            yield(ParamBuilder.new(field))
-          else
-            ParamBuilder.new.param(field, type, options)
-          end
+
+        if block
+          param_builder = ParamBuilder.new(field)
+          @params_validations += yield(param_builder)
+        else
+          @params_validations << ParamBuilder.new.param(field, type, options)
+        end
       end
 
       def validate_params_for(request_action, &block)
@@ -64,6 +65,8 @@ module ValidateParams
 
         if params_validation[:field].is_a?(Hash)
           params_validation[:field].each_key do |key|
+            # Skip in case hash is configured and string is passed
+            next if params.dig(key).is_a? Hash
             next if params.dig(key, params_validation[:field][key])
 
             value = if params_validation[:options][:default].is_a?(Proc)
@@ -91,6 +94,10 @@ module ValidateParams
       errors = []
 
       for params_validation in params_validations
+        # Skip in case hash is configured and string is passed
+        next if params_validation[:field].is_a?(Hash) &&
+          params.dig(params_validation[:field].keys.first).is_a?(String)
+
         parameter_value = if params_validation[:field].is_a? Hash
                             params.dig(params_validation[:field].keys.first,
                                        params_validation[:field][params_validation[:field].keys.first])
@@ -174,15 +181,16 @@ module ValidateParams
     class ParamBuilder
       def initialize(parent_field = nil)
         @parent_field = parent_field
+        @params_validations = []
       end
 
       def param(field, type, options = {})
-
-        if @parent_field
-          { field: { @parent_field => field }, type: type, options: options }
-        else
-          { field: field, type: type, options: options }
+        unless @parent_field
+          return { field: field, type: type, options: options }
         end
+
+        @params_validations << { field: { @parent_field => field }, type: type, options: options }
+        @params_validations
       end
     end
   end

data/lib/validate_params/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ValidateParams
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: validate-params
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - dcherevatenko
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2023-05-15 00:00:00.000000000 Z
@@ -100,11 +100,11 @@ files:
 - lib/validate_params/version.rb
 - sig/validate_params.rbs
 - validate_params.gemspec
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Gem to validate params in controllers
 test_files: []