devise_cas_authenticatable 1.0.0.alpha2 → 1.0.0.alpha3

data/README.md

@@ -13,18 +13,28 @@ using [rubycas-server](http://github.com/gunark/rubycas-server)).
 Requirements
 ------------
 
-- Rails 2.3
-- Devise 1.0 (tested on 1.0.6)
-- rubycas-client 2.1
+- Rails 2.3 or 3.0
+- Devise 1.0 (for Rails 2.3) or 1.1 (for Rails 3.0)
+- rubycas-client
 
 Installation
 ------------
 
     gem install --pre devise_cas_authenticatable
     
-and in your config/environment.rb:
+and in your config/environment.rb (on Rails 2.3):
 
     config.gem 'devise_cas_authenticatable'
+
+or Gemfile (Rails 3.0):
+
+    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
 -----
@@ -101,4 +111,3 @@ TODO
 * Implement CAS single sign-off support (maybe via a Rack middleware?)
 * Write test suite
 * Test on non-ActiveRecord ORMs
-* Test on Rails 3/Devise 1.1            

data/Rakefile

@@ -32,10 +32,10 @@ begin
     gemspec.email = "natbudin@gmail.com"
     gemspec.homepage = "http://github.com/nbudin/devise_cas_authenticatable"
     gemspec.authors = ["Nat Budin"]
-    gemspec.add_runtime_dependency "devise", "~> 1.0.6"
+    gemspec.add_runtime_dependency "devise", ">= 1.0.6"
     gemspec.add_runtime_dependency "rubycas-client", "~> 2.1.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+end

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha2
+1.0.0.alpha3

data/app/controllers/devise/cas_sessions_controller.rb

@@ -0,0 +1,18 @@
+class Devise::CasSessionsController < Devise::SessionsController  
+  def service
+    if signed_in?(resource_name)
+      redirect_to after_sign_in_path_for(resource_name)
+    else
+      redirect_to root_url
+    end
+  end
+  
+  def destroy
+    sign_out(resource_name)
+    destination = request.protocol
+    destination << request.host
+    destination << ":#{request.port.to_s}" unless request.port == 80
+    destination << after_sign_out_path_for(resource_name)
+    redirect_to(::Devise.cas_client.logout_url(destination))
+  end
+end

data/devise_cas_authenticatable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_cas_authenticatable}
-  s.version = "1.0.0.alpha2"
+  s.version = "1.0.0.alpha3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nat Budin"]
-  s.date = %q{2010-05-06}
+  s.date = %q{2010-08-27}
   s.description = %q{CAS authentication module for Devise}
   s.email = %q{natbudin@gmail.com}
   s.extra_rdoc_files = [
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
-     "app/controllers/cas_sessions_controller.rb",
+     "app/controllers/devise/cas_sessions_controller.rb",
      "devise_cas_authenticatable.gemspec",
      "lib/devise_cas_authenticatable.rb",
      "lib/devise_cas_authenticatable/exceptions.rb",
@@ -33,22 +33,22 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/nbudin/devise_cas_authenticatable}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{CAS authentication module for Devise}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<devise>, ["~> 1.0.6"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<devise>, [">= 1.0.6"])
       s.add_runtime_dependency(%q<rubycas-client>, ["~> 2.1.0"])
     else
-      s.add_dependency(%q<devise>, ["~> 1.0.6"])
+      s.add_dependency(%q<devise>, [">= 1.0.6"])
       s.add_dependency(%q<rubycas-client>, ["~> 2.1.0"])
     end
   else
-    s.add_dependency(%q<devise>, ["~> 1.0.6"])
+    s.add_dependency(%q<devise>, [">= 1.0.6"])
     s.add_dependency(%q<rubycas-client>, ["~> 2.1.0"])
   end
 end

data/lib/devise_cas_authenticatable.rb

@@ -7,7 +7,18 @@ require 'devise_cas_authenticatable/exceptions'
 
 require 'rubycas-client'
 
-module Devise
+# Register as a Rails engine if Rails::Engine exists
+begin
+  Rails::Engine
+rescue
+else
+  module DeviseCasAuthenticatable
+    class Engine < Rails::Engine
+    end
+  end
+end
+
+module Devise  
   mattr_accessor :cas_base_url
   @@cas_base_url = nil
   
@@ -36,4 +47,5 @@ end
 Devise.add_module(:cas_authenticatable,
   :strategy => true,
   :controller => :cas_sessions,
+  :route => :cas_authenticatable,
   :model => 'devise_cas_authenticatable/model')

data/lib/devise_cas_authenticatable/model.rb

@@ -4,22 +4,25 @@ module Devise
       def self.included(base)
         base.extend ClassMethods
       end
-            
+      
       module ClassMethods
         def authenticate_with_cas_ticket(ticket)
           ::Devise.cas_client.validate_service_ticket(ticket) unless ticket.has_been_validated?
           
           if ticket.is_valid?
-            logger.debug "Ticket is valid and is for user #{ticket.response.user}"
             conditions = {:username => ticket.response.user}
-            puts conditions.inspect
             
-            resource = find_for_cas_authentication(conditions)
+            # We don't want to override Devise 1.1's find_for_authentication
+            resource = if respond_to?(:find_for_authentication)
+              find_for_authentication(conditions)
+            else
+              find(:first, :conditions => conditions)
+            end
+            
             resource = new(conditions) if (resource.nil? and ::Devise.cas_create_user)
             return nil unless resource
             
             if resource.new_record?
-              logger.debug "Creating new user record"
               if resource.respond_to? :cas_extra_attributes=
                 resource.cas_extra_attributes = ticket.response.extra_attributes
               end
@@ -27,23 +30,14 @@ module Devise
               create(conditions)
             else
               if resource.respond_to? :cas_extra_attributes=
-                logger.debug "Updating existing user record"
                 resource.cas_extra_attributes = ticket.response.extra_attributes
                 resource.save
               end
               
               resource
             end
-          else
-            logger.debug "Ticket is invalid"
-            return nil
           end
         end
-        
-        protected
-        def find_for_cas_authentication(conditions)
-          self.find(:first, :conditions => conditions)
-        end
       end
     end
   end

data/lib/devise_cas_authenticatable/routes.rb

@@ -1,11 +1,33 @@
-ActionController::Routing::RouteSet::Mapper.class_eval do
-  protected
+if ActionController::Routing.name =~ /ActionDispatch/
+  # Rails 3
   
-  def cas_authenticatable(routes, mapping)
-    routes.with_options(:controller => 'cas_sessions', :name_prefix => nil) do |session|
-      session.send(:"new_#{mapping.name}_session", mapping.path_names[:sign_in], :action => 'create', :conditions => {:method => :get})
-      session.send(:"#{mapping.name}_session", mapping.path_names[:sign_in], :action => 'create', :conditions => {:method => :post})
-      session.send(:"destroy_#{mapping.name}_session", mapping.path_names[:sign_out], :action => 'destroy', :conditions => { :method => :get })
+  ActionDispatch::Routing::Mapper.class_eval do
+    protected
+  
+    def devise_cas_authenticatable(mapping, controllers)
+      scope :controller => controllers[:cas_sessions], :as => :session do
+        # service endpoint for CAS server
+        get "/", :to => "#{controllers[:cas_sessions]}#service"
+      
+        get :new, :path => mapping.path_names[:sign_in], :to => "#{controllers[:cas_sessions]}#create"
+        get :create, :path => mapping.path_names[:sign_in], :as => ""
+        get :destroy, :path => mapping.path_names[:sign_out]
+      end
+    end
+  end
+else
+  # Rails 2
+  
+  ActionController::Routing::RouteSet::Mapper.class_eval do
+    protected
+    
+    def cas_authenticatable(routes, mapping)
+      routes.with_options(:controller => 'devise/cas_sessions', :name_prefix => nil) do |session|
+        session.connect('/', :action => 'service', :conditions => {:method => :get})
+        session.send(:"new_#{mapping.name}_session", mapping.path_names[:sign_in], :action => 'create', :conditions => {:method => :get})
+        session.send(:"#{mapping.name}_session", mapping.path_names[:sign_in], :action => 'create', :conditions => {:method => :post})
+        session.send(:"destroy_#{mapping.name}_session", mapping.path_names[:sign_out], :action => 'destroy', :conditions => { :method => :get })
+      end
     end
   end
-end
+end

data/lib/devise_cas_authenticatable/schema.rb

@@ -1,5 +1,13 @@
-Devise::Schema.class_eval do
-  def cas_authenticatable
-    apply_schema :username, String
+require 'devise/schema'
+
+module Devise
+  module Schema
+    def cas_authenticatable
+      if respond_to? :apply_devise_schema
+        apply_devise_schema :username, String
+      else
+        apply_schema :username, String
+      end
+    end
   end
-end
+end

data/lib/devise_cas_authenticatable/strategy.rb

@@ -9,7 +9,6 @@ module Devise
       
       def authenticate!
         ticket = read_ticket(params)
-        RAILS_DEFAULT_LOGGER.debug "Received CAS ticket: #{ticket.inspect}"
         if ticket
           if resource = mapping.to.authenticate_with_cas_ticket(ticket)
             success!(resource)
@@ -27,22 +26,26 @@ module Devise
       def returning_from_cas?
         request.referer =~ /^#{::Devise.cas_client.cas_base_url}/
       end
-      
-      def service_url
-        url = URI.parse(request.url)
-        url.path = "#{mapping.parsed_path}/#{mapping.path_names[:sign_in]}"
-        url.query = nil
-        url.to_s
-      end
-      
+     
       def login_url
         ::Devise.cas_client.add_service_to_login_url(service_url)
       end
+      
+      def service_url
+        u = URI.parse(request.url)
+        u.query = nil
+        u.path = if mapping.respond_to?(:fullpath)
+          mapping.fullpath
+        else
+          mapping.raw_path
+        end
+        u.to_s
+      end
   
       def read_ticket(params)
         ticket = params[:ticket]
         return nil unless ticket
-      
+              
         if ticket =~ /^PT-/
           ::CASClient::ProxyTicket.new(ticket, service_url, params[:renew])
         else

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: devise_cas_authenticatable
 version: !ruby/object:Gem::Version 
+  hash: -1710980575
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - alpha2
-  version: 1.0.0.alpha2
+  - alpha3
+  version: 1.0.0.alpha3
 platform: ruby
 authors: 
 - Nat Budin
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -04:00
+date: 2010-08-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: devise
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 0
@@ -36,9 +39,11 @@ dependencies:
   name: rubycas-client
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 1
@@ -59,7 +64,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- app/controllers/cas_sessions_controller.rb
+- app/controllers/devise/cas_sessions_controller.rb
 - devise_cas_authenticatable.gemspec
 - lib/devise_cas_authenticatable.rb
 - lib/devise_cas_authenticatable/exceptions.rb
@@ -78,16 +83,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -96,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: CAS authentication module for Devise

data/app/controllers/cas_sessions_controller.rb

@@ -1,23 +0,0 @@
-class CasSessionsController < ApplicationController
-  include Devise::Controllers::InternalHelpers
-  
-  def create
-    resource = authenticate(resource_name)
-    if resource
-      sign_in_and_redirect(resource)
-    elsif warden.result == :redirect
-      throw :warden, :scope => resource_name
-    else
-      throw InvalidCasTicketException.new(params[:ticket])
-    end
-  end
-      
-  def destroy
-    sign_out(resource_name)
-    destination = request.protocol
-    destination << request.host
-    destination << ":#{request.port.to_s}" unless request.port == 80
-    destination << after_sign_out_path_for(resource_name)
-    redirect_to(::Devise.cas_client.logout_url(destination))
-  end
-end