validates_timeliness 7.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 506a3b1b6bf8487da01734e154c8bbd8c4afd5ab308dc11b4928b26c30d1a658
-  data.tar.gz: 3c380ad2708dc2946a274c473451bb1db6c1d71d0e5da462b658dad735cc9560
+  metadata.gz: d882843a354b86918dd2709809168d5dcbaf024319eeb424b1e0ff56f7731512
+  data.tar.gz: 0d5c06701e489c7332b59032055a25bcd4c2887f68c95b49a2d4192ecf313d71
 SHA512:
-  metadata.gz: 2ef5523111dee8a055989d0fa7c751d6dc34e959e2442ef99b0b46050097a31983a350ab4d6a1d3bc00ac4ebc4d00320622c9cc7aaad799535bd6dcb2084849f
-  data.tar.gz: b15a9e6cd84b59830b45a3bce59d9cc664b2a0a5504423a355cea340614ae2a136a41ee37fc180f00b70398cd50deb67d20a1459165945fccc28eb2d79ee73e2
+  metadata.gz: dc46ee39a4f707078094de96dd795c75f6287343c3a020be49a8455c76a07aad0cd4d26d46b143ca4149c81a8d54c273a32575ef7f0bc23fa63317ccaffc1851
+  data.tar.gz: 68a0b32a966d7c1a3df5d33c7642eac1c92efa276059b543b8240e73535fa5538e51c580be3362c4011b8f1838bc03817e7b7cc07d7219e68a18b2299cacf6a3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 7.1.0 [2024-12-31]
+*   Support passing non-reserved validation options to errors
+
+# 7.0.0 [2024-11-30]
+*   Support Rails v7.x
+*   Removed all method overrides in ActiveModel now that the datetime type correctly stores before_type_cast values.
+
+# 6.0.1 [2023-01-12]
+*   TODO need to complete this
+
+# 6.0.0 [2022-10-20]
+*   TODO need to complete this
+
 # 5.0.0 [2021-04-03]
 *   Fix DateTimeSelect extension support (AquisTech)
 *   Relaxed Timeliness dependency version which allows for >= 0.4.0 with

data/lib/validates_timeliness/validator.rb

@@ -21,6 +21,8 @@ module ValidatesTimeliness
 
     RESTRICTION_ERROR_MESSAGE = "Error occurred validating %s for %s restriction:\n%s"
 
+    RESERVED_OPTIONS = RESTRICTIONS.keys + RESTRICTIONS.keys.map { |option| :"#{option}_message" }
+
     def self.kind
       :timeliness
     end
@@ -72,7 +74,7 @@ module ValidatesTimeliness
         begin
           restriction_value = @converter.type_cast_value(@converter.evaluate(options[restriction], record))
           unless value.send(RESTRICTIONS[restriction], restriction_value)
-            add_error(record, attr_name, restriction, restriction_value) and break
+            add_error(record, attr_name, restriction, value: value, restriction_value: restriction_value) and break
           end
         rescue => e
           unless ValidatesTimeliness.ignore_restriction_errors
@@ -83,13 +85,20 @@ module ValidatesTimeliness
       end
     end
 
-    def add_error(record, attr_name, message, value=nil)
-      value = format_error_value(value) if value
-      message_options = { message: options.fetch(:"#{message}_message", options[:message]), restriction: value }
-      record.errors.add(attr_name, message, **message_options)
+    def add_error(record, attr_name, message, restriction_value: nil, value: nil)
+      error_options = options.except(*RESERVED_OPTIONS).merge!(
+        restriction: format_error_value(restriction_value),
+        value: value
+      )
+
+      message_text = options[:"#{message}_message"]
+      error_options[:message] = message_text if message_text.present?
+
+      record.errors.add(attr_name, message, **error_options)
     end
 
     def format_error_value(value)
+      return unless value
       format = I18n.t(@type, default: DEFAULT_ERROR_VALUE_FORMATS[@type], scope: 'validates_timeliness.error_value_formats')
       value.strftime(format)
     end

data/lib/validates_timeliness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '7.0.0'
+  VERSION = '7.1.0'
 end

data/spec/validates_timeliness/validator_spec.rb

@@ -185,6 +185,26 @@ RSpec.describe ValidatesTimeliness::Validator do
     end
   end
 
+  describe "custom option" do
+    it "should pass custom options to the error" do
+      Person.validates_datetime :birth_datetime, :on_or_before => Time.utc(2010,1,2,3,4,5), :custom => 'option'
+
+      with_each_model_value(:birth_datetime, Time.utc(2010,1,2,3,4,5,10000), Person) do |record, value|
+        expect(record).to_not be_valid
+        expect(record.errors.where(:birth_datetime).first.options).to include(custom: 'option')
+      end
+    end
+
+    it "should not pass config options to the error" do
+      Person.validates_datetime :birth_datetime, :on_or_before => Time.utc(2010,1,2,3,4,5), :custom => 'option'
+
+      with_each_model_value(:birth_datetime, Time.utc(2010,1,2,3,4,5,10000), Person) do |record, value|
+        expect(record).to_not be_valid
+        expect(record.errors.where(:birth_datetime).first.options.keys).to_not include(:on_or_before)
+      end
+    end
+  end
+
   describe "restriction value errors" do
     let(:person) { Person.new(:birth_date => Date.today) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_timeliness
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Adam Meehan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-30 00:00:00.000000000 Z
+date: 2024-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Date and time validation plugin for Rails which allows custom formats