devise_cas_authenticatable 1.0.1 → 1.1.0

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# Changelog for devise\_cas\_authenticatable
+
+## Version 1.1.0 - March 5, 2012
+
+* Add configurable destination and follow URL support (thanks [Dyson Simmons](https://github.com/dyson)!)
+* Allow applications deployed at sub-URIs to work (thanks [Tod Detre](https://github.com/tod)!)
+* Only add trailing slash to base URI if it's not already present (thanks [joe81](https://github.com/joe81)!)
+* Some documentation updates.

data/Gemfile.lock

@@ -14,7 +14,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_cas_authenticatable (1.0.1)
+    devise_cas_authenticatable (1.1.0)
       devise (>= 1.0.6)
       rubycas-client (>= 2.2.1)
 
@@ -64,10 +64,11 @@ GEM
       ffi (~> 1.0.6)
     coderay (0.9.8)
     crypt-isaac (0.9.1)
-    devise (1.5.3)
+    devise (2.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
+      railties (~> 3.1)
+      warden (~> 1.1.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     ffi (1.0.11)
@@ -89,7 +90,7 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.0.4)
     nokogiri (1.5.0)
-    orm_adapter (0.0.5)
+    orm_adapter (0.0.6)
     polyglot (0.3.3)
     pry (0.9.7.3)
       coderay (~> 0.9.8)
@@ -140,7 +141,7 @@ GEM
       rspec (~> 2.7.0)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    rubycas-client (2.3.9)
+    rubycas-client (2.3.8)
       activesupport
     rubyzip (0.9.4)
     selenium-webdriver (2.13.0)
@@ -170,7 +171,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
-    warden (1.1.0)
+    warden (1.1.1)
       rack (>= 1.0)
     xpath (0.1.4)
       nokogiri (~> 1.3)

data/README.md

@@ -13,7 +13,7 @@ using [rubycas-server](http://github.com/gunark/rubycas-server)).
 Requirements
 ------------
 
-- Rails 2.3 or 3.0
+- Rails 2.3 or greater (works with 3.x versions as well)
 - Devise 1.0 or greater
 - rubycas-client
 
@@ -27,17 +27,11 @@ and in your config/environment.rb (on Rails 2.3):
     config.gem 'devise', :version => '~> 1.0.6'
     config.gem 'devise_cas_authenticatable'
 
-or Gemfile (Rails 3.0):
+or Gemfile (Rails 3.x):
 
     gem 'devise'
     gem 'devise_cas_authenticatable'
 
-Example
--------
-
-I've modified the devise_example application to work with this gem.  You can find the results
-[here](http://github.com/nbudin/devise_cas_example).
-    
 Setup
 -----
 
@@ -70,6 +64,15 @@ to tell your app how to talk to your CAS server:
       # config.cas_logout_url = "https://cas.myorganization.com/logout"
       # config.cas_validate_url = "https://cas.myorganization.com/serviceValidate"
       
+      # The CAS specification allows for the passing of a follow URL to be displayed when
+      # a user logs out on the CAS server. RubyCAS-Server also supports redirecting to a
+      # URL via the destination param. Set either of these urls and specify either nil,
+      # 'destination' or 'follow' as the logout_url_param. If the urls are blank but
+      # logout_url_param is set, a default will be detected for the service.
+      # config.cas_destination_url = 'https://cas.myorganization.com'
+      # config.cas_follow_url = 'https://cas.myorganization.com'
+      # config.cas_logout_url_param = nil
+
       # By default, devise_cas_authenticatable will create users.  If you would rather
       # require user records to already exist locally before they can authenticate via
       # CAS, uncomment the following line.

data/app/controllers/devise/cas_sessions_controller.rb

@@ -16,11 +16,14 @@ class Devise::CasSessionsController < Devise::SessionsController
   end
   
   def destroy
+    follow_url = nil
+    destination_url = nil
+    
     # Delete the ticket->session ID mapping if one exists for this session
     if ticket = session['cas_last_valid_ticket']
       ::DeviseCasAuthenticatable::SingleSignOut::Strategies.current_strategy.delete_session_index(ticket)
     end
-
+    
     # if :cas_create_user is false a CAS session might be open but not signed_in
     # in such case we destroy the session here
     if signed_in?(resource_name)
@@ -29,7 +32,29 @@ class Devise::CasSessionsController < Devise::SessionsController
       reset_session
     end
 
-    redirect_to(logout_url)
+    if ::Devise.cas_logout_url_param == 'destination'
+      if !::Devise.cas_destination_url.blank?
+        destination_url = Devise.cas_destination_url
+      else
+        destination_url = request.protocol
+        destination_url << request.host
+        destination_url << ":#{request.port.to_s}" unless request.port == 80
+        destination_url << after_sign_out_path_for(resource_name)
+      end
+    end
+    
+    if ::Devise.cas_logout_url_param == 'follow'
+      if !::Devise.cas_follow_url.blank?
+        follow_url = Devise.cas_follow_url
+      else
+        follow_url = request.protocol
+        follow_url << request.host
+        follow_url << ":#{request.port.to_s}" unless request.port == 80
+        follow_url << after_sign_out_path_for(resource_name)
+      end
+    end
+    
+    redirect_to(::Devise.cas_client.logout_url(destination_url, follow_url))
   end
 
   def single_sign_out
@@ -90,45 +115,4 @@ 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.1"
+  s.version = "1.1.0"
 
   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,7 +41,7 @@ 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
 
@@ -70,7 +70,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_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?
@@ -102,11 +102,19 @@ module Devise
     u = URI.parse(base_url)
     u.query = nil
     u.path = if mapping.respond_to?(:fullpath)
-      mapping.fullpath
+      if ENV['RAILS_RELATIVE_URL_ROOT']
+        ENV['RAILS_RELATIVE_URL_ROOT'] + mapping.fullpath
+      else
+        mapping.fullpath
+      end
     else
-      mapping.raw_path
+      if ENV['RAILS_RELATIVE_URL_ROOT']
+        ENV['RAILS_RELATIVE_URL_ROOT'] + mapping.raw_path
+      else
+        mapping.raw_path
+      end
     end
-    u.path << "/"
+    u.path << "/" unless u.path =~ /\/$/
     u.path << action
     u.to_s
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: devise_cas_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Nat Budin
@@ -9,176 +10,140 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720533560 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.6
+  version_requirements: *70212720533560
 - !ruby/object:Gem::Dependency
   name: rubycas-client
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720532860 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
+  version_requirements: *70212720532860
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720532160 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.7
+  version_requirements: *70212720532160
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720542700 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.1
+  version_requirements: *70212720542700
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720562620 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70212720562620
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720561540 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70212720561540
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720560820 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70212720560820
 - !ruby/object:Gem::Dependency
   name: sham_rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720559860 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70212720559860
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720559040 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70212720559040
 - !ruby/object:Gem::Dependency
   name: crypt-isaac
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720557960 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70212720557960
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720557100 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70212720557100
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212720576340 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70212720576340
 description: CAS authentication module for Devise
 email: natbudin@gmail.com
 executables: []
@@ -186,9 +151,10 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".gitignore"
-- ".project"
-- ".travis.yml"
+- .gitignore
+- .project
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -244,26 +210,30 @@ 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: -4204177157087710120
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: CAS authentication module for Devise
 test_files:
 - spec/routes_spec.rb

checksums.yaml

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