validates_timeliness 5.0.1 → 6.0.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c7247761bf59a4add26640ddb732b6bdf816312be3083e972976062d4a43459
-  data.tar.gz: ab777d06c23790afbbc56a6a5a173fb8ea98034f52e9903d996c77a20e415574
+  metadata.gz: e153117c69ae4a75bde2e8a9cb1334118fbc083be371ed10d6658bf6a82aa8fb
+  data.tar.gz: cb77f367f614fd8c6fbf754cd5b1d1beed8845a5afe74937e97e38ab7da8ee8b
 SHA512:
-  metadata.gz: fde85a854481b993e1353a092a5340a62c2c299e2a8f75c8802f334203673e05a64e5323d8af6b1cd3e9c8bd2c8a0b8c6c78dd160aa6630eda7bfb06e10f4166
-  data.tar.gz: 5d202ab44a0397c7fbacac804c0bd2e52fdb37c8db672d22340681d01ce70a95a735d6e85e65f0d7ac72c0b6cbbcd159cf3fb715c566dff544e93436b40d103a
+  metadata.gz: c67105f25b5473d6bd3a4f5b07763382424da6103053f7fa477a50c82a38d5fc3e61638854a1016d51da3c765419fe4a4986cee1105afbaf0255f2bf1bd623df
+  data.tar.gz: f5364e75b90e6bd60836e4858cb6fa2debeb557540de870aa6828a5c462329c550cb5af444d4e9337172653f56db04a1b0ef971d81a7fbace564ab08cf81c18e

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,14 +1,12 @@
-= 5.0.1 [2023-01-12]
-* Ensure Date value is converted to time in zone for zone aware attributes
-* Use ActiveSupport #change method to zero out usec
-
-= 5.0.0 [2021-04-03]
+= [UNRELEASED]
 * 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.beta1'
+  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
@@ -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,12 +198,12 @@ 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.
@@ -208,7 +212,7 @@ Just provide the symbol as the option value like so:
 
   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
@@ -220,7 +224,7 @@ symbols are pre-configured. Configure your own like so:
 === 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/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/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/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/validator.rb

@@ -86,7 +86,7 @@ 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 }
-      record.errors.add(attr_name, message, message_options)
+      record.errors.add(attr_name, message, **message_options)
     end
 
     def format_error_value(value)

data/lib/validates_timeliness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '5.0.1'
+  VERSION = '6.0.0.alpha1'
 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/spec/validates_timeliness/converter_spec.rb

@@ -59,61 +59,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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_timeliness
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 6.0.0.alpha1
 platform: ruby
 authors:
 - Adam Meehan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2021-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timeliness
@@ -45,9 +45,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
@@ -99,11 +99,11 @@ 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
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Date and time validation plugin for Rails which allows custom formats