devise_cas_authenticatable 1.1.2 → 1.1.3

data/.travis.yml

@@ -2,5 +2,12 @@ rvm:
   - 1.8.7 # (current default)
   - 1.9.2
 gemfile:
-  - Gemfile
+  - Gemfile.devise10
+  - Gemfile.devise11
+  - Gemfile.devise12
+  - Gemfile.devise13
+  - Gemfile.devise14
+  - Gemfile.devise15
+  - Gemfile.devise20
+  - Gemfile.devise21
 script: "bundle exec rake spec"

data/Gemfile.devise10

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in devise_cas_authenticatable.gemspec
+gemspec
+
+gem 'rails', '~> 2.3.14'
+gem 'devise', '~> 1.0.0'
+gem 'rspec-rails', '~> 1.2.0'
+
+group :test do
+  gem 'castronaut', :git => 'https://github.com/nbudin/castronaut.git', :branch => 'dam5s-merge'
+end

data/Gemfile.devise11

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

data/Gemfile.devise12

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

data/Gemfile.devise13

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

data/Gemfile.devise14

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

data/Gemfile.devise15

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

data/Gemfile.devise20

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

data/Gemfile.devise21

@@ -0,0 +1,11 @@
+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/Gemfile.lock

@@ -14,7 +14,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_cas_authenticatable (1.1.2)
+    devise_cas_authenticatable (1.1.3)
       devise (>= 1.0.6)
       rubycas-client (>= 2.2.1)
 
@@ -64,11 +64,11 @@ GEM
       ffi (~> 1.0.6)
     coderay (0.9.8)
     crypt-isaac (0.9.1)
-    devise (2.1.0)
+    devise (2.1.2)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.7)
+      orm_adapter (~> 0.1)
       railties (~> 3.1)
-      warden (~> 1.1.1)
+      warden (~> 1.2.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     ffi (1.0.11)
@@ -90,7 +90,7 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.3.5)
     nokogiri (1.5.0)
-    orm_adapter (0.0.7)
+    orm_adapter (0.4.0)
     polyglot (0.3.3)
     pry (0.9.7.3)
       coderay (~> 0.9.8)
@@ -141,7 +141,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)
@@ -171,7 +171,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
-    warden (1.1.1)
+    warden (1.2.1)
       rack (>= 1.0)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -188,7 +188,7 @@ DEPENDENCIES
   mocha
   pry
   rails (>= 3.0.7)
-  rspec-rails (>= 2.6.1)
+  rspec-rails
   sham_rack
   shoulda
   sqlite3-ruby

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2010-2012 Nat Budin, Jeremy Haile and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -119,3 +119,9 @@ TODO
 ----
 
 * Test on non-ActiveRecord ORMs
+
+License
+-------
+
+`devise_cas_authenticatable` is released under the terms and conditions of the MIT license.  See the LICENSE file for more
+information.

data/Rakefile

@@ -4,7 +4,12 @@ require 'bundler/gem_tasks'
 Bundler.setup
 
 require 'rake'
-require 'rake/rdoctask'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rake/rdoctask'
+end
+
 require 'rspec/mocks/version'
 require 'rspec/core/rake_task'
 

data/app/controllers/devise/cas_sessions_controller.rb

@@ -8,8 +8,7 @@ class Devise::CasSessionsController < Devise::SessionsController
   end
   
   def service
-    warden.authenticate!(:scope => resource_name)
-    redirect_to after_sign_in_path_for(resource_name)
+    redirect_to after_sign_in_path_for(warden.authenticate!(:scope => resource_name))
   end
   
   def unregistered
@@ -54,7 +53,18 @@ class Devise::CasSessionsController < Devise::SessionsController
       end
     end
     
-    redirect_to(::Devise.cas_client.logout_url(destination_url, follow_url))
+    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
 
   def single_sign_out
@@ -108,11 +118,11 @@ class Devise::CasSessionsController < Devise::SessionsController
   end
 
   def returning_from_cas?
-    params[:ticket] || request.referer =~ /^#{::Devise.cas_client.cas_base_url}/
+    params[:ticket] || request.referer =~ /^#{::Devise.cas_client.cas_base_url}/ || request.referer =~ /^#{url_for :action => "service"}/
   end
-  
+
   def cas_login_url
     ::Devise.cas_client.add_service_to_login_url(::Devise.cas_service_url(request.url, devise_mapping))
   end
   helper_method :cas_login_url
-end
+end

data/devise_cas_authenticatable.gemspec

@@ -2,11 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_cas_authenticatable}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nat Budin", "Jeremy Haile"]
   s.description = %q{CAS authentication module for Devise}
+  s.license = "MIT"
   s.email = %q{natbudin@gmail.com}
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.files         = `git ls-files`.split("\n")
@@ -24,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<rubycas-client>, [">= 2.2.1"])
     
   s.add_development_dependency("rails", ">= 3.0.7")
-  s.add_development_dependency("rspec-rails", ">= 2.6.1")
+  s.add_development_dependency("rspec-rails")
   s.add_development_dependency("mocha")
   s.add_development_dependency("shoulda")
   s.add_development_dependency("sqlite3-ruby")

data/lib/devise_cas_authenticatable/model.rb

@@ -27,7 +27,7 @@ module Devise
               find(:first, :conditions => conditions)
             end
             
-            resource = new(conditions) if (resource.nil? and ::Devise.cas_create_user?)
+            resource = new(conditions) if (resource.nil? and should_create_cas_users?)
             return nil unless resource
             
             if resource.respond_to? :cas_extra_attributes=
