devise_cas_authenticatable 1.0.0.alpha8 → 1.0.0.alpha10

data/Gemfile

@@ -1,7 +1,5 @@
 source "http://rubygems.org"
 
-gemspec
-
 gem 'devise'
 
 group :development do

data/Gemfile.lock

@@ -14,15 +14,6 @@ GIT
       sinatra (~> 1.0)
       sqlite3 (~> 1.3.1)
 
-PATH
-  remote: .
-  specs:
-    devise_cas_authenticatable (1.0.0.alpha7)
-      devise (>= 1.0.6)
-      devise
-      devise_cas_authenticatable
-      rubycas-client (>= 2.2.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -143,8 +134,6 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     ruby-net-ldap (0.0.4)
-    rubycas-client (2.2.1)
-      activesupport
     rubyzip (0.9.4)
     selenium-webdriver (0.1.2)
       childprocess (~> 0.1.5)
@@ -178,7 +167,6 @@ DEPENDENCIES
   castronaut!
   crypt-isaac
   devise
-  devise_cas_authenticatable!
   jeweler
   launchy
   mocha

data/Rakefile

@@ -34,7 +34,7 @@ begin
     gemspec.add_runtime_dependency "devise", ">= 1.0.6"
     gemspec.add_runtime_dependency "rubycas-client", ">= 2.2.1"
   end
-  Jeweler::GemcutterTasks.new
+  Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha8
+1.0.0.alpha10

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.alpha8"
+  s.version = "1.0.0.alpha10"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nat Budin"]
-  s.date = %q{2011-05-11}
+  s.date = %q{2011-06-08}
   s.description = %q{CAS authentication module for Devise}
   s.email = %q{natbudin@gmail.com}
   s.extra_rdoc_files = [
@@ -95,43 +95,22 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<devise_cas_authenticatable>, [">= 0"])
       s.add_runtime_dependency(%q<devise>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<devise>, [">= 1.0.6"])
       s.add_runtime_dependency(%q<rubycas-client>, [">= 2.2.1"])
     else
-      s.add_dependency(%q<devise_cas_authenticatable>, [">= 0"])
       s.add_dependency(%q<devise>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<devise>, [">= 1.0.6"])
       s.add_dependency(%q<rubycas-client>, [">= 2.2.1"])
     end
   else
-    s.add_dependency(%q<devise_cas_authenticatable>, [">= 0"])
     s.add_dependency(%q<devise>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<devise>, [">= 1.0.6"])
     s.add_dependency(%q<rubycas-client>, [">= 2.2.1"])
   end

data/lib/devise_cas_authenticatable/model.rb

@@ -19,7 +19,7 @@ module Devise
           ::Devise.cas_client.validate_service_ticket(ticket) unless ticket.has_been_validated?
           
           if ticket.is_valid?
-            conditions = {:username => ticket.response.user}
+            conditions = {::Devise.cas_username_column => ticket.response.user}
             
             # We don't want to override Devise 1.1's find_for_authentication
             resource = if respond_to?(:find_for_authentication)

data/lib/devise_cas_authenticatable/routes.rb

@@ -6,7 +6,7 @@ if ActionController::Routing.name =~ /ActionDispatch/
   
     def devise_cas_authenticatable(mapping, controllers)
       # service endpoint for CAS server
-      get "/", :to => "#{controllers[:cas_sessions]}#service", :as => ""
+      get "service", :to => "#{controllers[:cas_sessions]}#service", :as => "service"
       
       resource :session, :only => [], :controller => controllers[:cas_sessions], :path => "" do
         get :new, :path => mapping.path_names[:sign_in], :as => "new"
@@ -24,7 +24,7 @@ else
     
     def cas_authenticatable(routes, mapping)
       routes.with_options(:controller => 'devise/cas_sessions', :name_prefix => nil) do |session|
-        session.send(:"#{mapping.name}", '/', :action => 'service', :conditions => {:method => :get})
+        session.send(:"#{mapping.name}_service", '/', :action => 'service', :conditions => {:method => :get})
         session.send(:"unregistered_#{mapping.name}_session", '/unregistered', :action => "unregistered", :conditions => {:method => :get})
         session.send(:"new_#{mapping.name}_session", mapping.path_names[:sign_in], :action => 'new', :conditions => {:method => :get})
         session.send(:"#{mapping.name}_session", mapping.path_names[:sign_in], :action => 'create', :conditions => {:method => :post})

data/lib/devise_cas_authenticatable/strategy.rb

@@ -19,7 +19,7 @@ module Devise
           if resource = mapping.to.authenticate_with_cas_ticket(ticket)
             success!(resource)
           elsif ticket.is_valid?
-            redirect!(::Devise.cas_service_url(request.url, mapping) + "/unregistered", :username => ticket.response.user)
+            redirect!(::Devise.cas_unregistered_url(request.url, mapping), :username => ticket.response.user)
             #fail!("The user #{ticket.response.user} is not registered with this site.  Please use a different account.")
           else
             fail!(:invalid)

data/lib/devise_cas_authenticatable.rb

@@ -35,11 +35,15 @@ module Devise
   # Should devise_cas_authenticatable attempt to create new user records for
   # unknown usernames?  True by default.
   @@cas_create_user = true
+  
+  # The model attribute used for query conditions. Should be the same as
+  # the rubycas-server username_column. :username by default
+  @@cas_username_column = :username
 
   # 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
+  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
 
   def self.cas_create_user?
     cas_create_user
@@ -57,6 +61,15 @@ module Devise
   end
   
   def self.cas_service_url(base_url, mapping)
+    cas_action_url(base_url, mapping, "service")
+  end
+  
+  def self.cas_unregistered_url(base_url, mapping)
+    cas_action_url(base_url, mapping, "unregistered")
+  end
+  
+  private
+  def self.cas_action_url(base_url, mapping, action)
     u = URI.parse(base_url)
     u.query = nil
     u.path = if mapping.respond_to?(:fullpath)
@@ -64,6 +77,8 @@ module Devise
     else
       mapping.raw_path
     end
+    u.path << "/"
+    u.path << action
     u.to_s
   end
 end

data/spec/routes_spec.rb

@@ -3,15 +3,15 @@ require 'spec_helper'
 describe Devise::CasSessionsController do
   include RSpec::Rails::ControllerExampleGroup
   
-  it { should route(:get, "/users").to(:action => "service") }
+  it { should route(:get, "/users/service").to(:action => "service") }
   it { should route(:get, "/users/sign_in").to(:action => "new") }
   it { should route(:post, "/users/sign_in").to(:action => "create") }
   it { should route(:get, "/users/sign_out").to(:action => "destroy") }
   it { should route(:get, "/users/unregistered").to(:action => "unregistered") }
   
   it "should have the right route names" do
-    controller.should respond_to("user_path", "new_user_session_path", "user_session_path", "destroy_user_session_path")
-    controller.user_path.should == "/users"
+    controller.should respond_to("user_service_path", "new_user_session_path", "user_session_path", "destroy_user_session_path")
+    controller.user_service_path.should == "/users/service"
     controller.new_user_session_path.should == "/users/sign_in"
     controller.user_session_path.should == "/users/sign_in"
     controller.destroy_user_session_path.should == "/users/sign_out"

data/spec/strategy_spec.rb

@@ -20,7 +20,7 @@ describe Devise::Strategies::CasAuthenticatable, :type => "acceptance" do
   def cas_login_url
     @cas_login_url ||= begin
       uri = URI.parse(Devise.cas_base_url + "/login")
-      uri.query = Rack::Utils.build_nested_query(:service => user_url)
+      uri.query = Rack::Utils.build_nested_query(:service => user_service_url)
       uri.to_s
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: devise_cas_authenticatable
 version: !ruby/object:Gem::Version 
-  hash: -3702664340
+  hash: -3702664344
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - alpha
-  - 8
-  version: 1.0.0.alpha8
+  - 10
+  version: 1.0.0.alpha10
 platform: ruby
 authors: 
 - Nat Budin
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -04:00
+date: 2011-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,11 +31,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: devise_cas_authenticatable
+  name: devise
   version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,7 +45,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: devise
+  name: ruby-debug
   version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -59,110 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: ruby-debug
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: jeweler
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: ruby-debug
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   name: jeweler
-  version_requirements: *id006
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: ruby-debug
-  version_requirements: *id007
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: jeweler
-  version_requirements: *id008
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: ruby-debug
-  version_requirements: *id009
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: jeweler
-  version_requirements: *id010
+  version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -174,11 +76,11 @@ dependencies:
         - 6
         version: 1.0.6
   name: devise
-  version_requirements: *id011
+  version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -190,7 +92,7 @@ dependencies:
         - 1
         version: 2.2.1
   name: rubycas-client
-  version_requirements: *id012
+  version_requirements: *id005
   prerelease: false
 description: CAS authentication module for Devise
 email: natbudin@gmail.com