validates_timeliness 7.0.0.beta2 → 8.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 291ec2c50666a8ce39654fb9c065ca22a27cc91413039a41faa1045e5143ee7e
-  data.tar.gz: 8ec042268f1524503c5daf4e0038769d64b0be9b0329281137a569579a5d991a
+  metadata.gz: 446d638f58bf6867dcd02c8d3f89e7c339bde180c4eb56aa49be03860722a8d7
+  data.tar.gz: 33c94183ebfc40ee0d90ab1d05ea6e84a65d8e0912fbdc9a7a6338623f403d6f
 SHA512:
-  metadata.gz: 0f7fd09d93f725dcbda325d6d681f1f68fd765ea75a5ae8d3206fe369fd9647f1ae6cb1be36d353c790482e310bd4f8cd4cc749fbb75a8aafc8b4653f7e76025
-  data.tar.gz: 433b16c8be0034ca7e9d8f6349ee9423a1437df4183e47efd623116b634287833f7b57f7f7a456bff06a1bbb9eb19df14c5cf73a0a6bb1e46d52f3ff112522df
+  metadata.gz: 96aba97841df97ade11d86fcf1f28c91c323755f03fc49511fa821383030c3c1eab24d1b88df5e741ab3c2630fb80e86498437c06ded734030044593878c5f66
+  data.tar.gz: 020b4690d0b73f82ff21bc8c9c974fe925c6df216a4db0634678158705cc346808ffbc09d74c98fc03ded15867a0ace1e14d1b3da153819bf8667e95bada068d

data/.github/workflows/ci.yml

@@ -7,12 +7,10 @@ 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_8_0
+            ruby: 3.2
+          - gemfile: rails_8_0
+            ruby: 3.3
 
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
     env:

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 7.0.0 [2024-11-30]
+*   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.beta1'
+gem 'validates_timeliness', '~> 8.0.0.beta1'
 ```
 
 Run bundler:

data/gemfiles/rails_7_0.gemfile

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

data/gemfiles/rails_7_1.gemfile

@@ -0,0 +1,13 @@
+# 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

@@ -0,0 +1,13 @@
+# 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: "../"

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/extensions/date_time_select.rb

@@ -1,6 +1,6 @@
 module ValidatesTimeliness
   module Extensions
-    module TimelinessDateTimeSelect
+    module DateTimeSelect
       # Intercepts the date and time select helpers to reuse the values from
       # the params rather than the parsed value. This allows invalid date/time
       # values to be redisplayed instead of blanks to aid correction by the user.

data/lib/validates_timeliness/extensions.rb

@@ -1,10 +1,11 @@
 module ValidatesTimeliness
   module Extensions
-    autoload :TimelinessDateTimeSelect, 'validates_timeliness/extensions/date_time_select'
+    autoload :DateTimeSelect, 'validates_timeliness/extensions/date_time_select'
   end
 
   def self.enable_date_time_select_extension!
-    ::ActionView::Helpers::Tags::DateSelect.send(:prepend, ValidatesTimeliness::Extensions::TimelinessDateTimeSelect)
+    require 'uri' # Do we need this? No, but the test suite fails without it.
+    ::ActionView::Helpers::Tags::DateSelect.send(:prepend, ValidatesTimeliness::Extensions::DateTimeSelect)
   end
 
   def self.enable_multiparameter_extension!

data/lib/validates_timeliness/helper_methods.rb

@@ -3,25 +3,19 @@ module ActiveModel
 
     module HelperMethods
       def validates_date(*attr_names)
-        timeliness_validation_for attr_names, :date
+        validates_with TimelinessValidator, _merge_attributes(attr_names).merge(type: :date)
       end
 
       def validates_time(*attr_names)
-        timeliness_validation_for attr_names, :time
+        validates_with TimelinessValidator, _merge_attributes(attr_names).merge(type: :time)
       end
 
       def validates_datetime(*attr_names)
-        timeliness_validation_for attr_names, :datetime
+        validates_with TimelinessValidator, _merge_attributes(attr_names).merge(type: :datetime)
       end
 
       def validates_timeliness_of(*attr_names)
-        timeliness_validation_for attr_names
-      end
-
-      def timeliness_validation_for(attr_names, type=nil)
-        options = _merge_attributes(attr_names)
-        options.update(:type => type) if type
-        validates_with TimelinessValidator, options
+        validates_with TimelinessValidator, _merge_attributes(attr_names)
       end
     end
 

data/lib/validates_timeliness/orm/active_model.rb

@@ -3,91 +3,8 @@ module ValidatesTimeliness
     module ActiveModel
       extend ActiveSupport::Concern
 
-      module ClassMethods
-        public
-
-        # Hook into bulk method definitions for non-attribute based methods validated.
-        def define_attribute_methods(*attr_names)
-          super.tap {
-            define_timeliness_methods
-          }
-        end
-
-        # Called when `attribute` methods is called and the timeliness overrides are defined here
-        def define_attribute_method(attr_name)
-          super.tap {
-            define_attribute_timeliness_methods(attr_name)
-          }
-        end
-
-        def undefine_attribute_methods
-          super.tap {
-            undefine_timeliness_attribute_methods
-          }
-        end
-
-        def define_timeliness_methods(before_type_cast=false)
-          return if timeliness_validated_attributes.blank?
-
-          timeliness_validated_attributes.each do |attr_name|
-            unless timeliness_method_already_implemented?(attr_name)
-              define_attribute_timeliness_methods(attr_name, before_type_cast)
-            end
-          end
-        end
-
-        def define_timeliness_method(attr_name, before_type_cast=false)
-          define_attribute_timeliness_methods(attr_name, before_type_cast)
-        end
-
-        # Lazy instantiate module as container of timeliness methods included in the model
-        def generated_timeliness_methods
-          @generated_timeliness_methods ||= Module.new { |m|
-            extend Mutex_m
-          }.tap { |mod| include mod }
-        end
-
-        def timeliness_method_already_implemented?(method_name)
-          generated_timeliness_methods.method_defined?(method_name)
-        end
-
-        def undefine_timeliness_attribute_methods
-          generated_timeliness_methods.module_eval do
-            undef_method(*instance_methods)
-          end
-        end
-
-        def define_attribute_timeliness_methods(attr_name, before_type_cast=false)
-          define_timeliness_write_method(attr_name)
-          define_timeliness_before_type_cast_method(attr_name) if before_type_cast
-        end
-
-        def define_timeliness_write_method(attr_name)
-          generated_timeliness_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
-            def #{attr_name}=(value)
-              @timeliness_cache ||= {}
-              @timeliness_cache['#{attr_name}'] = value
-
-              super
-            end
-          STR
-        end
-
-        def define_timeliness_before_type_cast_method(attr_name)
-          generated_timeliness_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
-            def #{attr_name}_before_type_cast
-              read_timeliness_attribute_before_type_cast('#{attr_name}')
-            end
-          STR
-        end
-      end
-
       def read_timeliness_attribute_before_type_cast(attr_name)
-        @timeliness_cache && @timeliness_cache[attr_name] || @attributes[attr_name].value_before_type_cast
-      end
-
-      def _clear_timeliness_cache
-        @timeliness_cache = {}
+        @attributes[attr_name].value_before_type_cast
       end
 
     end

data/lib/validates_timeliness/validator.rb

@@ -95,8 +95,9 @@ module ValidatesTimeliness
     end
 
     def attribute_raw_value(record, attr_name)
-      record.respond_to?(:read_timeliness_attribute_before_type_cast) &&
+      if record.respond_to?(:read_timeliness_attribute_before_type_cast)
         record.read_timeliness_attribute_before_type_cast(attr_name.to_s)
+      end
     end
 
     def time_zone_aware?(record, attr_name)

data/lib/validates_timeliness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '7.0.0.beta2'
+  VERSION = '8.0.0.beta1'
 end

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.beta2
+  version: 8.0.0.beta1
 platform: ruby
 authors:
 - Adam Meehan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-24 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
@@ -67,7 +67,9 @@ files:
 - README.md
 - Rakefile
 - gemfiles/rails_7_0.gemfile
-- gemfiles/rails_edge.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
@@ -130,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+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_edge.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
-gem "rspec"
-gem "rspec-rails", "~> 3.7"
-gem "sqlite3"
-gem "byebug"
-gem "appraisal"
-gem "nokogiri", "~> 1.8"
-
-gemspec path: "../"