validates_timeliness 5.0.0.beta1 → 6.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa25778ed03195da3bdd16dafc426d3345c2df57a21d225c73b97dd6785045e0
-  data.tar.gz: bd5fd0cc630b48cdd9543be3e79ef11599ec7c92fa7cff7f9acdce4867707e74
+  metadata.gz: b584b13fcefa901798be0f9d6e1cf51eaf80a3f0d64c6c97c63289abb4b98352
+  data.tar.gz: 5f5fa790ca28e6a0f94ddc487987e27aa8a74a5607e549aa71beefd1f12e87e9
 SHA512:
-  metadata.gz: fffd3ee1b2e79d67505b1866de6398eddb35bc52024a967b95d83b6e56b8f43a30c03efb89578e7bee7e8458a2ec38566c2048d6671ab3d55aa9e6365eb042a4
-  data.tar.gz: fcdc2d3e74d7e8a6011bc684991c49090e40416a79148af5ac421cef2376c78d683d280ef4998edaa1edd14ac5e5ad61f50b7d38e7ef89df104045db2f16a362
+  metadata.gz: 54c496a3f7275eb0a8c037b5e1fb22cc17debfcbaf35c6821209b900dcf6e9efdda11f7eb5f8083372feaed9ae5936119cb483a139d3c1d78de67e52d1bd7afc
+  data.tar.gz: fc6279b210ef3e43b357b49540f4dc201778239cce5507589677c45fb72155f95430b13f07fb95950f112f9efa13750f4fb008a7f9689ffc9e4d929e351bafe6

data/.travis.yml

@@ -1,14 +1,31 @@
+dist: focal
+os: linux
 language: ruby
 before_install: gem install bundler
 cache: bundler
 
 gemfile:
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_5_1.gemfile
-  - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_6_0.gemfile
+  - gemfiles/rails_6_1.gemfile
+  - gemfiles/rails_edge.gemfile
 
 rvm:
-  - "2.5.3"
+  - "2.5.8"
+  - "2.6.6"
+  - "2.7.2"
+  - "3.0.0"
+  - ruby-head
+
+jobs:
+  allow_failures:
+    - rvm: ruby-head
+    - gemfile: gemfiles/rails_edge.gemfile
+  exclude:
+    - rvm: 2.5.8
+      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.6.6
+      gemfile: gemfiles/rails_edge.gemfile
+  fast_finish: true
 
 script: 'bundle exec rspec'
 

data/CHANGELOG.rdoc

