authpds 0.0.13 → 0.0.14

data/lib/authpds/institution.rb

@@ -1,4 +1,4 @@
-class Institution < Struct.new(:display_name, :name, :default_institution, 
+class Institution < Struct.new(:display_name, :name, :default, 
   :application_layout, :ip_addresses, :parent_institution, :view_attributes, :login_attributes)
   require 'ipaddr'
 
@@ -7,7 +7,10 @@ class Institution < Struct.new(:display_name, :name, :default_institution,
   # not actual Services!
   def initialize(h={})
     members.each {|m| self.send( ("#{m}=").to_sym , (h.delete("#{m}".to_sym) || h.delete("#{m}"))) }
-    default_institution = false unless default_institution
+    # If the institution is named default, take that as an
+    # indication that it's the default institution
+    default = true if name.eql?("default") or name.eql?("DEFAULT")
+    default = false unless default
     # Log the fact that there are left overs in the hash
     # Rails.logger.warn("The following institution settings were ignored: #{h.inspect}.") unless h.empty?
   end

data/lib/authpds/session.rb

@@ -10,7 +10,7 @@ module Authpds
   # further details about the module.
   # 
   # == Methods Available for Overriding
-  # :on_every_request:: Used for creating a UserSession without the User having to explicitly login, thereby supporting single sign-on. 
+  # :persist_session:: Used for creating a UserSession without the User having to explicitly login, thereby supporting single sign-on. 
   #                     When overridden, implementations should update the UserSession User, via UserSession#get_user based
   #                     on custom authentication/authorization criteria.  Authlogic will take care of the rest by saving the User
   #                     and creating the UserSession.
@@ -19,7 +19,7 @@ module Authpds
   # :login_url::  Should return a custom login URL for redirection to when logging in via a remote system.
   #               If undefined, /login will go to the UserSession login view,
   #               default user_session/new).  Preceded by :before_login.
-  # :after_login::  Used for creating a UserSession after login credentials are provided.  When overridden, 
+  # :validate_session::  Used for creating a UserSession after login credentials are provided.  When overridden, 
   #                 custom implementations should update the UserSession User, via UserSession#get_user based 
   #                 on authentication/authorization criteria.  Authlogic will take care of the rest
   #                 by saving the User and creating the UserSession.
@@ -53,12 +53,12 @@ module Authpds
   # === Persisting a UserSession in AuthLogic
   # When persisting a UserSession, Authlogic attempts to create the UserSession based on information available 
   # without having to perform an actual login by calling the :persisting? method. Authologic provides several callbacks from the :persisting?
-  # method, e.g. :before_persisting, :persist, :after_persisting.  We're using the :persist callback and setting it to :on_every_request.
+  # method, e.g. :before_persisting, :persist, :after_persisting.  We're using the :persist callback and setting it to :persist_session.
   # 
   # === Validating a UserSession in AuthLogic
   # When validating a UserSession, Authlogic attempts to create the UserSession based on information available 
   # from login by calling the :valid? method. Authologic provides several callbacks from the :valid?
-  # method, e.g. :before_validation, :validate, :after_validation.  We're using the :validate callback and setting it to :after_login.
+  # method, e.g. :before_validation, :validate, :after_validation.  We're using the :validate callback and setting it to :validate_session.
   #
   # === Access to the controller in UserSession
   # The class that UserSession extends, Authologic::Session::Base, has an explicit handle to the current controller via the instance method 
@@ -83,7 +83,7 @@ module Authpds
         include InstanceMethods
         include AuthlogicCallbackMethods
         persist :persist_session
-        validate :after_login
+        validate :validate_session
         before_destroy :before_logout
         after_destroy :after_logout
       end
@@ -143,6 +143,12 @@ module Authpds
         rw_config(:institution_param_key, value, "institute")
       end
       alias_method :institution_param_key=, :institution_param_key
+
+      # URL name for validation action
+      def validate_url_name(value = nil)
+        rw_config(:validate_url_name, value, "validate_url")
+      end
+      alias_method :validate_url_name=, :validate_url_name
     end 
     
     module AuthpdsCallbackMethods
@@ -270,7 +276,7 @@ module Authpds
       
     	# Returns the URL for validating a UserSession on return from a remote login system.
     	def validate_url(params={})
-    		url = controller.validate_url(:return_url => controller.user_session_redirect_url(params[:return_url]))
+    		url = controller.send(validate_url_name, :return_url => controller.user_session_redirect_url(params[:return_url]))
         return url if params.nil? or params.empty?
         url << "?" if url.match('\?').nil?
         params.each do |key, value|
@@ -279,6 +285,10 @@ module Authpds
         end
         return url
     	end
+    	
+      def validate_url_name
+        @validate_url_name ||= self.class.validate_url_name
+      end
 
       def institution_attributes
         @institution_attributes = 
@@ -333,7 +343,7 @@ module Authpds
       
       # Callback method from Authlogic.
       # Called while validating on session save.
-      def after_login
+      def validate_session
         authenticated? and authorized?
       end
 

data/lib/authpds/version.rb

@@ -1,3 +1,3 @@
 module Authpds
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/test/test_helper.rb

@@ -41,7 +41,7 @@ require File.dirname(__FILE__) + '/../lib/authpds' unless defined?(Authpds)
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 class ActiveSupport::TestCase
-  VALID_PDS_HANDLE_FOR_NYU = '5320129121113834981331135143'
+  VALID_PDS_HANDLE_FOR_NYU = '73201295126115517644686139782'
   VALID_PDS_HANDLE_FOR_NEWSCHOOL = '272201212284614806184193096120278'
   VALID_PDS_HANDLE_FOR_COOPER = '272201212284614806184193096120278'
   INVALID_PDS_HANDLE = "Invalid"
@@ -69,6 +69,10 @@ class Authlogic::TestCase::MockController
   def root_url
   end
 
+  def validate_url(options={})
+    return "http://railsapp.library.nyu.edu/validate?return_url=#{options[:return_url]}"
+  end
+
   def performed?
     false
   end

data/test/unit/user_session_test.rb

@@ -78,13 +78,13 @@ class UserSessionTest < ActiveSupport::TestCase
     assert_equal("N12162279", user_session.send(:attempted_record).username)
   end
   
-  test "after_login" do
+  test "validate_session" do
     user_session = UserSession.new
     assert_nil(controller.session["auth_test_credentials"])
     assert_nil(user_session.send(:attempted_record))
     assert_nil(user_session.record)
     assert_no_difference('User.count') {
-        user_session.send(:after_login)
+        user_session.send(:validate_session)
     }
     assert_nil(controller.session["auth_test_credentials"])
     assert_not_nil(user_session.send(:attempted_record))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authpds
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2151878220 !ruby/object:Gem::Requirement
+  requirement: &2151878120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151878220
+  version_requirements: *2151878120
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &2151876820 !ruby/object:Gem::Requirement
+  requirement: &2151876600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151876820
+  version_requirements: *2151876600
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2151872060 !ruby/object:Gem::Requirement
+  requirement: &2151871520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151872060
+  version_requirements: *2151871520
 description: Libraries that use Ex Libris products, can integrate Rails application
   with PDS to provide single sign-on across systems.
 email: