devise_cas_authenticatable 1.1.3 → 1.1.4

data/.gitignore

@@ -6,3 +6,4 @@ spec/scenario/db/*.sqlite3
 spec/scenario/tmp/*
 log/*
 db/*
+Gemfile.*lock

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog for devise\_cas\_authenticatable
 
+## Version 1.1.4 - January 23, 2013
+
+* Bug fix: don't modify request.protocol when generating a logout_url (thanks [Tse-Ching Ho](https://github.com/tsechingho)!)
+
+## Version 1.1.3 - January 15, 2013
+
+* Rails 4 compatibility fixes (thanks [Aaron Patterson](https://github.com/tenderlove)!)
+* Support the service_url parameter in rubycas-client on logout (thanks [Kyle Ginavan](https://github.com/kylejginavan)!)
+
 ## Version 1.1.2 - May 23, 2012
 
 * Only do schema stuff if using Devise 2.0.x or below

data/Gemfile

@@ -3,6 +3,9 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in devise_cas_authenticatable.gemspec
 gemspec
 
+gem 'rails', '~> 3.2.0'
+gem 'devise', '~> 2.1.0'
+
 group :test do
   gem 'castronaut', :git => 'https://github.com/nbudin/castronaut.git', :branch => 'dam5s-merge'
 end

data/app/controllers/devise/cas_sessions_controller.rb

@@ -1,28 +1,25 @@
-class Devise::CasSessionsController < Devise::SessionsController  
+class Devise::CasSessionsController < Devise::SessionsController
   unloadable
-  
+
   def new
     unless returning_from_cas?
       redirect_to(cas_login_url)
     end
   end
-  
+
   def service
     redirect_to after_sign_in_path_for(warden.authenticate!(:scope => resource_name))
   end
-  
+
   def unregistered
   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)
@@ -31,39 +28,6 @@ class Devise::CasSessionsController < Devise::SessionsController
       reset_session
     end
 
-    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
-    
-    service_url = request.protocol
-    service_url << request.host
-    service_url << ":#{request.port.to_s}" unless request.port == 80
-
-    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)
   end
 
@@ -112,7 +76,7 @@ class Devise::CasSessionsController < Devise::SessionsController
 
     ::DeviseCasAuthenticatable::SingleSignOut::Strategies.current_strategy.delete_session_index(session_index)
   end
-  
+
   def session_store
   	@session_store ||= (Rails.respond_to?(:application) && Rails.application.config.session_store)
   end
@@ -125,4 +89,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.1.3"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nat Budin", "Jeremy Haile"]

data/spec/scenario/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -10,16 +11,27 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111002012903) do
+ActiveRecord::Schema.define(:version => 20121009092400) do
 
   create_table "sessions", :force => true do |t|
     t.string   "session_id", :null => false
     t.text     "data"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
   add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
 
+  create_table "users", :force => true do |t|
+    t.string   "username",            :null => false
+    t.datetime "remember_created_at"
+    t.string   "email"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.boolean  "deactivated"
+  end
+
+  add_index "users", ["username"], :name => "index_users_on_username", :unique => true
+
 end

data/spec/strategy_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Devise::Strategies::CasAuthenticatable, :type => "acceptance" do
   include RSpec::Rails::RequestExampleGroup
+  include Capybara::DSL
   
   before do    
     Devise.cas_base_url = "http://www.example.com/cas_server"
@@ -123,11 +124,10 @@ describe Devise::Strategies::CasAuthenticatable, :type => "acceptance" do
     User.find_by_username("newuser").should be_nil
 
     click_on "sign in using a different account"
-    click_on "here"
     current_url.should == cas_login_url
     fill_in "Username", :with => "joeuser"
     fill_in "Password", :with => "joepassword"
     click_on "Login"
     current_url.should == root_url
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_cas_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -224,7 +224,6 @@ files:
 - Gemfile.devise15
 - Gemfile.devise20
 - Gemfile.devise21
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -294,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -757729412372819420
+      hash: -1377956398748229167
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile.lock

@@ -1,194 +0,0 @@
-GIT
-  remote: https://github.com/nbudin/castronaut.git
-  revision: 241723963154550c415112f7568c33a4cd9e6021
-  branch: dam5s-merge
-  specs:
-    castronaut (0.7.5)
-      activerecord (>= 2.0)
-      activesupport (>= 2.0)
-      builder (>= 2.0.0)
-      crypt-isaac (~> 0.9)
-      json (>= 1.5.1)
-      sinatra (>= 1.0)
-
-PATH
-  remote: .
-  specs:
-    devise_cas_authenticatable (1.1.3)
-      devise (>= 1.0.6)
-      rubycas-client (>= 2.2.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.2)
-      actionpack (= 3.1.2)
-      mail (~> 2.3.0)
-    actionpack (3.1.2)
-      activemodel (= 3.1.2)
-      activesupport (= 3.1.2)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.0)
-    activemodel (3.1.2)
-      activesupport (= 3.1.2)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.2)
-      activemodel (= 3.1.2)
-      activesupport (= 3.1.2)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.2)
-      activemodel (= 3.1.2)
-      activesupport (= 3.1.2)
-    activesupport (3.1.2)
-      multi_json (~> 1.0)
-    addressable (2.2.6)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.0)
-    capybara (1.1.2)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.2.2)
-      ffi (~> 1.0.6)
-    coderay (0.9.8)
-    crypt-isaac (0.9.1)
-    devise (2.1.2)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    ffi (1.0.11)
-    hike (1.2.1)
-    i18n (0.6.0)
-    json (1.7.3)
-    json_pure (1.6.1)
-    launchy (2.0.5)
-      addressable (~> 2.2.6)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    method_source (0.6.7)
-      ruby_parser (>= 2.3.1)
-    mime-types (1.17.2)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.3.5)
-    nokogiri (1.5.0)
-    orm_adapter (0.4.0)
-    polyglot (0.3.3)
-    pry (0.9.7.3)
-      coderay (~> 0.9.8)
-      method_source (~> 0.6.7)
-      ruby_parser (>= 2.3.1)
-      slop (~> 2.1.0)
-    rack (1.3.6)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-protection (1.2.0)
-      rack
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.1.2)
-      actionmailer (= 3.1.2)
-      actionpack (= 3.1.2)
-      activerecord (= 3.1.2)
-      activeresource (= 3.1.2)
-      activesupport (= 3.1.2)
-      bundler (~> 1.0)
-      railties (= 3.1.2)
-    railties (3.1.2)
-      actionpack (= 3.1.2)
-      activesupport (= 3.1.2)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    rubycas-client (2.3.9)
-      activesupport
-    rubyzip (0.9.4)
-    selenium-webdriver (2.13.0)
-      childprocess (>= 0.2.1)
-      ffi (~> 1.0.9)
-      json_pure
-      rubyzip
-    sexp_processor (3.0.7)
-    sham_rack (1.3.3)
-      rack
-    shoulda (2.11.3)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    slop (2.1.0)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    warden (1.2.1)
-      rack (>= 1.0)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  capybara
-  castronaut!
-  crypt-isaac
-  devise_cas_authenticatable!
-  launchy
-  mocha
-  pry
-  rails (>= 3.0.7)
-  rspec-rails
-  sham_rack
-  shoulda
-  sqlite3-ruby