@@ -1,10 +1,12 @@
-= [UNRELEASED]
+= 5.0.0 [2021-04-03]
 * Fix DateTimeSelect extension support (AquisTech)
 * Relaxed Timeliness dependency version which allows for >= 0.4.0 with
   threadsafety fix for use_us_formats and use_euro_formats for hot switching
 	in a request.
 * Add initializer to ensure Timeliness v0.4+ ambiguous date config is set
   correctly when using `use_euro_formats` or `remove_use_formats'.
+* Add Ruby 3 compatibility
+* Add Rails 6.1 compatibility
 
 Breaking Changes
 * Update Multiparameter extension to use ActiveRecord type classes with multiparameter handling

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2010 Adam Meehan
+Copyright (c) 2008-2021 Adam Meehan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,13 +1,17 @@
 = ValidatesTimeliness {<img src="https://travis-ci.org/adzap/validates_timeliness.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/adzap/validates_timeliness]
 
-* Source:  http://github.com/adzap/validates_timeliness
-* Issues:  http://github.com/adzap/validates_timeliness/issues
+* Source:  https://github.com/adzap/validates_timeliness
+* Issues:  https://github.com/adzap/validates_timeliness/issues
 
 == Description
 
-Complete validation of dates, times and datetimes for Rails 5.x and ActiveModel.
+Complete validation of dates, times and datetimes for Rails 6.x and ActiveModel.
 
-If you a looking for the old version for Rails 4.x go here [https://github.com/adzap/validates_timeliness/tree/4-0-stable].
+Old 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]
 
 
 == Features
@@ -18,7 +22,7 @@ If you a looking for the old version for Rails 4.x go here [https://github.com/a
 
 * Only Rails date/time validation plugin offering complete validation (See ORM/ODM support)
 
-* Uses extensible date/time parser (Using {timeliness gem}[http://github.com/adzap/timeliness]. See Plugin Parser)
+* Uses extensible date/time parser (Using {timeliness gem}[https://github.com/adzap/timeliness]. See Plugin Parser)
 
 * Adds extensions to fix Rails date/time select issues (See Extensions)
 
@@ -30,13 +34,13 @@ If you a looking for the old version for Rails 4.x go here [https://github.com/a
 == Installation
 
   # in Gemfile
-  gem 'validates_timeliness', '~> 5.0.0.alpha3'
+  gem 'validates_timeliness', '~> 6.0.0.alpha1'
 
   # Run bundler
   $ bundle install
 
 Then run
-  
+
   $ rails generate validates_timeliness:install
 
 This creates configuration initializer and locale files. In the initializer, there are a number of config
@@ -49,21 +53,21 @@ NOTE: You may wish to enable the plugin parser and the extensions to start. Plea
 
   validates_datetime :occurred_at
 
-  validates_date :date_of_birth, :before => lambda { 18.years.ago },
-                                 :before_message => "must be at least 18 years old"
+  validates_date :date_of_birth, before: lambda { 18.years.ago },
+                                 before_message: "must be at least 18 years old"
 
-  validates_datetime :finish_time, :after => :start_time # Method symbol
+  validates_datetime :finish_time, after: :start_time # Method symbol
 
-  validates_date :booked_at, :on => :create, :on_or_after => :today # See Restriction Shorthand.
+  validates_date :booked_at, on: :create, on_or_after: :today # See Restriction Shorthand.
 
-  validates_time :booked_at, :between => ['9:00am', '5:00pm'] # On or after 9:00AM and on or before 5:00PM
-  validates_time :booked_at, :between => '9:00am'..'5:00pm' # The same as previous example
-  validates_time :booked_at, :between => '9:00am'...'5:00pm' # On or after 9:00AM and strictly before 5:00PM
+  validates_time :booked_at, between: ['9:00am', '5:00pm'] # On or after 9:00AM and on or before 5:00PM
+  validates_time :booked_at, between: '9:00am'..'5:00pm' # The same as previous example
+  validates_time :booked_at, between: '9:00am'...'5:00pm' # On or after 9:00AM and strictly before 5:00PM
 
-  validates_time :breakfast_time, :on_or_after => '6:00am',
-                                  :on_or_after_message => 'must be after opening time',
-                                  :before => :lunchtime,
-                                  :before_message => 'must be before lunch time'
+  validates_time :breakfast_time, on_or_after: '6:00am',
+                                  on_or_after_message: 'must be after opening time',
+                                  before: :lunchtime,
+                                  before_message: 'must be before lunch time'
 
 
 == Usage
@@ -72,14 +76,14 @@ To validate a model with a date, time or datetime attribute you just use the
 validation method
 
   class Person < ActiveRecord::Base
-    validates_date :date_of_birth, :on_or_before => lambda { Date.current }
+    validates_date :date_of_birth, on_or_before: lambda { Date.current }
     # or
-    validates :date_of_birth, :timeliness => {:on_or_before => lambda { Date.current }, :type => :date}
+    validates :date_of_birth, timeliness: {on_or_before: lambda { Date.current }, type: :date}
   end
 
 or even on a specific record, per ActiveModel API.
 
-  @person.validates_date :date_of_birth, :on_or_before => lambda { Date.current }
+  @person.validates_date :date_of_birth, on_or_before: lambda { Date.current }
 
 
 The list of validation methods available are as follows:
@@ -97,7 +101,7 @@ Temporal options (or restrictions):
   :on_or_before - Attribute must be equal to or before this value to be valid
   :after        - Attribute must be after this value to be valid
   :on_or_after  - Attribute must be equal to or after this value to be valid
-  :between      - Attribute must be between the values to be valid. Range or Array of 2 values. 
+  :between      - Attribute must be between the values to be valid. Range or Array of 2 values.
 
 Regular validation options:
   :allow_nil    - Allow a nil value to be valid
@@ -142,7 +146,7 @@ like so
 
   end
 
-By default the plugin extends ActiveRecord if loaded. If you wish to extend another ORM then look at the {wiki page}[http://github.com/adzap/validates_timeliness/wiki/ORM-Support] for more information.
+By default the plugin extends ActiveRecord if loaded. If you wish to extend another ORM then look at the {wiki page}[https://github.com/adzap/validates_timeliness/wiki/ORM-Support] for more information.
 
 It is not required that you use a shim, but you will not catch errors when the attribute value is invalid and evaluated to nil.
 
@@ -184,7 +188,7 @@ It is highly recommended you use the I18n system for error messages.
 
 === Plugin Parser
 
-The plugin uses the {timeliness gem}[http://github.com/adzap/timeliness] as a fast, configurable and extensible date and time parser.
+The plugin uses the {timeliness gem}[https://github.com/adzap/timeliness] as a fast, configurable and extensible date and time parser.
 You can add or remove valid formats for dates, times, and datetimes. It is also more strict than the
 Ruby parser, which means it won't accept day of the month if it's not a valid number for the month.
 
@@ -194,33 +198,33 @@ By default the parser is disabled. To enable it:
   config.use_plugin_parser = true
 
 Enabling the parser will mean that strings assigned to attributes validated with the plugin will be parsed
-using the gem. See the wiki[http://github.com/adzap/validates_timeliness/wiki/Plugin-Parser] for more details about the parser configuration.
+using the gem. See the wiki[https://github.com/adzap/validates_timeliness/wiki/Plugin-Parser] for more details about the parser configuration.
 
 
 === Restriction Shorthand
 
-It is common to restrict an attribute to being on or before the current time or current day. 
+It is common to restrict an attribute to being on or before the current time or current day.
 To specify this you need to use a lambda as an option value e.g. <tt>lambda { Time.current }</tt>.
 This can be tedious noise amongst your validations for something so common. To combat this the
 plugin allows you to use shorthand symbols for often used relative times or dates.
 
 Just provide the symbol as the option value like so:
 
-  validates_date :birth_date, :on_or_before => :today
+  validates_date :birth_date, on_or_before: :today
 
-The :today symbol is evaluated as <tt>lambda { Date.today }</tt>. The :now and :today
+The :today symbol is evaluated as <tt>lambda { Date.current }</tt>. The :now and :today
 symbols are pre-configured. Configure your own like so:
 
   # in the setup block
   config.restriction_shorthand_symbols.update(
-    :yesterday => lambda { 1.day.ago }
+    yesterday: lambda { 1.day.ago }
   )
 
 
 === Default Timezone
 
 The plugin needs to know the default timezone you are using when parsing or type casting values. If you are using
-ActiveRecord then the default is automatically set to the same default zone as ActiveRecord. If you are using 
+ActiveRecord then the default is automatically set to the same default zone as ActiveRecord. If you are using
 another ORM you may need to change this setting.
 
   # in the setup block
@@ -286,12 +290,12 @@ To activate it, uncomment this line in the initializer:
 
 == Contributors
 
-To see the generous people who have contributed code, take a look at the {contributors list}[http://github.com/adzap/validates_timeliness/contributors].
+To see the generous people who have contributed code, take a look at the {contributors list}[https://github.com/adzap/validates_timeliness/contributors].
 
 
 == Maintainers
 
-* {Adam Meehan}[http://github.com/adzap]
+* {Adam Meehan}[https://github.com/adzap]
 
 
 == License

data/Rakefile

@@ -19,10 +19,11 @@ end
 
 desc 'Generate documentation for plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.main = 'README.rdoc'
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'ValidatesTimeliness'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 

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

@@ -2,13 +2,13 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 5.0.0"
+gem "rails", "~> 6.0.0"
 gem "rspec"
 gem "rspec-rails", "~> 3.7"
+gem "sqlite3"
 gem "timecop"
 gem "byebug"
 gem "appraisal"
-gem "sqlite3", "~> 1.3.6"
 gem "nokogiri", "~> 1.8"
 
 gemspec path: "../"

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

@@ -2,13 +2,13 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 5.1.0"
+gem "rails", "~> 6.1.0"
 gem "rspec"
 gem "rspec-rails", "~> 3.7"
+gem "sqlite3"
 gem "timecop"
 gem "byebug"
 gem "appraisal"
-gem "sqlite3", "~> 1.3.6"
 gem "nokogiri", "~> 1.8"
 
 gemspec path: "../"

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

@@ -2,13 +2,13 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 5.2.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 "sqlite3", "~> 1.3.6"
 gem "nokogiri", "~> 1.8"
 
 gemspec path: "../"

data/lib/validates_timeliness/extensions/date_time_select.rb

@@ -43,7 +43,7 @@ module ValidatesTimeliness
           values[POSITION.key(position.to_i)] = value.to_i
         end
 
-        DateTimeValue.new(values)
+        DateTimeValue.new(**values)
       end
     end
   end

data/lib/validates_timeliness/railtie.rb

@@ -12,7 +12,7 @@ module ValidatesTimeliness
       ValidatesTimeliness.ignore_restriction_errors = !Rails.env.test?
     end
 
-    initializer "validates_timeliness.initialize_timeliness_ambiguous_date_format", :after => 'load_config_initializers' do
+    initializer "validates_timeliness.initialize_timeliness_ambiguous_date_format", :after => :load_config_initializers do
       if Timeliness.respond_to?(:ambiguous_date_format) # i.e. v0.4+
         # Set default for each new thread if you have changed the default using
         # the format switching methods.

data/lib/validates_timeliness/validator.rb

@@ -85,12 +85,12 @@ module ValidatesTimeliness
 
     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 }
+      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)
-      format = I18n.t(@type, :default => DEFAULT_ERROR_VALUE_FORMATS[@type], :scope => 'validates_timeliness.error_value_formats')
+      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 = '5.0.0.beta1'
+  VERSION = '6.0.0.beta1'
 end

data/spec/support/test_model.rb

@@ -15,11 +15,11 @@ module TestModel
       self.model_attributes[name] = type
     end
 
-    def define_method_attribute=(attr_name)
+    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)
+    def define_method_attribute(attr_name, owner: nil)
       generated_attribute_methods.module_eval("def #{attr_name}; @attributes['#{attr_name}']; end", __FILE__, __LINE__)
     end
 

data/validates_timeliness.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |s|
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "LICENSE"]
 
-  s.add_runtime_dependency(%q<timeliness>, [">= 0.3.10", "< 1"])
+  s.add_runtime_dependency("activemodel", [">= 6.0.0", "< 7"])
+  s.add_runtime_dependency("timeliness", [">= 0.3.10", "< 1"])
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: validates_timeliness
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta1
+  version: 6.0.0.beta1
 platform: ruby
 authors:
 - Adam Meehan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: timeliness
   requirement: !ruby/object:Gem::Requirement
@@ -45,9 +65,9 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
-- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_edge.gemfile
 - init.rb
 - lib/generators/validates_timeliness/install_generator.rb
 - lib/generators/validates_timeliness/templates/en.yml
@@ -88,7 +108,7 @@ homepage: http://github.com/adzap/validates_timeliness
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,8 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: Date and time validation plugin for Rails which allows custom formats
 test_files: