validates_timeliness 6.0.1 → 7.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a72c9c656e7bb6b4987658858001d6654a591b12a2aa6322f2b38a932ef4c7b5
-  data.tar.gz: b8449806435f41af895a80c61a7e641f42d4581aaee40183781a222ea027876a
+  metadata.gz: 291ec2c50666a8ce39654fb9c065ca22a27cc91413039a41faa1045e5143ee7e
+  data.tar.gz: 8ec042268f1524503c5daf4e0038769d64b0be9b0329281137a569579a5d991a
 SHA512:
-  metadata.gz: 68e98f1017b315190106b17608ce8d5df1977f101154c91a89fea550b2546b10ec569b6ba79ff51ae4efd760bc61e91756e7561624b8e8da7ae281d407c012a4
-  data.tar.gz: bda2a3e5f833ed1e3467e5e3ee2c2030d964187e9c23611c2afa1265c76096590332ae1739d8196c429eca57a2f8720a1c2e67cb87e75ba8a777f1c7f8939e56
+  metadata.gz: 0f7fd09d93f725dcbda325d6d681f1f68fd765ea75a5ae8d3206fe369fd9647f1ae6cb1be36d353c790482e310bd4f8cd4cc749fbb75a8aafc8b4653f7e76025
+  data.tar.gz: 433b16c8be0034ca7e9d8f6349ee9423a1437df4183e47efd623116b634287833f7b57f7f7a456bff06a1bbb9eb19df14c5cf73a0a6bb1e46d52f3ff112522df

data/.github/workflows/ci.yml

@@ -7,18 +7,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - gemfile: rails_6_0
-            ruby: 2.6
-          - gemfile: rails_6_0
+          - gemfile: rails_7_0
             ruby: 2.7
-          - gemfile: rails_6_0
-            ruby: 3.0
-          - gemfile: rails_6_1
-            ruby: 2.6
-          - gemfile: rails_6_1
-            ruby: 2.7
-          - gemfile: rails_6_1
+          - gemfile: rails_7_0
             ruby: 3.0
+          - gemfile: rails_7_0
+            ruby: 3.1
 
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
     env:

data/README.md

@@ -6,13 +6,13 @@
 
 ## Description
 
-Complete validation of dates, times and datetimes for Rails 6.x and
-ActiveModel.
+Complete validation of dates, times and datetimes for Rails 7.x and ActiveModel.
 
-Old Rails versions:
+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]
 
 
 ## Features
@@ -30,7 +30,7 @@ Old Rails versions:
 
 In Gemfile
 ```ruby
-gem 'validates_timeliness', '~> 6.0.0'
+gem 'validates_timeliness', '~> 7.0.0.beta1'
 ```
 
 Run bundler:

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

@@ -2,9 +2,9 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 7.0.0"
 gem "rspec"
-gem "rspec-rails", "~> 3.7"
+gem "rspec-rails", "~> 6.0"
 gem "sqlite3"
 gem "byebug"
 gem "appraisal"

data/gemfiles/{rails_6_1.gemfile → rails_edge.gemfile}

@@ -2,11 +2,10 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 6.1.0"
+gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
 gem "rspec"
 gem "rspec-rails", "~> 3.7"
 gem "sqlite3"
-gem "timecop"
 gem "byebug"
 gem "appraisal"
 gem "nokogiri", "~> 1.8"

data/lib/validates_timeliness/converter.rb

@@ -19,13 +19,12 @@ module ValidatesTimeliness
       when :date
         value.to_date
       when :datetime
-        value.is_a?(Time) ? value : (time_zone_aware? ? value.in_time_zone : value.to_time)
+        value.is_a?(Time) ? value : value.to_time
       else
         value
       end
-
       if ignore_usec && value.is_a?(Time)
-        value.change(usec: 0)
+        Timeliness::Parser.make_time(Array(value).reverse[4..9], (:current if time_zone_aware?))
       else
         value
       end

data/lib/validates_timeliness/helper_methods.rb

@@ -20,7 +20,7 @@ module ActiveModel
 
       def timeliness_validation_for(attr_names, type=nil)
         options = _merge_attributes(attr_names)
-        options.update(type: type) if type
+        options.update(:type => type) if type
         validates_with TimelinessValidator, options
       end
     end

data/lib/validates_timeliness/orm/active_model.rb

@@ -6,30 +6,54 @@ module ValidatesTimeliness
       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 }
+          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 }
+          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|
-            define_attribute_timeliness_methods(attr_name, before_type_cast)
+            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
-            instance_methods.each { |m| undef_method(m) }
+            undef_method(*instance_methods)
           end
         end
 
@@ -44,7 +68,7 @@ module ValidatesTimeliness
               @timeliness_cache ||= {}
               @timeliness_cache['#{attr_name}'] = value
 
-              @attributes['#{attr_name}'] = super
+              super
             end
           STR
         end
@@ -59,7 +83,7 @@ module ValidatesTimeliness
       end
 
       def read_timeliness_attribute_before_type_cast(attr_name)
-        @timeliness_cache && @timeliness_cache[attr_name] || @attributes[attr_name]
+        @timeliness_cache && @timeliness_cache[attr_name] || @attributes[attr_name].value_before_type_cast
       end
 
       def _clear_timeliness_cache

data/lib/validates_timeliness/railtie.rb

@@ -2,7 +2,7 @@ module ValidatesTimeliness
   class Railtie < Rails::Railtie
     initializer "validates_timeliness.initialize_active_record", :after => 'active_record.initialize_timezone' do
       ActiveSupport.on_load(:active_record) do
-        ValidatesTimeliness.default_timezone = ActiveRecord::Base.default_timezone
+        ValidatesTimeliness.default_timezone = ActiveRecord.default_timezone
         ValidatesTimeliness.extend_orms << :active_record
         ValidatesTimeliness.load_orms
       end

data/lib/validates_timeliness/version.rb

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

data/spec/spec_helper.rb

@@ -33,8 +33,6 @@ I18n.available_locales = ['en', 'es']
 # Extend TestModel as you would another ORM/ODM module
 module TestModelShim
   extend ActiveSupport::Concern
-  include ValidatesTimeliness::AttributeMethods
-  include ValidatesTimeliness::ORM::ActiveModel
 
   module ClassMethods
     # Hook into native time zone handling check, if any
@@ -46,18 +44,17 @@ end
 
 class Person
   include TestModel
+
   attribute :birth_date, :date
   attribute :birth_time, :time
   attribute :birth_datetime, :datetime
-
-  define_attribute_methods model_attributes.keys
 end
 
 class PersonWithShim < Person
   include TestModelShim
 end
 
-ActiveRecord::Base.default_timezone = :utc
+ActiveRecord.default_timezone = :utc
 ActiveRecord::Base.time_zone_aware_attributes = true
 ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})
 ActiveRecord::Base.time_zone_aware_types = [:datetime, :time]

data/spec/support/model_helpers.rb

@@ -1,22 +1,29 @@
 module ModelHelpers 
 
   # Some test helpers from Rails source 
-  def invalid!(attr_name, values, error = nil)
-    with_each_person_value(attr_name, values) do |record, value|
-      expect(record).to be_invalid
+  def invalid!(attr_name, values, error = nil, model_class = Person)
+    with_each_model_value(attr_name, values, model_class) do |record, value|
+      expect(record).to_not be_valid
       expect(record.errors[attr_name].size).to be >= 1
-      expect(record.errors[attr_name].first).to eq(error) if error
+
+      return unless error
+
+      if error.is_a?(Regexp)
+        expect(record.errors[attr_name].first).to match(error)
+      else
+        expect(record.errors[attr_name].first).to eq(error)
+      end
     end
   end
 
-  def valid!(attr_name, values)
-    with_each_person_value(attr_name, values) do |record, value|
+  def valid!(attr_name, values, model_class = Person)
+    with_each_model_value(attr_name, values, model_class) do |record, value|
       expect(record).to be_valid
     end
   end
 
-  def with_each_person_value(attr_name, values)
-    record = Person.new
+  def with_each_model_value(attr_name, values, model_class)
+    record = model_class.new
     Array.wrap(values).each do |value|
       record.send("#{attr_name}=", value)
       yield record, value

data/spec/support/test_model.rb

@@ -1,61 +1,13 @@
 module TestModel
   extend ActiveSupport::Concern
-  extend ActiveModel::Translation
+  include ActiveModel::Model
+  include ActiveModel::Attributes
   include ActiveModel::Validations
-  include ActiveModel::AttributeMethods
+  include ValidatesTimeliness::AttributeMethods
+  include ValidatesTimeliness::ORM::ActiveModel
 
   included do
     attribute_method_suffix "="
-    cattr_accessor :model_attributes
-  end
-
-  module ClassMethods
-    def attribute(name, type)
-      self.model_attributes ||= {}
-      self.model_attributes[name] = type
-    end
-
-    def define_method_attribute=(attr_name, owner: nil)
-      generated_attribute_methods.module_eval("def #{attr_name}=(new_value); @attributes['#{attr_name}']=self.class.type_cast('#{attr_name}', new_value); end", __FILE__, __LINE__)
-    end
-
-    def define_method_attribute(attr_name, owner: nil)
-      generated_attribute_methods.module_eval("def #{attr_name}; @attributes['#{attr_name}']; end", __FILE__, __LINE__)
-    end
-
-    def type_cast(attr_name, value)
-      return value unless value.is_a?(String)
-      type_name = model_attributes[attr_name.to_sym]
-      type = ActiveModel::Type.lookup(type_name)
-      type.cast(value)
-    end
-  end
-
-  def initialize(attributes = nil)
-    @attributes = self.class.model_attributes.keys.inject({}) do |hash, column|
-      hash[column.to_s] = nil
-      hash
-    end
-    self.attributes = attributes unless attributes.nil?
-  end
-
-  def attributes
-    @attributes
-  end
-
-  def attributes=(new_attributes={})
-    new_attributes.each do |key, value|
-      send "#{key}=", value
-    end
-  end
-
-  def method_missing(method_id, *args, &block)
-    if !matched_attribute_method(method_id.to_s).nil?
-      self.class.define_attribute_methods self.class.model_attributes.keys
-      send(method_id, *args, &block)
-    else
-      super
-    end
   end
 end
 

data/spec/validates_timeliness/attribute_methods_spec.rb

@@ -44,9 +44,11 @@ RSpec.describe ValidatesTimeliness::AttributeMethods do
       class PersonWithParser
         include TestModel
         include TestModelShim
+
         attribute :birth_date, :date
         attribute :birth_time, :time
         attribute :birth_datetime, :datetime
+
         validates_date :birth_date
         validates_time :birth_time
         validates_datetime :birth_datetime
@@ -54,8 +56,10 @@ RSpec.describe ValidatesTimeliness::AttributeMethods do
 
       it 'should parse a string value' do
         expect(Timeliness::Parser).to receive(:parse)
+
         r = PersonWithParser.new
         r.birth_date = '2010-01-01'
+        r.birth_date # parsing happens on read not write
       end
 
     end

data/spec/validates_timeliness/converter_spec.rb

@@ -63,61 +63,30 @@ RSpec.describe ValidatesTimeliness::Converter do
 
     describe "for datetime type" do
       let(:type) { :datetime }
+      let(:time_zone_aware) { true }
 
-      it 'should return nil for invalid value types' do
-        expect(type_cast_value(12)).to eq(nil)
+      it "should return Date as Time value" do
+        expect(type_cast_value(Date.new(2010, 1, 1))).to eq(Time.local(2010, 1, 1, 0, 0, 0))
       end
 
-      context "time zone aware" do
-        let(:time_zone_aware) { true }
-
-        around { |example|
-          Time.use_zone("Perth", &example)
-        }
-
-        it "should return Date as Time value" do
-          Time.use_zone('London') do
-            result = type_cast_value(Date.new(2010, 1, 1))
-            expected = Time.zone.local(2010, 1, 1, 0, 0, 0)
-
-            expect(result).to eq(expected)
-            expect(result.zone).to eq(expected.zone)
-          end
-        end
-
-        it "should return same Time value" do
-          value = Time.utc(2010, 1, 1, 12, 34, 56)
-          expect(type_cast_value(value)).to eq(value)
-        end
-
-        it "should return as Time with same component values" do
-          expect(type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56))).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
-        end
-
-        it "should return same Time in correct zone if timezone aware" do
-          value = Time.utc(2010, 1, 1, 12, 34, 56)
-          result = type_cast_value(value)
-
-          expect(result).to eq(Time.zone.local(2010, 1, 1, 20, 34, 56))
-          expect(result.zone).to eq('AWST')
-        end
+      it "should return same Time value" do
+        value = Time.utc(2010, 1, 1, 12, 34, 56)
+        expect(type_cast_value(Time.utc(2010, 1, 1, 12, 34, 56))).to eq(value)
       end
 
-      context "not time zone aware" do
-        let(:time_zone_aware) { false }
-
-        it "should return Date as Time value" do
-          expect(type_cast_value(Date.new(2010, 1, 1))).to eq(Time.local(2010, 1, 1, 0, 0, 0))
-        end
+      it "should return as Time with same component values" do
+        expect(type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56))).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
+      end
 
-        it "should return same Time value" do
-          value = Time.utc(2010, 1, 1, 12, 34, 56)
-          expect(type_cast_value(Time.utc(2010, 1, 1, 12, 34, 56))).to eq(value)
-        end
+      it "should return same Time in correct zone if timezone aware" do
+        value = Time.utc(2010, 1, 1, 12, 34, 56)
+        result = type_cast_value(value)
+        expect(result).to eq(Time.zone.local(2010, 1, 1, 23, 34, 56))
+        expect(result.zone).to eq('AEDT')
+      end
 
-        it "should return as Time with same component values" do
-          expect(type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56))).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
-        end
+      it 'should return nil for invalid value types' do
+        expect(type_cast_value(12)).to eq(nil)
       end
     end
 

data/spec/validates_timeliness/validator/format_spec.rb

@@ -0,0 +1,57 @@
+RSpec.describe ValidatesTimeliness::Validator, ":format option" do
+  with_config(:use_plugin_parser, true)
+
+  describe "for date type" do
+    before do
+      Person.validates_date :birth_date, format: "yyyy-mm-dd"
+    end
+
+    it "should not be valid for string given in the wrong format" do
+      invalid!(:birth_date, '23/12/2023', /is not a valid date/)
+    end
+
+    it "should be valid for string given in the right format" do
+      valid!(:birth_date, '2023-12-23')
+    end
+
+    it "should be valid for date instance" do
+      valid!(:birth_date, Date.new(2022,12,23))
+    end
+  end
+
+  describe "for time type" do
+    before do
+      Person.validates_time :birth_time, format: "hh:nn:ss"
+    end
+
+    it "should not be valid for string given in the wrong format" do
+      invalid!(:birth_time, "00-00-00", /is not a valid time/)
+    end
+
+    it "should be valid for string given in the right format" do
+      valid!(:birth_time, "00:00:00")
+    end
+
+    it "should be valid for date instance" do
+      valid!(:birth_time, Time.new(2010, 1, 1, 0, 0, 0))
+    end
+  end
+
+  describe "for datetime type" do
+    before do
+      Person.validates_datetime :birth_datetime, format: "yyyy-mm-dd hh:nn:ss"
+    end
+
+    it "should not be valid for string given in the wrong format" do
+      invalid!(:birth_datetime, "01-01-2010 00-00-00", /is not a valid datetime/)
+    end
+
+    it "should be valid for string given in the right format" do
+      valid!(:birth_datetime, "2010-01-01 00:00:00")
+    end
+
+    it "should be valid for date instance" do
+      valid!(:birth_datetime, DateTime.new(2010, 1, 1, 0, 0, 0))
+    end
+  end
+end

data/validates_timeliness.gemspec

@@ -21,12 +21,13 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md", "CHANGELOG.md", "LICENSE"]
 
   s.metadata = {
+    "rubygems_mfa_required" => "true",
     "bug_tracker_uri" => "#{github_url}/issues",
     "changelog_uri"   => "#{github_url}/blob/master/CHANGELOG.md",
     "source_code_uri" => "#{github_url}",
     "wiki_uri"        => "#{github_url}/wiki",
   }
 
-  s.add_runtime_dependency("activemodel", [">= 6.0.0", "< 7"])
+  s.add_runtime_dependency("activemodel", [">= 7.0.0", "< 8"])
   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: 6.0.1
+  version: 7.0.0.beta2
 platform: ruby
 authors:
 - Adam Meehan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: timeliness
   requirement: !ruby/object:Gem::Requirement
@@ -66,8 +66,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_6_0.gemfile
-- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_7_0.gemfile
+- gemfiles/rails_edge.gemfile
 - init.rb
 - lib/generators/validates_timeliness/install_generator.rb
 - lib/generators/validates_timeliness/templates/en.yml
@@ -94,10 +94,12 @@ files:
 - spec/validates_timeliness/extensions/date_time_select_spec.rb
 - spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
 - spec/validates_timeliness/helper_methods_spec.rb
+- spec/validates_timeliness/orm/active_model_spec.rb
 - spec/validates_timeliness/orm/active_record_spec.rb
 - spec/validates_timeliness/railtie_spec.rb
 - spec/validates_timeliness/validator/after_spec.rb
 - spec/validates_timeliness/validator/before_spec.rb
+- spec/validates_timeliness/validator/format_spec.rb
 - spec/validates_timeliness/validator/is_at_spec.rb
 - spec/validates_timeliness/validator/on_or_after_spec.rb
 - spec/validates_timeliness/validator/on_or_before_spec.rb
@@ -108,6 +110,7 @@ homepage: https://github.com/adzap/validates_timeliness
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   bug_tracker_uri: https://github.com/adzap/validates_timeliness/issues
   changelog_uri: https://github.com/adzap/validates_timeliness/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/adzap/validates_timeliness
@@ -123,9 +126,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.1.6
 signing_key:
@@ -142,10 +145,12 @@ test_files:
 - spec/validates_timeliness/extensions/date_time_select_spec.rb
 - spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
 - spec/validates_timeliness/helper_methods_spec.rb
+- spec/validates_timeliness/orm/active_model_spec.rb
 - spec/validates_timeliness/orm/active_record_spec.rb
 - spec/validates_timeliness/railtie_spec.rb
 - spec/validates_timeliness/validator/after_spec.rb
 - spec/validates_timeliness/validator/before_spec.rb
+- spec/validates_timeliness/validator/format_spec.rb
 - spec/validates_timeliness/validator/is_at_spec.rb
 - spec/validates_timeliness/validator/on_or_after_spec.rb
 - spec/validates_timeliness/validator/on_or_before_spec.rb