validates_timeliness 7.1.0 → 8.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d882843a354b86918dd2709809168d5dcbaf024319eeb424b1e0ff56f7731512
-  data.tar.gz: 0d5c06701e489c7332b59032055a25bcd4c2887f68c95b49a2d4192ecf313d71
+  metadata.gz: 446d638f58bf6867dcd02c8d3f89e7c339bde180c4eb56aa49be03860722a8d7
+  data.tar.gz: 33c94183ebfc40ee0d90ab1d05ea6e84a65d8e0912fbdc9a7a6338623f403d6f
 SHA512:
-  metadata.gz: dc46ee39a4f707078094de96dd795c75f6287343c3a020be49a8455c76a07aad0cd4d26d46b143ca4149c81a8d54c273a32575ef7f0bc23fa63317ccaffc1851
-  data.tar.gz: 68a0b32a966d7c1a3df5d33c7642eac1c92efa276059b543b8240e73535fa5538e51c580be3362c4011b8f1838bc03817e7b7cc07d7219e68a18b2299cacf6a3
+  metadata.gz: 96aba97841df97ade11d86fcf1f28c91c323755f03fc49511fa821383030c3c1eab24d1b88df5e741ab3c2630fb80e86498437c06ded734030044593878c5f66
+  data.tar.gz: 020b4690d0b73f82ff21bc8c9c974fe925c6df216a4db0634678158705cc346808ffbc09d74c98fc03ded15867a0ace1e14d1b3da153819bf8667e95bada068d

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,8 +1,4 @@
-# 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]

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_8_0.gemfile

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

data/lib/validates_timeliness/validator.rb

@@ -21,8 +21,6 @@ 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
@@ -74,7 +72,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, value: value, restriction_value: restriction_value) and break
+            add_error(record, attr_name, restriction, restriction_value) and break
           end
         rescue => e
           unless ValidatesTimeliness.ignore_restriction_errors
@@ -85,20 +83,13 @@ module ValidatesTimeliness
       end
     end
 
-    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)
+    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)
     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.1.0'
+  VERSION = '8.0.0.beta1'
 end

data/spec/validates_timeliness/validator_spec.rb

@@ -185,26 +185,6 @@ 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.1.0
+  version: 8.0.0.beta1
 platform: ruby
 authors:
 - Adam Meehan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-31 00:00:00.000000000 Z
+date: 2024-11-30 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
@@ -69,6 +69,7 @@ files:
 - 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
@@ -127,9 +128,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.19
 signing_key: