Let's try this instead

nbudin · Jan 15, 2013 · 130aab2 · 130aab2
1 parent 7127622
commit 130aab2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -188,7 +188,7 @@ DEPENDENCIES
   mocha
   pry
   rails (>= 3.0.7)
-  rspec-rails (>= 2.6.1)
+  rspec-rails
   sham_rack
   shoulda
   sqlite3-ruby
diff --git a/app/controllers/devise/cas_sessions_controller.rb b/app/controllers/devise/cas_sessions_controller.rb
@@ -57,9 +57,11 @@ def destroy
     service_url << request.host
     service_url << ":#{request.port.to_s}" unless request.port == 80
 
-    logout_url = case ::Devise.cas_client.method(:logout_url).arity
-    when 3 then ::Devise.cas_client.logout_url(destination_url, follow_url, ::Devise.cas_service_url(service_url, devise_mapping))
-    else ::Devise.cas_client.logout_url(destination_url, follow_url)
+    logout_url = begin
+      ::Devise.cas_client.logout_url(destination_url, follow_url, ::Devise.cas_service_url(service_url, devise_mapping))
+    rescue ArgumentError
+      # Older rubycas-clients don't accept a service_url
+      ::Devise.cas_client.logout_url(destination_url, follow_url)
     end
 
     redirect_to(logout_url)
@@ -123,4 +125,4 @@ def cas_login_url
     ::Devise.cas_client.add_service_to_login_url(::Devise.cas_service_url(request.url, devise_mapping))
   end
   helper_method :cas_login_url
-end
+end