devise_cas_authenticatable 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5045437ac67c0de59651c56e17ef93d148d0c3ce
-  data.tar.gz: 8e103d5ea3b58c6920d7f913e495686389358c16
+  metadata.gz: 0fd1ffe6c25dc2058cd0af67774f494903499870
+  data.tar.gz: 860044267583de954f4c642d41cb938ad329b5c5
 SHA512:
-  metadata.gz: 33ca2e7317e10bfcba93ab009c24466f63cf16b58848c73af13682988e1b216864cc81aa9290f397340f22e82431fa5117643ec8cb24e9e023b690167da9ccca
-  data.tar.gz: 051b51fd7c164a1f3fde624a43c3272d840845ca2f6c53f4f0c588e70fe88f836895320a33d4b807158999792e8bb7ecb89617f8d89102b4dde3f4865041aa82
+  metadata.gz: b99de7fc043aad27818675b314fb652815e1f926eb53782c7ca414b5ee6c289bc6fb796ff32c3be795a1335616bd591aa4abb0721cd09393c167b4fce5e5c0b7
+  data.tar.gz: aebd6374f1595782c13f466b0fdea694913362bf84c08586134b1ff17dd1c4997654fac4f006526542b70115d9b040420db8670d7f478a909565f4b4e368c16d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog for devise\_cas\_authenticatable
 
+## Version 1.4.1 - July 23, 2015
+
+* Internal refactor to avoid conflicting with common route names, specifically logout_url (thanks to @eturino!)
+
 ## Version 1.4.0 - May 8, 2015
 
 * Allow changing the CAS response field used as the unique key for finding users (thanks once again to @gmoore!)

data/app/controllers/devise/cas_sessions_controller.rb

@@ -27,7 +27,7 @@ class Devise::CasSessionsController < Devise::SessionsController
       reset_session
     end
 
-    redirect_to(logout_url)
+    redirect_to(cas_logout_url)
   end
 
   def single_sign_out
@@ -83,7 +83,7 @@ class Devise::CasSessionsController < Devise::SessionsController
     @request_url
   end
 
-  def destination_url
+  def cas_destination_url
     return unless ::Devise.cas_logout_url_param == 'destination'
     if !::Devise.cas_destination_url.blank?
       url = Devise.cas_destination_url
@@ -93,7 +93,7 @@ class Devise::CasSessionsController < Devise::SessionsController
     end
   end
 
-  def follow_url
+  def cas_follow_url
     return unless ::Devise.cas_logout_url_param == 'follow'
     if !::Devise.cas_follow_url.blank?
       url = Devise.cas_follow_url
@@ -103,16 +103,16 @@ class Devise::CasSessionsController < Devise::SessionsController
     end
   end
 
-  def service_url
+  def cas_service_url
     ::Devise.cas_service_url(request_url.dup, devise_mapping)
   end
 
-  def logout_url
+  def cas_logout_url
     begin
-      ::Devise.cas_client.logout_url(destination_url, follow_url, service_url)
+      ::Devise.cas_client.logout_url(cas_destination_url, cas_follow_url, cas_service_url)
     rescue ArgumentError
       # Older rubycas-clients don't accept a service_url
-      ::Devise.cas_client.logout_url(destination_url, follow_url)
+      ::Devise.cas_client.logout_url(cas_destination_url, cas_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.4.0"
+  s.version = "1.4.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/model.rb

@@ -22,34 +22,21 @@ module Devise
             identifier = nil
             ticket_response = ticket.respond_to?(:user) ? ticket : ticket.response
 
-            if ::Devise.cas_user_identifier.blank?
-              identifier = ticket_response.user
-            else
-              identifier = ticket_response.extra_attributes[::Devise.cas_user_identifier]
-            end
+            identifier = extract_user_identifier(ticket_response)
 
-            # If cas_user_identifier isn't in extra_attributes, or the value is blank, then we're done here
-            if identifier.nil?
-              logger.warn("Could not find a value for [#{::Devise.cas_user_identifier}] in cas_extra_attributes so we cannot find the User.")
-              logger.warn("Make sure config.cas_user_identifier is set to a field that appears in cas_extra_attributes")
-              return nil 
-            end
+            # If cas_user_identifier isn't in extra_attributes,
+            # or the value is blank, then we're done here
+            return log_and_exit if identifier.nil?
 
             logger.debug("Using conditions {#{::Devise.cas_username_column} => #{identifier}} to find the User")
-            conditions = {::Devise.cas_username_column => identifier} 
-            # 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 should_create_cas_users?)
+
+            conditions = { ::Devise.cas_username_column => identifier }
+            resource = find_or_build_resource_from_conditions(conditions)
             return nil unless resource
             
-            if resource.respond_to? :cas_extra_attributes=
-              resource.cas_extra_attributes = ticket_response.extra_attributes
-            end
+            resource.cas_extra_attributes = ticket_response.extra_attributes \
+              if resource.respond_to?(:cas_extra_attributes=)
+
             resource.save
             resource
           end
@@ -59,6 +46,29 @@ module Devise
         def should_create_cas_users?
           respond_to?(:cas_create_user?) ? cas_create_user? : ::Devise.cas_create_user?
         end
+
+        def extract_user_identifier(response)
+          return response.user if ::Devise.cas_user_identifier.blank?
+          response.extra_attributes[::Devise.cas_user_identifier]
+        end
+
+        def log_and_exit
+          logger.warn("Could not find a value for [#{::Devise.cas_user_identifier}] in cas_extra_attributes so we cannot find the User.")
+          logger.warn("Make sure config.cas_user_identifier is set to a field that appears in cas_extra_attributes")
+          return nil
+        end
+
+        def find_or_build_resource_from_conditions(conditions)
+          resource = find_resource_with_conditions(conditions)
+          resource = new(conditions) if (resource.nil? and should_create_cas_users?)
+          return resource
+        end
+
+        def find_resource_with_conditions(conditions)
+          # We don't want to override Devise 1.1's find_for_authentication
+          return find_for_authentication(conditions) if respond_to?(:find_for_authentication)
+          find(:first, :conditions => conditions)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_cas_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Nat Budin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise