devise_cas_authenticatable 1.1.0 → 1.1.1

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog for devise\_cas\_authenticatable
 
+## Version 1.1.1 - April 2, 2012
+
+* Add cas_client_config_options so that users can add unsupported RubyCAS options such as encode_extra_attributes_as
+
 ## 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.
+* Some documentation updates.

data/Gemfile.lock

@@ -14,7 +14,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_cas_authenticatable (1.1.0)
+    devise_cas_authenticatable (1.1.1)
       devise (>= 1.0.6)
       rubycas-client (>= 2.2.1)
 

data/README.md

@@ -45,13 +45,18 @@ add database_authenticatable as this module is intended to replace it.
 You'll also need to set up the database schema for this:
 
     create_table :users do |t|
-      t.cas_authenticatable
+      t.string :username, :null => false
     end
 
-and, optionally, indexes:
+We also recommend putting a unique index on the `username` column:
 
     add_index :users, :username, :unique => true
 
+(Note: previously, devise\_cas\_authenticatable recommended using a `t.cas_authenticatable` method call to update the
+schema.  Devise 2.0 has deprecated this type of schema building method, so we now recommend just adding the `username`
+string column as above.  As of this writing, `t.cas_authenticatable` still works, but throws a deprecation warning in
+Devise 2.0.)
+
 Finally, you'll need to add some configuration to your config/initializers/devise.rb in order
 to tell your app how to talk to your CAS server:
 

data/devise_cas_authenticatable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_cas_authenticatable}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   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

@@ -70,8 +70,11 @@ module Devise
 
   # Name of the parameter passed in the logout query 
   @@cas_destination_logout_param_name = nil
+  
+  # Additional options for CAS client object
+  @@cas_client_config_options = {}
 
-  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
+  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, :cas_client_config_options
 
   def self.cas_create_user?
     cas_create_user
@@ -79,14 +82,20 @@ module Devise
 
   # Return a CASClient::Client instance based on configuration parameters.
   def self.cas_client
-    @@cas_client ||= CASClient::Client.new(
+    @@cas_client ||= begin
+      cas_options = {
         :cas_destination_logout_param_name => @@cas_destination_logout_param_name,
         :cas_base_url => @@cas_base_url,
         :login_url => @@cas_login_url,
         :logout_url => @@cas_logout_url,
         :validate_url => @@cas_validate_url,
         :enable_single_sign_out => @@cas_enable_single_sign_out
-      )
+      }
+      
+      cas_options.merge!(@@cas_client_config_options) if @@cas_client_config_options
+      
+      CASClient::Client.new(cas_options)
+    end
   end
   
   def self.cas_service_url(base_url, mapping)

data/spec/config_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+module Devise
+  def self.reset_cas_client!
+    @@cas_client = nil
+  end
+end
+
+describe Devise do
+  before do
+    Devise.cas_base_url = "http://www.example.com/cas_server"
+  end
+  
+  after { Devise.reset_cas_client! }
+  
+  it "should figure out the base URL correctly" do
+    Devise.cas_client.cas_base_url.should == "http://www.example.com/cas_server"
+  end
+  
+  it 'should accept extra options for the CAS client object' do
+    Devise.cas_client_config_options = { :encode_extra_attributes_as => :json }
+
+    conf_options = Devise.cas_client.instance_variable_get(:@conf_options)
+    conf_options.should_not be_nil
+    conf_options[:encode_extra_attributes_as].should == :json
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_cas_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70212720533560 !ruby/object:Gem::Requirement
+  requirement: &70115849206480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70212720533560
+  version_requirements: *70115849206480
 - !ruby/object:Gem::Dependency
   name: rubycas-client
-  requirement: &70212720532860 !ruby/object:Gem::Requirement
+  requirement: &70115849206000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70212720532860
+  version_requirements: *70115849206000
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70212720532160 !ruby/object:Gem::Requirement
+  requirement: &70115849205520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70212720532160
+  version_requirements: *70115849205520
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70212720542700 !ruby/object:Gem::Requirement
+  requirement: &70115849204900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70212720542700
+  version_requirements: *70115849204900
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70212720562620 !ruby/object:Gem::Requirement
+  requirement: &70115849204480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212720562620
+  version_requirements: *70115849204480
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70212720561540 !ruby/object:Gem::Requirement
+  requirement: &70115849432020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212720561540
+  version_requirements: *70115849432020
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70212720560820 !ruby/object:Gem::Requirement
+  requirement: &70115849431580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212720560820
+  version_requirements: *70115849431580
 - !ruby/object:Gem::Dependency
   name: sham_rack
-  requirement: &70212720559860 !ruby/object:Gem::Requirement
+  requirement: &70115849431160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212720559860
+  version_requirements: *70115849431160
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70212720559040 !ruby/object:Gem::Requirement
+  requirement: &70115849430740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212720559040
+  version_requirements: *70115849430740
 - !ruby/object:Gem::Dependency
   name: crypt-isaac
-  requirement: &70212720557960 !ruby/object:Gem::Requirement
+  requirement: &70115849430320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212720557960
+  version_requirements: *70115849430320
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70212720557100 !ruby/object:Gem::Requirement
+  requirement: &70115849429860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212720557100
+  version_requirements: *70115849429860
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70212720576340 !ruby/object:Gem::Requirement
+  requirement: &70115849429440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212720576340
+  version_requirements: *70115849429440
 description: CAS authentication module for Devise
 email: natbudin@gmail.com
 executables: []
@@ -176,6 +176,7 @@ files:
 - lib/devise_cas_authenticatable/single_sign_out/strategies/rails_cache.rb
 - lib/devise_cas_authenticatable/strategy.rb
 - rails/init.rb
+- spec/config_spec.rb
 - spec/routes_spec.rb
 - spec/scenario/.gitignore
 - spec/scenario/app/controllers/application_controller.rb
@@ -222,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4204177157087710120
+      hash: 3652027784105001669
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -236,6 +237,7 @@ signing_key:
 specification_version: 3
 summary: CAS authentication module for Devise
 test_files:
+- spec/config_spec.rb
 - spec/routes_spec.rb
 - spec/scenario/.gitignore
 - spec/scenario/app/controllers/application_controller.rb