validate-params 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77415952a47eed04815a14bc69183dac71d328f3f6457af90d6a53e282217225
-  data.tar.gz: b378c2c29ad38f747952d2b47c2c0431f69a3d71553efea49b9368cb5e985c8d
+  metadata.gz: abce4d094f5a56366394cab4c9c01e3bbaca5a9ed5cb3524754d941a7a90d6e6
+  data.tar.gz: 17aa70265348cae7d3f661fa07419da90c4ba1b4b08ccf881baaa5bd556bedf4
 SHA512:
-  metadata.gz: 4771f99a0060e876b62071201d1b6a1adb920bee3ec352c78d32fc4e5243c06b1aac65846c2a5be07d813375099e506778ec78dcd4486727918895b0d4adb1a4
-  data.tar.gz: 3e1be41784d411fcecf4dc4650d8ba6a25779a76abf8d8f355e1b795b50481c7e5f696240b86e952be9e64afb80541271b453dc4ef2a70d6b4e312a0fcd4a1ae
+  metadata.gz: 4cd4813db2797307b1e47956f02fffe2358cb7aaa130b5248ac0a8635e32c63a582a190d619af1d5bb5d7e4cf80f590862e97a96edab99c39dbbe86533de833d
+  data.tar.gz: 01dbe50eee3aed0eb9ee06dac9035a5e7c81f9f658cdf84e14fc888913a8ed2842049294f7c8c95ee175fb9c0240c66e5193fc87d8008d2c2cb1fb1691f41f6c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.9.0] - 2023-08-02
+
+- Add :min and :max options to validate param values for Integer types
+
 ## [0.8.0] - 2023-05-30
 
 - Added support for passing array of actions into validate_params_for to run on multiple actions
@@ -17,9 +21,9 @@
 ## [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.51"
+gem "rubocop", "~> 1.55"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    validate-params (0.8.1)
+    validate-params (0.9.0)
       activesupport (>= 6.1.0)
       i18n (>= 1.6)
 
@@ -36,6 +36,7 @@ GEM
     i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
+    language_server-protocol (3.17.0.3)
     loofah (2.21.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -45,8 +46,9 @@ GEM
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.23.0)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     racc (1.6.2)
     rack (2.2.7)
     rack-test (2.1.0)
@@ -58,8 +60,8 @@ GEM
       loofah (~> 2.19, >= 2.19.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.8.0)
-    rexml (3.2.5)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -73,17 +75,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.51.0)
+    rubocop (1.55.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.1)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     tzinfo (2.0.6)
@@ -99,7 +102,7 @@ DEPENDENCIES
   bundler (~> 2.0)
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (~> 1.51)
+  rubocop (~> 1.55)
   validate-params!
 
 BUNDLED WITH

data/README.md

@@ -29,11 +29,11 @@ class TestController < ActionController::Base
     p.param :user_ids, Array, of: Integer, default: [1, 2, 3]
     p.param :states, Array, of: String, default: ["active", "inactive"], reject_blank: true
     p.param :date_of_birth, Hash do |pp|
-      pp.param :gt, Date
+      pp.param :gt, Date, min: Date.new(2020, 1, 1), max: Date.new(2021, 1, 1)
       pp.param :lt, Date
     end
     p.param :created_at, Hash do |pp|
-      pp.param :lt, DateTime
+      pp.param :lt, DateTime, min: DateTime.new(2020, 1, 1), max: DateTime.new(2021, 1, 1)
       pp.param :gt, DateTime
     end
   end
@@ -55,7 +55,7 @@ If the parameters are valid, the controller action will be executed as normal. I
         {
             "message": "hired_on must be a valid Date"
         },
-      
+
     ]
 }
 ```
@@ -64,7 +64,7 @@ If the parameters are valid, the controller action will be executed as normal. I
 
 By default responses are returned in JSON format. To return responses as an empty HTML response, change the :format options in the validate_params methods to :html.
 
-Example: 
+Example:
 
 ```ruby
 validate_params :index, format: :html do |p|

data/config/locales/en.yml

@@ -3,3 +3,5 @@ en:
     required: "%{param} is required"
     invalid_type: "%{param} must be a valid %{type}"
     invalid_in: "%{param} is an invalid value"
+    more_than_max: "%{param} cannot be more than maximum"
+    less_than_min: "%{param} cannot be less than minimum"

data/lib/validate_params/param_validator.rb

@@ -36,15 +36,27 @@ module ValidateParams
         end
 
         def date
-          return if Types::Date.valid?(@value)
+          if !Types::Date.valid?(@value)
+            @errors << { message: error_message }
+            return
+          end
 
-          @errors << { message: error_message }
+          formatted_value = Types::Date.cast(@value)
+
+          validate_min(formatted_value) if @options[:min].present?
+          validate_max(formatted_value) if @options[:max].present?
         end
 
         def date_time
-          return if Types::DateTime.valid?(@value)
+          if !Types::DateTime.valid?(@value)
+            @errors << { message: error_message }
+            return
+          end
 
-          @errors << { message: error_message }
+          formatted_value = Types::DateTime.cast(@value)
+
+          validate_min(formatted_value) if @options[:min].present?
+          validate_max(formatted_value) if @options[:max].present?
         end
 
         def integer
@@ -53,7 +65,11 @@ module ValidateParams
             return
           end
 
+          formatted_value = Types::Integer.cast(@value)
+
           validate_inclusion if @options[:in].present?
+          validate_min(formatted_value) if @options[:min].present?
+          validate_max(formatted_value) if @options[:max].present?
         end
 
         def string
@@ -69,6 +85,24 @@ module ValidateParams
           }
         end
 
+        def validate_min(value)
+          return if @options[:min] <= value
+
+          @errors << {
+            message: I18n.t("validate_params.less_than_min", param: error_param_name),
+            min: @options[:min]
+          }
+        end
+
+        def validate_max(value)
+          return if @options[:max] >= value
+
+          @errors << {
+            message: I18n.t("validate_params.more_than_max", param: error_param_name),
+            max: @options[:max]
+          }
+        end
+
         def error_param_name
           case @field
           when Array

data/lib/validate_params/validatable.rb

@@ -4,6 +4,7 @@ require "validate_params/types/date"
 require "validate_params/types/date_time"
 require "validate_params/types/integer"
 require "validate_params/types/array"
+require "validate_params/types/string"
 require_relative "param_builder"
 require_relative "param_validator"
 
@@ -25,7 +26,7 @@ module ValidateParams
         @params_validations ||= {}
 
         Array(action).each do |act|
-          @params_validations[act] ||= {options: options, validations: []}
+          @params_validations[act] ||= { options: options, validations: [] }
 
           yield(ParamBuilder.new(validations: @params_validations[act][:validations])) if block
         end

data/lib/validate_params/version.rb

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

metadata

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