v4.1.0

This reverts commit a05f091a42.

.rspec

@@ -1,3 +1,4 @@
 --format documentation
 --color
+--require spec_helper
 --require byebug

.travis.yml

@@ -1,17 +1,26 @@
 language: ruby
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+before_script:
+  - bundle install
 cache: bundler
+bundler_args: --verbose
 
-gemfile:
-  - gemfiles/rails_4_0.gemfile
-  - gemfiles/rails_4_1.gemfile
-  - gemfiles/rails_4_2.gemfile
+matrix:
+  include:
+    - rvm: "2.3.7"
+      gemfile: gemfiles/rails_4_0.gemfile
+    - rvm: "2.3.7"
+      gemfile: gemfiles/rails_4_1.gemfile
+    - rvm: "2.3.7"
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: "2.4.6"
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: "2.5.5"
+      gemfile: gemfiles/rails_4_2.gemfile
 
-rvm:
-  - "2.0.0"
-  - "2.2.0"
-  - "2.3.0"
-
-script: 'bundle exec rake'
+script: 'bundle exec rspec'
 
 notifications:
   email:

Appraisals

@@ -1,11 +1,11 @@
 appraise "rails_4_0" do
-  gem "rails", "~> 4.0.0"
+  gem "rails", "~> 4.0.13"
 end
 
 appraise "rails_4_1" do
-  gem "rails", "~> 4.1.0"
+  gem "rails", "~> 4.1.14"
 end
 
 appraise "rails_4_2" do
-  gem "rails", "~> 4.2.0"
-end
+  gem "rails", "~> 4.2.11"
+end

CHANGELOG.rdoc

@@ -1,3 +1,27 @@
+= 4.1.0 [2019-06-11]
+* Relaxed Timeliness dependency version to >= 0.3.10 and < 1, which allows
+  version 0.4 with threadsafety fix for use_us_formats and use_euro_formats
+  hot switching in a request.
+
+= 4.0.2 [2016-01-07]
+* Fix undefine_generated_methods ivar guard setting to false
+
+= 4.0.1 [2016-01-06]
+* Fix undefine_generated_methods thread locking bug
+* Created an ActiveModel ORM, for manual require if using without any full blown ORM
+
+= 4.0.0 [2015-12-29]
+* Extracted mongoid support into https://github.com/adzap/validates_timeliness-mongoid which is broken (not supported anymore).
+* Fixed Rails 4.0, 4.1 and 4.2 compatability issues
+* Upgrade specs to RSpec 3
+* Added travis config
+* Huge thanks to @johncarney for keeping it alive with his fork (https://github.com/johncarney/validates_timeliness)
+
+= 3.0.15 [2015-12-29]
+* Fixes mongoid 3 support and removes mongoid 2 support(johnnyshields)
+* Some documentation/comments tidying
+* Some general tidying up
+
 = 3.0.14 [2012-08-23]
 * Fix for using validates :timeliness => {} form to correctly add attributes to timeliness validated attributes.
 

Gemfile

@@ -1,16 +1,13 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 4.0.13'
-gem 'rspec', '~> 3.0.0'
-gem 'rspec-rails', '~> 3.0.0'
+gem 'rake'
+gem 'rails', '~> 4.2.11.1'
+gem 'rspec'
+gem 'rspec-rails', '~> 3.7'
 gem 'timecop'
 gem 'byebug'
 gem 'appraisal'
 gem 'sqlite3'
-gem 'nokogiri', '1.6.7'
-
-group :active_record do
-  gem 'sqlite3-ruby', :require => 'sqlite3'
-end
+gem 'nokogiri', '~> 1.8'

README.rdoc

@@ -22,7 +22,7 @@ If you a looking for the old version for Rails 3.x go here[http://github.com/adz
 
 * Adds extensions to fix Rails date/time select issues (See Extensions)
 
-* Supports I18n for the error messages
+* Supports I18n for the error messages. For multi-language support try {timeliness-i18n gem}[https://github.com/pedrofurtado/timeliness-i18n].
 
 * Supports all the Rubies (that any sane person would be using in production).
 

gemfiles/rails_4_0.gemfile

@@ -1,19 +1,14 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "rails", "~> 4.0.0"
-gem "rspec", "~> 3.0.0"
-gem "rspec-rails", "~> 3.0.0"
+gem "rails", "~> 4.0.13"
+gem "rspec", "~> 3.6.0"
+gem "rspec-rails", "~> 3.6.0"
 gem "timecop"
-gem "rspec_tag_matchers"
 gem "byebug"
 gem "appraisal"
-gem "sqlite3"
+gem "sqlite3", "~> 1.3.0"
 gem "nokogiri", "1.6.7"
 
-group :active_record do
-  gem "sqlite3-ruby", :require => "sqlite3"
-end
-
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_4_1.gemfile

@@ -1,19 +1,14 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "rails", "~> 4.1.0"
-gem "rspec", "~> 3.0.0"
-gem "rspec-rails", "~> 3.0.0"
+gem "rails", "~> 4.1.14"
+gem "rspec", "~> 3.6.0"
+gem "rspec-rails", "~> 3.6.0"
 gem "timecop"
-gem "rspec_tag_matchers"
 gem "byebug"
 gem "appraisal"
-gem "sqlite3"
+gem "sqlite3", "~> 1.3.0"
 gem "nokogiri", "1.6.7"
 
-group :active_record do
-  gem "sqlite3-ruby", :require => "sqlite3"
-end
-
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_4_2.gemfile

@@ -1,19 +1,14 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
-gem "rspec", "~> 3.0.0"
-gem "rspec-rails", "~> 3.0.0"
+gem "rails", "~> 4.2.8"
+gem "rspec", "~> 3.6.0"
+gem "rspec-rails", "~> 3.6.0"
 gem "timecop"
-gem "rspec_tag_matchers"
 gem "byebug"
 gem "appraisal"
-gem "sqlite3"
+gem "sqlite3", "~> 1.3.0"
 gem "nokogiri", "1.6.7"
 
-group :active_record do
-  gem "sqlite3-ruby", :require => "sqlite3"
-end
-
-gemspec :path => "../"
+gemspec path: "../"

lib/validates_timeliness/attribute_methods.rb

@@ -33,15 +33,9 @@ module ValidatesTimeliness
         }.tap { |mod| include mod }
       end
 
-      def undefine_attribute_methods
-        super.tap { undefine_timeliness_attribute_methods }
-      end
-
       def undefine_timeliness_attribute_methods
-        generated_timeliness_methods.synchronize do
-          generated_timeliness_methods.module_eval do
-            instance_methods.each { |m| undef_method(m) } 
-          end
+        generated_timeliness_methods.module_eval do
+          instance_methods.each { |m| undef_method(m) } 
         end
       end
 
@@ -74,8 +68,10 @@ module ValidatesTimeliness
       @timeliness_cache[attr_name] = value
 
       if ValidatesTimeliness.use_plugin_parser
+        type = self.class.timeliness_attribute_type(attr_name)
         timezone = :current if self.class.timeliness_attribute_timezone_aware?(attr_name)
-        value = Timeliness::Parser.parse(value, self.class.timeliness_attribute_type(attr_name), :zone => timezone)
+        value = Timeliness::Parser.parse(value, type, :zone => timezone)
+        value = value.to_date if value && type == :date
       end
 
       @attributes[attr_name] = value

lib/validates_timeliness/conversion.rb

@@ -12,6 +12,8 @@ module ValidatesTimeliness
         value.to_date
       when :datetime
         value.is_a?(Time) ? value : value.to_time
+      else
+        value
       end
       if options[:ignore_usec] && value.is_a?(Time)
         Timeliness::Parser.make_time(Array(value).reverse[4..9], (:current if @timezone_aware))

lib/validates_timeliness/orm/active_model.rb

@@ -0,0 +1,20 @@
+module ValidatesTimeliness
+  module ORM
+    module ActiveModel
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        public
+
+        def define_attribute_methods(*attr_names)
+          super.tap { define_timeliness_methods}
+        end
+
+        def undefine_attribute_methods
+          super.tap { undefine_timeliness_attribute_methods }
+        end
+      end
+      
+    end
+  end
+end

lib/validates_timeliness/orm/active_record.rb

@@ -14,26 +14,26 @@ module ValidatesTimeliness
           timeliness_column_for_attribute(attr_name).type
         end
 
-        if ActiveModel.version >= Gem::Version.new('4.2')
+        if ::ActiveModel.version >= Gem::Version.new('4.2')
           def timeliness_column_for_attribute(attr_name)
-            columns_hash.fetch(attr_name.to_s) do |attr_name|
-              validation_type = _validators[attr_name.to_sym].find {|v| v.kind == :timeliness }.type.to_s
-              ::ActiveRecord::ConnectionAdapters::Column.new(attr_name, nil, lookup_cast_type(validation_type), validation_type)
+            columns_hash.fetch(attr_name.to_s) do |key|
+              validation_type = _validators[key.to_sym].find {|v| v.kind == :timeliness }.type.to_s
+              ::ActiveRecord::ConnectionAdapters::Column.new(key, nil, lookup_cast_type(validation_type), validation_type)
             end
           end
           
           def lookup_cast_type(sql_type)
             case sql_type
-            when 'datetime' then ::ActiveRecord::Type::DateTime.new 
-            when 'date' then ::ActiveRecord::Type::Date.new 
-            when 'time' then ::ActiveRecord::Type::Time.new 
+            when 'datetime' then ::ActiveRecord::Type::DateTime.new
+            when 'date' then ::ActiveRecord::Type::Date.new
+            when 'time' then ::ActiveRecord::Type::Time.new
             end
           end
         else
           def timeliness_column_for_attribute(attr_name)
-            columns_hash.fetch(attr_name.to_s) do |attr_name|
-              validation_type = _validators[attr_name.to_sym].find {|v| v.kind == :timeliness }.type.to_s
-              ::ActiveRecord::ConnectionAdapters::Column.new(attr_name, nil, validation_type)
+            columns_hash.fetch(attr_name.to_s) do |key|
+              validation_type = _validators[key.to_sym].find {|v| v.kind == :timeliness }.type.to_s
+              ::ActiveRecord::ConnectionAdapters::Column.new(key, nil, validation_type)
             end
           end
         end
@@ -53,7 +53,7 @@ module ValidatesTimeliness
             generated_timeliness_methods.synchronize do
               return unless @timeliness_methods_generated
               undefine_timeliness_attribute_methods 
-              @timeliness_methods_generated = true
+              @timeliness_methods_generated = false
             end
           }
         end

lib/validates_timeliness/validator.rb

@@ -56,7 +56,7 @@ module ValidatesTimeliness
     end
 
     # Rails 4.0 compatibility for old #setup method with class as arg
-    if ActiveModel.version <= Gem::Version.new('4.1')
+    if Gem::Version.new(ActiveModel::VERSION::STRING) <= Gem::Version.new('4.1')
       alias_method(:setup, :setup_timeliness_validated_attributes) 
     end
 
@@ -91,7 +91,7 @@ module ValidatesTimeliness
 
     def add_error(record, attr_name, message, value=nil)
       value = format_error_value(value) if value
-      message_options = { :message => options[:"#{message}_message"], :restriction => value }
+      message_options = { :message => options.fetch(:"#{message}_message", options[:message]), :restriction => value }
       record.errors.add(attr_name, message, message_options)
     end
 

lib/validates_timeliness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 end

spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'action_view'
 require 'timecop'
 
 require 'validates_timeliness'
+require 'validates_timeliness/orm/active_model'
 
 require 'support/test_model'
 require 'support/model_helpers'
@@ -30,14 +31,9 @@ I18n.available_locales = ['en', 'es']
 module TestModelShim
   extend ActiveSupport::Concern
   include ValidatesTimeliness::AttributeMethods
+  include ValidatesTimeliness::ORM::ActiveModel
 
   module ClassMethods
-    # Hook method for attribute method generation
-    def define_attribute_methods(attr_names)
-      super
-      define_timeliness_methods
-    end
-
     # Hook into native time zone handling check, if any
     def timeliness_attribute_timezone_aware?(attr_name)
       false
@@ -75,8 +71,8 @@ end
 class Employee < ActiveRecord::Base
   attr_accessor :redefined_birth_date_called
   validates_date :birth_date, :allow_nil => true
-  validates_date :birth_time, :allow_nil => true
-  validates_date :birth_datetime, :allow_nil => true
+  validates_time :birth_time, :allow_nil => true
+  validates_datetime :birth_datetime, :allow_nil => true
 
   def birth_date=(value)
     self.redefined_birth_date_called = true

spec/validates_timeliness/attribute_methods_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::AttributeMethods do
+RSpec.describe ValidatesTimeliness::AttributeMethods do
   it 'should define read_timeliness_attribute_before_type_cast instance method' do
     expect(PersonWithShim.new).to respond_to(:read_timeliness_attribute_before_type_cast)
   end

spec/validates_timeliness/conversion_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Conversion do
+RSpec.describe ValidatesTimeliness::Conversion do
   include ValidatesTimeliness::Conversion
 
   let(:options) { Hash.new }
@@ -176,7 +174,7 @@ describe ValidatesTimeliness::Conversion do
     it 'should return Time value for attribute method symbol which returns string time value' do
       value = '2010-01-01 12:00:00'
       person.birth_time = value
-      expect(evaluate_option_value(:birth_time, person)).to eq(Time.zone.local(2010,1,1,12,0,0))
+      expect(evaluate_option_value(:birth_time, person)).to eq(Time.local(2010,1,1,12,0,0))
     end
 
     context "restriction shorthand" do

spec/validates_timeliness/extensions/date_time_select_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
+RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
   include ActionView::Helpers::DateHelper
   attr_reader :person, :params
 

spec/validates_timeliness/extensions/multiparameter_handler_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe 'ValidatesTimeliness::Extensions::MultiparameterHandler' do
+RSpec.describe 'ValidatesTimeliness::Extensions::MultiparameterHandler' do
 
   context "time column" do
     it 'should assign a string value for invalid date portion' do

spec/validates_timeliness/helper_methods_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness, 'HelperMethods' do
+RSpec.describe ValidatesTimeliness, 'HelperMethods' do
   let(:record) { Person.new }
   
   it 'should define class validation methods' do

spec/validates_timeliness/orm/active_record_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness, 'ActiveRecord' do
+RSpec.describe ValidatesTimeliness, 'ActiveRecord' do
 
   context "validation methods" do
     let(:record) { Employee.new }
@@ -241,4 +239,16 @@ describe ValidatesTimeliness, 'ActiveRecord' do
       expect(Employee.define_attribute_methods).to be_falsey
     end
   end
+
+  context "undefine_attribute_methods" do
+    it "returns remove attribute methods that have already been generated" do
+      Employee.define_attribute_methods
+
+      expect(Employee.instance_methods).to include(:birth_datetime)
+
+      Employee.undefine_attribute_methods
+
+      expect(Employee.instance_methods).to_not include(:birth_datetime)
+    end
+  end
 end

spec/validates_timeliness/validator/after_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator, ":after option" do
+RSpec.describe ValidatesTimeliness::Validator, ":after option" do
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :after => Date.new(2010, 1, 1)

spec/validates_timeliness/validator/before_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator, ":before option" do
+RSpec.describe ValidatesTimeliness::Validator, ":before option" do
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :before => Date.new(2010, 1, 1)

spec/validates_timeliness/validator/is_at_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator, ":is_at option" do
+RSpec.describe ValidatesTimeliness::Validator, ":is_at option" do
   before do
     Timecop.freeze(Time.local(2010, 1, 1, 0, 0, 0))
   end

spec/validates_timeliness/validator/on_or_after_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator, ":on_or_after option" do
+RSpec.describe ValidatesTimeliness::Validator, ":on_or_after option" do
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :on_or_after => Date.new(2010, 1, 1)

spec/validates_timeliness/validator/on_or_before_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator, ":on_or_before option" do
+RSpec.describe ValidatesTimeliness::Validator, ":on_or_before option" do
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :on_or_before => Date.new(2010, 1, 1)

spec/validates_timeliness/validator_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator do
+RSpec.describe ValidatesTimeliness::Validator do
   before do
     Timecop.freeze(Time.local(2010, 1, 1, 0, 0, 0))
   end
@@ -89,6 +87,20 @@ describe ValidatesTimeliness::Validator do
     end
   end
 
+  describe ':message options' do
+    it 'should allow message option too' do
+      Person.validates_date :birth_date, on_or_after: :today, message: 'cannot be in past'
+      invalid!(:birth_date, Date.today - 5.days, 'cannot be in past')
+      valid!(:birth_date, Date.today)
+    end
+
+    it 'should first allow the defined message' do
+      Person.validates_date :birth_date, on_or_after: :today, on_or_after_message: 'cannot be in past', message: 'dummy message'
+      invalid!(:birth_date, Date.today - 5.days, 'cannot be in past')
+      valid!(:birth_date, Date.today)
+    end
+  end
+
   describe ":between option" do
     describe "array value" do
       it 'should be split option into :on_or_after and :on_or_before values' do

spec/validates_timeliness_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness do
+RSpec.describe ValidatesTimeliness do
 
   it 'should alias use_euro_formats to remove_us_formats on Timeliness gem' do
     expect(Timeliness).to respond_to(:remove_us_formats) 

validates_timeliness.gemspec

@@ -10,11 +10,12 @@ Gem::Specification.new do |s|
   s.description = %q{Adds validation methods to ActiveModel for validating dates and times. Works with multiple ORMS.}
   s.email       = %q{adam.meehan@gmail.com}
   s.homepage    = %q{http://github.com/adzap/validates_timeliness}
+  s.license     = "MIT"
 
   s.require_paths    = ["lib"]
   s.files            = `git ls-files`.split("\n") - %w{ .gitignore .rspec Gemfile Gemfile.lock autotest/discover.rb Appraisals Travis.yml } - Dir['gemsfiles/*']
   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.7"])
+  s.add_runtime_dependency(%q<timeliness>, [">= 0.3.10", "< 1"])
 end