devise_cas_authenticatable 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4802438427502187764340e8d56cf908ee07ab47
+  data.tar.gz: 102f8c610d852576aeabcf993ccdcf5cfe1afe78
+SHA512:
+  metadata.gz: 0c9e3d4c11c0db81b7a89ac49c31a0bcf817e64e0c2d4a0c23af07374ff15c23d6bd21f43883fb85dee7899afdb9535b23881e12ef751b24b63667ee90c358e6
+  data.tar.gz: c5a8f955b0a8560a7ee7792307c91d412648e344112e569cab0927abc52782ca6d2b3400800fba1f16ee8e554e8d03815453b1205ec962f8e17448bbf9be754d

data/Gemfile.lock

@@ -14,7 +14,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_cas_authenticatable (1.0.0)
+    devise_cas_authenticatable (1.0.1)
       devise (>= 1.0.6)
       rubycas-client (>= 2.2.1)
 
@@ -140,7 +140,7 @@ GEM
       rspec (~> 2.7.0)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    rubycas-client (2.3.8)
+    rubycas-client (2.3.9)
       activesupport
     rubyzip (0.9.4)
     selenium-webdriver (2.13.0)

data/app/controllers/devise/cas_sessions_controller.rb

@@ -28,12 +28,8 @@ class Devise::CasSessionsController < Devise::SessionsController
     else
       reset_session
     end
-    destination = request.protocol
-    destination << request.host
-    destination << ":#{request.port.to_s}" unless request.port == 80
-    destination << after_sign_out_path_for(resource_name)
-    follow_url = destination
-    redirect_to(::Devise.cas_client.logout_url(destination, follow_url))
+
+    redirect_to(logout_url)
   end
 
   def single_sign_out
@@ -94,4 +90,45 @@ class Devise::CasSessionsController < Devise::SessionsController
     ::Devise.cas_client.add_service_to_login_url(::Devise.cas_service_url(request.url, devise_mapping))
   end
   helper_method :cas_login_url
+  
+  def request_url
+    return @request_url if @request_url
+    @request_url = request.protocol.dup
+    @request_url << request.host
+    @request_url << ":#{request.port.to_s}" unless request.port == 80
+    @request_url
+  end
+  
+  def destination_url
+    return unless ::Devise.cas_logout_url_param == 'destination'
+    if !::Devise.cas_destination_url.blank?
+      url = Devise.cas_destination_url
+    else
+      url = request_url.dup
+      url << after_sign_out_path_for(resource_name)
+    end
+  end
+
+  def follow_url
+    return unless ::Devise.cas_logout_url_param == 'follow'
+    if !::Devise.cas_follow_url.blank?
+      url = Devise.cas_follow_url
+    else
+      url = request_url.dup
+      url << after_sign_out_path_for(resource_name)
+    end
+  end
+  
+  def service_url
+    ::Devise.cas_service_url(request_url.dup, devise_mapping)
+  end
+
+  def logout_url
+    begin
+      ::Devise.cas_client.logout_url(destination_url, follow_url, service_url)
+    rescue ArgumentError
+      # Older rubycas-clients don't accept a service_url
+      ::Devise.cas_client.logout_url(destination_url, follow_url)
+    end
+  end
 end

data/devise_cas_authenticatable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_cas_authenticatable}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nat Budin", "Jeremy Haile"]

data/lib/devise_cas_authenticatable.rb

@@ -41,6 +41,15 @@ module Devise
   
   # The login URL of the CAS server.  If undefined, will default based on cas_base_url.
   @@cas_validate_url = nil
+  
+  # The destination url for logout.
+  @@cas_destination_url = nil
+
+  # The follow url for logout.
+  @@cas_follow_url = nil
+
+  # Which url to send with logout, destination or follow. Can either be nil, destination or follow.
+  @@cas_logout_url_param = nil
 
   # Should devise_cas_authenticatable enable single-sign-out? Requires use of a supported
   # session_store. Currently supports active_record or redis.
@@ -62,7 +71,7 @@ module Devise
   # Name of the parameter passed in the logout query 
   @@cas_destination_logout_param_name = nil
   
-  mattr_accessor :cas_base_url, :cas_login_url, :cas_logout_url, :cas_validate_url, :cas_create_user, :cas_destination_logout_param_name, :cas_username_column, :cas_enable_single_sign_out, :cas_single_sign_out_mapping_strategy
+  mattr_accessor :cas_base_url, :cas_login_url, :cas_logout_url, :cas_validate_url, :cas_destination_url, :cas_follow_url, :cas_logout_url_param, :cas_create_user, :cas_destination_logout_param_name, :cas_username_column, :cas_enable_single_sign_out, :cas_single_sign_out_mapping_strategy
 
   def self.cas_create_user?
     cas_create_user

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_cas_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
 - Nat Budin
@@ -10,140 +9,176 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70285889160260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70285889160260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: rubycas-client
-  requirement: &70285889146380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70285889146380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70285889118960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70285889118960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70285889058440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70285889058440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70285888996140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285888996140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70285888827440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285888827440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70285888797720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285888797720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sham_rack
-  requirement: &70285888698540 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285888698540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70285881569960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285881569960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: crypt-isaac
-  requirement: &70285881578980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285881578980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70285881590360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285881590360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70285881587400 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285881587400
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CAS authentication module for Devise
 email: natbudin@gmail.com
 executables: []
@@ -151,9 +186,9 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
-- .project
-- .travis.yml
+- ".gitignore"
+- ".project"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -209,30 +244,26 @@ files:
 - spec/support/migrations.rb
 homepage: http://github.com/nbudin/devise_cas_authenticatable
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3821931593297502505
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CAS authentication module for Devise
 test_files:
 - spec/routes_spec.rb