From 76d61fee9899baad47f458852de70f73b4422da4 Mon Sep 17 00:00:00 2001 From: Luis Ezcurdia Date: Mon, 18 Dec 2017 20:29:16 -0600 Subject: [PATCH 1/2] replace Fixnum references --- .../models/password_archivable.rb | 2 +- .../models/password_expirable.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/devise_security_extension/models/password_archivable.rb b/lib/devise_security_extension/models/password_archivable.rb index 3913cfd8..10d48737 100644 --- a/lib/devise_security_extension/models/password_archivable.rb +++ b/lib/devise_security_extension/models/password_archivable.rb @@ -16,7 +16,7 @@ def validate_password_archive # validate is the password used in the past def password_archive_included? - unless deny_old_passwords.is_a? Fixnum + unless deny_old_passwords.is_a? Integer if deny_old_passwords.is_a? TrueClass and archive_count > 0 self.deny_old_passwords = archive_count else diff --git a/lib/devise_security_extension/models/password_expirable.rb b/lib/devise_security_extension/models/password_expirable.rb index 95184ded..3411eb53 100644 --- a/lib/devise_security_extension/models/password_expirable.rb +++ b/lib/devise_security_extension/models/password_expirable.rb @@ -13,7 +13,7 @@ module PasswordExpirable # is an password change required? def need_change_password? - if self.expire_password_after.is_a? Fixnum or self.expire_password_after.is_a? Float + if self.expire_password_after.is_a? Integer or self.expire_password_after.is_a? Float self.password_changed_at.nil? or self.password_changed_at < self.expire_password_after.seconds.ago else false @@ -22,7 +22,7 @@ def need_change_password? # set a fake datetime so a password change is needed and save the record def need_change_password! - if self.expire_password_after.is_a? Fixnum or self.expire_password_after.is_a? Float + if self.expire_password_after.is_a? Integer or self.expire_password_after.is_a? Float need_change_password self.save(:validate => false) end @@ -30,7 +30,7 @@ def need_change_password! # set a fake datetime so a password change is needed def need_change_password - if self.expire_password_after.is_a? Fixnum or self.expire_password_after.is_a? Float + if self.expire_password_after.is_a? Integer or self.expire_password_after.is_a? Float self.password_changed_at = self.expire_password_after.seconds.ago end @@ -39,7 +39,7 @@ def need_change_password self.password_changed_at end - + def expire_password_after self.class.expire_password_after end From b0c62ae2b62118f971ac5a69b039d74fc5b947f0 Mon Sep 17 00:00:00 2001 From: Luis Ezcurdia Date: Mon, 18 Dec 2017 20:32:50 -0600 Subject: [PATCH 2/2] cleanup travis file --- .travis.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 49014c87..fd50b0e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,7 @@ language: ruby -before_install: gem install bundler && bundler -v -install: bundle install --jobs=3 --retry=3 -before_script: bundle install -script: bundle exec rake rvm: - - 2.1.8 - - 2.2.4 - - ruby-head -matrix: - allow_failures: - - rvm: ruby-head + - 2.4.2 + - 2.3.6 + - 2.2.9 + - 2.1.9 +before_install: gem install bundler -v 1.16.0