@@ -37,6 +37,11 @@ module Devise
             resource
           end
         end
+
+        private
+        def should_create_cas_users?
+          respond_to?(:cas_create_user?) ? cas_create_user? : ::Devise.cas_create_user?
+        end
       end
     end
   end

data/lib/devise_cas_authenticatable/routes.rb

@@ -13,7 +13,7 @@ if ActionController::Routing.name =~ /ActionDispatch/
         get :new, :path => mapping.path_names[:sign_in], :as => "new"
         get :unregistered
         post :create, :path => mapping.path_names[:sign_in]
-        match :destroy, :path => mapping.path_names[:sign_out], :as => "destroy"
+        match :destroy, :path => mapping.path_names[:sign_out], :as => "destroy", :via => [:get, :post]
       end      
     end
   end

data/spec/scenario/app/models/user.rb

@@ -1,3 +1,7 @@
 class User < ActiveRecord::Base
   devise :cas_authenticatable, :rememberable
+
+  def active_for_authentication?
+    super && !deactivated
+  end
 end

data/spec/scenario/db/migrate/20100401102949_create_tables.rb

@@ -1,14 +1,16 @@
 class CreateTables < ActiveRecord::Migration
   def self.up
     create_table :users do |t|
-      t.cas_authenticatable
-      t.rememberable
+      t.string :username, :null => false
+      t.datetime :remember_created_at
       t.string :email
       t.timestamps
     end
+
+    add_index :users, :username, :unique => true
   end
 
   def self.down
     drop_table :users
   end
-end
+end

data/spec/scenario/db/migrate/20121009092400_add_deactivated_flag_to_users.rb

@@ -0,0 +1,9 @@
+class AddDeactivatedFlagToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :deactivated, :boolean
+  end
+
+  def self.down
+    remove_column :users, :deactivated
+  end
+end

data/spec/strategy_spec.rb

@@ -64,6 +64,19 @@ describe Devise::Strategies::CasAuthenticatable, :type => "acceptance" do
     sign_into_cas "invaliduser", "invalidpassword"
     current_url.should_not == root_url
   end
+
+  describe "with a deactivated user" do
+    before do 
+      @user = User.first
+      @user.deactivated = true
+      @user.save!
+    end
+
+    it "should fail to sign in" do
+      sign_into_cas "joeuser", "joepassword"
+      current_url.should == new_user_session_url
+    end
+  end
   
   it "should register new CAS users if set up to do so" do
     User.count.should == 1
@@ -75,6 +88,29 @@ describe Devise::Strategies::CasAuthenticatable, :type => "acceptance" do
     User.count.should == 2
     User.find_by_username("newuser").should_not be_nil
   end
+
+  it "should register new CAS users if we're overriding the cas_create_user? method" do
+    begin
+      class << User
+        def cas_create_user?
+          true
+        end
+      end
+
+      User.count.should == 1
+      TestAdapter.register_valid_user("newuser", "newpassword")
+      Devise.cas_create_user = false
+      sign_into_cas "newuser", "newpassword"
+      
+      current_url.should == root_url
+      User.count.should == 2
+      User.find_by_username("newuser").should_not be_nil
+    ensure
+      class << User
+        remove_method :cas_create_user?
+      end
+    end
+  end
   
   it "should fail CAS login if user is unregistered and cas_create_user is false" do
     User.count.should == 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_cas_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70287163104420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70287163104420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: rubycas-client
-  requirement: &70287163103900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70287163103900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70287163103300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +54,31 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70287163103300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70287163102760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287163102760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70287163102340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287163102340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70287163101840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287163101840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70287163101380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287163101380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sham_rack
-  requirement: &70287163100860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287163100860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70287163116740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +150,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287163116740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: crypt-isaac
-  requirement: &70287163115900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +166,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287163115900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70287163115460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +182,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287163115460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70287163114920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +198,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287163114920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CAS authentication module for Devise
 email: natbudin@gmail.com
 executables: []
@@ -156,7 +216,16 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile.devise10
+- Gemfile.devise11
+- Gemfile.devise12
+- Gemfile.devise13
+- Gemfile.devise14
+- Gemfile.devise15
+- Gemfile.devise20
+- Gemfile.devise21
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - app/controllers/devise/cas_sessions_controller.rb
@@ -204,13 +273,15 @@ files:
 - spec/scenario/config/rubycas-server.yml
 - spec/scenario/db/migrate/20100401102949_create_tables.rb
 - spec/scenario/db/migrate/20111002012903_add_sessions_table.rb
+- spec/scenario/db/migrate/20121009092400_add_deactivated_flag_to_users.rb
 - spec/scenario/db/schema.rb
 - spec/scenario/public/.gitkeep
 - spec/spec_helper.rb
 - spec/strategy_spec.rb
 - spec/support/migrations.rb
 homepage: http://github.com/nbudin/devise_cas_authenticatable
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -223,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3628489376454156530
+      hash: -757729412372819420
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -232,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: CAS authentication module for Devise
@@ -265,6 +336,7 @@ test_files:
 - spec/scenario/config/rubycas-server.yml
 - spec/scenario/db/migrate/20100401102949_create_tables.rb
 - spec/scenario/db/migrate/20111002012903_add_sessions_table.rb
+- spec/scenario/db/migrate/20121009092400_add_deactivated_flag_to_users.rb
 - spec/scenario/db/schema.rb
 - spec/scenario/public/.gitkeep
 - spec/spec_helper.rb