Add rails 4.0, 4.1, 4.2 to test matrix. Fix issues with changes to qu…

…ery api and session_class config

.travis.yml

@@ -4,6 +4,9 @@ gemfile:
   - gemfiles/rails30.gemfile
   - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
+  - gemfiles/rails40.gemfile
+  - gemfiles/rails41.gemfile
+  - gemfiles/rails42.gemfile
 rvm:
   - 1.8.7
   - 1.9.2
@@ -25,3 +28,15 @@ matrix:
       gemfile: gemfiles/rails23.gemfile
     - rvm: rbx
       gemfile: gemfiles/rails23.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails41.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: jruby-18mode
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: jruby-18mode
+      gemfile: gemfiles/rails41.gemfile
+    - rvm: jruby-18mode
+      gemfile: gemfiles/rails42.gemfile

Gemfile

@@ -6,7 +6,7 @@ group :tools do
   gem "guard"
   gem "guard-rspec"
   gem "guard-bundler"
-  gem "fuubar"
+  gem "fuubar", "~> 1.0"
   gem "rb-fsevent"
   gem "ruby_gntp", :group => :darwin
 end

gemfiles/rails40.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+gem "activerecord", require: 'active_record'
+gem "activerecord-session_store"
+gemspec :path=>"../"

gemfiles/rails41.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+gem "activerecord", require: 'active_record'
+gem "activerecord-session_store"
+gemspec :path=>"../"

gemfiles/rails42.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "activerecord", require: 'active_record'
+gem "activerecord-session_store"
+gemspec :path=>"../"

lib/casclient/tickets/storage.rb

@@ -29,7 +29,11 @@ def get_session_for_service_ticket(st)
           session_id = read_service_session_lookup(st)
           unless session_id.nil?
             # This feels a bit hackish, but there isn't really a better way to go about it that I am aware of yet
-            session = ActiveRecord::SessionStore.session_class.find(:first, :conditions => {:session_id => session_id})
+            if ActiveRecord::SessionStore.respond_to?(:session_class)
+              session = ActiveRecord::SessionStore.session_class.find(:first, :conditions => {:session_id => session_id})
+            else
+              session = ActionDispatch::Session::ActiveRecordStore.session_class.find_by(:session_id => session_id)
+            end
           else
             log.warn("Couldn't destroy session service ticket #{st} because no corresponding session id could be found.")
           end
@@ -106,7 +110,7 @@ def store_service_session_lookup(st, controller)
 
         # Returns the local Rails session ID corresponding to the given
         # ServiceTicket. This is done by reading the contents of the
-        # cas_sess.<session ticket> file created in a prior call to 
+        # cas_sess.<session ticket> file created in a prior call to
         # #store_service_session_lookup.
         def read_service_session_lookup(st)
           raise CASException, "No service_ticket specified." if st.nil?

lib/casclient/tickets/storage/active_record_ticket_store.rb

@@ -9,15 +9,19 @@ module Storage
       # Proxy Granting Tickets and their IOUs are stored in the cas_pgtious table.
       #
       # This ticket store takes the following config parameters
-      # :pgtious_table_name - the name of the table 
+      # :pgtious_table_name - the name of the table
       class ActiveRecordTicketStore < AbstractTicketStore
 
         def initialize(config={})
           config ||= {}
           if config[:pgtious_table_name]
             CasPgtiou.set_table_name = config[:pgtious_table_name]
           end
-          ActiveRecord::SessionStore.session_class = ServiceTicketAwareSession
+          if ActiveRecord::SessionStore.respond_to?(:session_class=)
+            ActiveRecord::SessionStore.session_class = ServiceTicketAwareSession
+          else
+            ActionDispatch::Session::ActiveRecordStore.session_class = ServiceTicketAwareSession
+          end
         end
 
         def store_service_session_lookup(st, controller)

rubycas-client.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("activesupport")
   gem.add_development_dependency("rake")
-  gem.add_development_dependency("database_cleaner", "~> 0.9.1")
+  gem.add_development_dependency("database_cleaner", "~> 1.0.0")
   gem.add_development_dependency("json")
-  gem.add_development_dependency("rspec")
+  gem.add_development_dependency("rspec", "~> 2.0")
   gem.add_development_dependency("appraisal")
   gem.add_development_dependency("rails")
   gem.add_development_dependency("simplecov")

spec/support/shared_examples_for_ticket_stores.rb

@@ -50,7 +50,11 @@
       end
       context "the session" do
         it "should be destroyed" do
-          ActiveRecord::SessionStore.session_class.find(:first, :conditions => {:session_id => session.session_id}).should be_nil
+          if ActiveRecord::SessionStore.respond_to?(:session_class=)
+            ActiveRecord::SessionStore.session_class.find(:first, :conditions => {:session_id => session.session_id}).should be_nil
+          else
+            ActionDispatch::Session::ActiveRecordStore.session_class.find_by(:session_id => session.session_id).should be_nil
+          end
         end
       end
       it "should destroy session for the given service ticket" do