validates_timeliness 7.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 506a3b1b6bf8487da01734e154c8bbd8c4afd5ab308dc11b4928b26c30d1a658
-  data.tar.gz: 3c380ad2708dc2946a274c473451bb1db6c1d71d0e5da462b658dad735cc9560
+  metadata.gz: fddd24dc1daff9d9c90db6d6cb477519ab77abcf5dc8c55c5c69af61504eba46
+  data.tar.gz: e16bbad97a83834a912610ff682fe2c93ef7204e0b19f070becd84e4e3ebaf18
 SHA512:
-  metadata.gz: 2ef5523111dee8a055989d0fa7c751d6dc34e959e2442ef99b0b46050097a31983a350ab4d6a1d3bc00ac4ebc4d00320622c9cc7aaad799535bd6dcb2084849f
-  data.tar.gz: b15a9e6cd84b59830b45a3bce59d9cc664b2a0a5504423a355cea340614ae2a136a41ee37fc180f00b70398cd50deb67d20a1459165945fccc28eb2d79ee73e2
+  metadata.gz: 443d66dd2feb66c01e77294236fbf7b197e358246dbd40b9014c5b888e23810219851d89dd320db9e0a256bc62a6402fdbcc326684941566dbdc331285faefce
+  data.tar.gz: 0d1f13688d2a26ffaa940b409c9f6139cd780b21ffffb1ef02470718bd63d3d1e86bf2bcf4e411b15de4cb7badb215cdd7df8088f59ff63f044f924fcbdf570d

data/.github/workflows/ci.yml

@@ -7,27 +7,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - gemfile: rails_7_0
-            ruby: 2.7
-          - gemfile: rails_7_0
-            ruby: 3.0
-          - gemfile: rails_7_0
-            ruby: 3.1
-
-          - gemfile: rails_7_1
-            ruby: 2.7
-          - gemfile: rails_7_1
-            ruby: 3.0
-          - gemfile: rails_7_1
-            ruby: 3.1
-          - gemfile: rails_7_1
-            ruby: 3.2
-
-          - gemfile: rails_7_2
-            ruby: 3.1
-          - gemfile: rails_7_2
+          - gemfile: rails_8_0
             ruby: 3.2
-          - gemfile: rails_7_2
+          - gemfile: rails_8_0
             ruby: 3.3
 
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# 8.0.0 [2024-12-31]
+*   Support Rails v8.x
+*   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/README.md

@@ -6,13 +6,14 @@
 
 ## Description
 
-Complete validation of dates, times and datetimes for Rails 7.x and ActiveModel.
+Complete validation of dates, times and datetimes for Rails 8.x and ActiveModel.
 
 Older Rails versions:
 
 - Rails 4.x: [https://github.com/adzap/validates_timeliness/tree/4-0-stable]
 - Rails 5.x: [https://github.com/adzap/validates_timeliness/tree/5-0-stable]
 - Rails 6.x: [https://github.com/adzap/validates_timeliness/tree/6-0-stable]
+- Rails 7.x: [https://github.com/adzap/validates_timeliness/tree/7-0-stable]
 
 
 ## Features
@@ -30,7 +31,7 @@ Older Rails versions:
 
 In Gemfile
 ```ruby
-gem 'validates_timeliness', '~> 7.0.0'
+gem 'validates_timeliness', '~> 8.0.0.beta1'
 ```
 
 Run bundler:

data/gemfiles/{rails_7_0.gemfile → rails_8_0.gemfile}

@@ -2,10 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.0.0"
+gem "rails", "~> 8.0.0"
 gem "rspec"
 gem "rspec-rails", "~> 6.0"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 2.0"
 gem "byebug"
 gem "appraisal"
 gem "nokogiri"

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" }).freeze
+
     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 = '8.0.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) }
 

data/validates_timeliness.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |s|
     "wiki_uri"        => "#{github_url}/wiki",
   }
 
-  s.add_runtime_dependency("activemodel", [">= 7.0.0", "< 8"])
+  s.add_runtime_dependency("activemodel", [">= 8.0.0", "< 9"])
   s.add_runtime_dependency("timeliness", [">= 0.3.10", "< 1"])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_timeliness
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.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
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: timeliness
   requirement: !ruby/object:Gem::Requirement
@@ -66,9 +66,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_7_0.gemfile
-- gemfiles/rails_7_1.gemfile
-- gemfiles/rails_7_2.gemfile
+- gemfiles/rails_8_0.gemfile
 - init.rb
 - lib/generators/validates_timeliness/install_generator.rb
 - lib/generators/validates_timeliness/templates/en.yml
@@ -131,7 +129,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

data/gemfiles/rails_7_1.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 7.1.0"
-gem "rspec"
-gem "rspec-rails", "~> 6.0"
-gem "sqlite3", "~> 1.4"
-gem "byebug"
-gem "appraisal"
-gem "nokogiri"
-
-gemspec path: "../"

data/gemfiles/rails_7_2.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 7.2.0"
-gem "rspec"
-gem "rspec-rails", "~> 6.0"
-gem "sqlite3", "~> 1.4"
-gem "byebug"
-gem "appraisal"
-gem "nokogiri"
-
-gemspec path: "../"