get specs running under ruby 2.4.1 and rails 5.1

Author: ccutrer

Gemfile

@@ -8,5 +8,5 @@ group :ldap do
 end
 
 group :active_resource do
-  gem "activeresource", ">= 2.3.12", "< 4.0"
+  gem "activeresource", ">= 2.3.12", "< 5.2"
 end

db/migrate/001_create_initial_structure.rb

@@ -1,4 +1,4 @@
-class CreateInitialStructure < ActiveRecord::Migration
+class CreateInitialStructure < ActiveRecord::Migration[4.2]
   def self.up
     # Oracle table names cannot exceed 30 chars...
     # See http://code.google.com/p/rubycas-server/issues/detail?id=15

db/migrate/002_add_indexes_for_performance.rb

@@ -1,4 +1,4 @@
-class AddIndexesForPerformance < ActiveRecord::Migration
+class AddIndexesForPerformance < ActiveRecord::Migration[4.2]
   def self.up
     add_index :casserver_lt,  :ticket
     add_index :casserver_st,  :ticket

lib/casserver/model/consumable.rb

@@ -18,12 +18,12 @@ def cleanup(max_lifetime, max_unconsumed_lifetime)
                           Time.now - max_lifetime,
                           Time.now - max_unconsumed_lifetime]
 
-          expired_tickets_count = count(:conditions => conditions)
+          expired_tickets_count = where(conditions).count
 
           $LOG.debug("Destroying #{expired_tickets_count} expired #{self.name.demodulize}"+
             "#{'s' if expired_tickets_count > 1}.") if expired_tickets_count > 0
 
-          destroy_all(conditions)
+          where(conditions).destroy_all
         end
       end
     end

lib/casserver/server.rb

@@ -532,9 +532,8 @@ def self.init_database!
             st.destroy
           end
 
-          pgts = CASServer::Model::ProxyGrantingTicket.find(:all,
-            :conditions => [CASServer::Model::ServiceTicket.quoted_table_name+".username = ?", tgt.username],
-            :include => :service_ticket)
+          pgts = CASServer::Model::ProxyGrantingTicket.where(casserver_st: { username: tgt.username }).
+              joins(:service_ticket)
           pgts.each do |pgt|
             $LOG.debug("Deleting Proxy-Granting Ticket '#{pgt}' for user '#{pgt.service_ticket.username}'")
             pgt.destroy

rubycas-server.gemspec

@@ -26,17 +26,17 @@ $gemspec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.post_install_message = "For more information on RubyCAS-Server, see http://rubycas.github.com"
 
-  s.add_dependency("activerecord", ">= 2.3.12", "< 4.0")
-  s.add_dependency("activesupport", ">= 2.3.12", "< 4.0")
+  s.add_dependency("activerecord", ">= 3.0", "< 5.2")
+  s.add_dependency("activesupport", ">= 3.0", "< 5.2")
   s.add_dependency("sinatra", "~> 1.0")
-  s.add_dependency("sinatra-r18n", '~> 1.1.0')
+  s.add_dependency("sinatra-r18n", '~> 2.1.7')
   s.add_dependency("crypt-isaac", "~> 0.9.1")
 
   s.add_development_dependency("rack-test")
   s.add_development_dependency("capybara", '1.1.2')
   s.add_development_dependency("rspec")
   s.add_development_dependency("rspec-core")
-  s.add_development_dependency("rake", "0.8.7")
+  s.add_development_dependency("rake", "~> 11.0")
   s.add_development_dependency("sqlite3", "~> 1.3.1")
   s.add_development_dependency("appraisal", "~> 0.4.1")
   s.add_development_dependency("guard", "~> 1.4.0")

spec/casserver/utils_spec.rb

@@ -11,13 +11,15 @@ module CASServer
   let(:params_with_password_filtered) { { 'password' => '******' } }
 
   it 'should log the controller action' do
-    $LOG.should_receive(:debug).with 'Processing application::instance_eval {}'
+    $LOG.should_receive(:<<).with "\n"
+    $LOG.should_receive(:debug).with 'Processing application::instance_exec {}'
 
     subject.log_controller_action('application', params)
   end
 
   it 'should filter password parameters in the log' do
-    $LOG.should_receive(:debug).with "Processing application::instance_eval #{params_with_password_filtered.inspect}"
+    $LOG.should_receive(:<<).with "\n"
+    $LOG.should_receive(:debug).with "Processing application::instance_exec #{params_with_password_filtered.inspect}"
 
     subject.log_controller_action('application', params_with_password)
   end