validate-params 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2d071e5e303d7093044e9d93df803d42cbab04a50d3982930d1a2caa5b430da
-  data.tar.gz: a3c75285f19ca61d41206e6714ce87884e9219f897d2293120438c9aa8affe50
+  metadata.gz: f6ab3ca178e0872231216da505527fc494dfa77ec389827c4db303e935ef5ead
+  data.tar.gz: d36f7fcee87464448330e6414e9962214c51295606773a1060460a2fb4926aa5
 SHA512:
-  metadata.gz: a88e088ed079b06bed177dbdd9fdcf1ce01af371923b0539fa23336c7a8db32ec153f45bd191eba9d80b3990709e85f32441558886b09f26edf77f88b474f436
-  data.tar.gz: 5ba5d625af372572ac1060c5e181a5931a68a3c8a3ef725409899fda8638c21493d4223bc27ca04b77fc83fdd3922a52a1a17794fb713992f235587a53c69ce6
+  metadata.gz: af6b5f6b529eb3b848f1da4cbb590255a7122560327a695c22fdcaeaf3689bad84626ea2ecef2c3451c136b8ed64eb58846672d084a84080e25adf4e4c12365c
+  data.tar.gz: 7d86a7ddf3e57603b428b37cc01b5e9cc334348d2bd87a8fa36da108544e9f2a68f61a4cfd7095645e17e2a1c4afcefa91c5702157ab81f8f32d14d095b61fed

data/CHANGELOG.md

@@ -1,11 +1,15 @@
 ## [Unreleased]
 
+## [0.5.2] - 2023-05-29
+
+- Support to handle HTML and JSON response formats
+
 ## [0.5.0] - 2023-05-15
 
 - Support for Proc as options for default to set param default values
-- Add :in options to validate param values against a list of values for String and Integer types
+`- Add :in options to validate param values against a list of values for String and Integer types
 - Updated JSON formats of error messages to be more consistent
-
+`
 ## [0.3.0] - 2023-05-12
 
 - Add required attribute support

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.2)
       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])
@@ -119,7 +126,7 @@ module ValidateParams
             }
           end
         when "Integer"
-         if invalid_integer?(parameter_value)
+          if invalid_integer?(parameter_value)
             errors << {
               message: build_error_message(error_param_name(params_validation[:field]), params_validation[:type])
             }
@@ -146,7 +153,11 @@ module ValidateParams
 
       return if errors.empty?
 
-      render json: { success: false, errors: errors }, status: :unprocessable_entity
+      if request.nil? || request.format.json?
+        render json: { success: false, errors: errors }, status: :bad_request
+      else
+        head :bad_request
+      end
     end
 
     def invalid_date?(value)
@@ -174,15 +185,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.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validate-params
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - dcherevatenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack