authpds 0.0.22 → 0.0.23

data/lib/authpds/controllers/authpds_sessions_controller.rb

@@ -20,7 +20,7 @@ module Authpds
     	# GET /logout
     	def destroy
     		user_session = UserSession.find
-    		logout_url = user_session.logout_url(params)
+    		logout_url = user_session.logout_url(params) unless user_session.nil?
     		user_session.destroy unless user_session.nil?
     		redirect_to user_session_redirect_url(logout_url)
     	end

data/lib/authpds/institution.rb

@@ -1,5 +1,5 @@
 class Institution < Struct.new(:display_name, :name, :default,
-  :layouts, :ip_addresses, :parent_institution, :view_attributes, :login_attributes)
+  :layouts, :ip_addresses, :parent_institution, :views, :login)
   require 'ipaddr'
 
   # Better initializer than Struct gives us, take a hash instead

data/lib/authpds/session.rb

@@ -152,7 +152,7 @@ module Authpds
 
       # URL to redirect to after logout.
       def logout_url(params={})
-        return "#{self.class.pds_url}/pds?func=logout&url=#{CGI::escape(CGI::escape(self.class.redirect_logout_url))}"
+        return "#{self.class.pds_url}/pds?func=logout&url=#{CGI::escape(controller.user_session_redirect_url(self.class.redirect_logout_url))}"
       end
       
       # URL to redirect to in the case of establishing a SSO session.
@@ -241,8 +241,8 @@ module Authpds
 
       def institution_attributes
         @institution_attributes = 
-          (controller.current_primary_institution.nil? or controller.current_primary_institution.login_attributes.nil?) ?
-            {} : controller.current_primary_institution.login_attributes
+          (controller.current_primary_institution.nil? or controller.current_primary_institution.login.nil?) ?
+            {} : controller.current_primary_institution.login
       end
       
       def pds_attributes

data/lib/authpds/version.rb

@@ -1,3 +1,3 @@
 module Authpds
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

data/test/support/config/institutions.yml

@@ -1,10 +1,10 @@
 NYU:
-  login_attributes:
+  login:
     link_code: NYU
     logout_url: 'http://bobcat.library.nyu.edu'
   default: false
   display_name: NYU Libraries
-  view_attributes:
+  views:
     test_view_attribute1: test_attribute1_nyu
     test_view_attribute2: test_attribute2_nyu
   ip_addresses:
@@ -18,41 +18,41 @@ NYU:
 NYUAD:
   default: true
   display_name: NYUAD Library
-  view_attributes:
+  views:
     test_view_attribute1: test_attribute1_nyuad
     test_view_attribute2: test_attribute2_nyuad
   ip_addresses:
     - 128.122.0.1
 
 NYSID:
-  login_attributes:
+  login:
     link_code: NYSID
     logout_url: 'http://bobcat.library.nyu.edu/nysid'
   default: false
   display_name: New York School of Interior Design Library
-  view_attributes:
+  views:
     test_view_attribute1: test_attribute1_nysid
     test_view_attribute2: test_attribute2_nysid
   ip_addresses:
     - 128.122.0.1
 
 CU:
-  login_attributes:
+  login:
     link_code: CU
     logout_url: 'http://bobcat.library.nyu.edu/cooper'
   display_name: Cooper Union Library
-  view_attributes:
+  views:
     test_view_attribute1: test_attribute1_cu
     test_view_attribute2: test_attribute2_cu
   ip_addresses:
     - 199.98.16.0-199.98.31.255 
 
 NS:
-  login_attributes:
+  login:
     link_code: NS
     logout_url: 'http://bobcat.library.nyu.edu/newschool'
   display_name: New School Libraries
-  view_attributes:
+  views:
     test_view_attribute1: test_attribute1_ns
     test_view_attribute2: test_attribute2_ns
   ip_addresses:

data/test/support/config/institutions2.yml

@@ -12,9 +12,9 @@ default:
   layouts: 
     resolve: layouts/nyu/resolve
     search: layouts/nyu/search
-  login_attributes:
+  login:
     link_code: NYU
-  view_attributes:
+  views:
     tabs_partial: search/nyu/tabs
     tip1_partial: search/nyu/tip1
     tip2_partial: search/nyu/tip2
@@ -250,7 +250,7 @@ NYUAD:
   parent_institution: NYU 
   resolve_layout: layouts/nyuad/resolve
   search_layout: layouts/nyuad/search
-  view_attributes:
+  views:
     tabs_partial: search/nyuad/tabs
     tip1_partial: search/nyuad/tip1
     tip2_partial: search/nyu/tip2
@@ -286,9 +286,9 @@ CU:
   display_name: The Cooper Union Library
   resolve_layout: layouts/cu/resolve
   search_layout: layouts/cu/search
-  login_attributes:
+  login:
     link_code: CU
-  view_attributes:
+  views:
     tabs_partial: search/cu/tabs
     sfx_base_url: http://sfx.library.nyu.edu/sfxcooper?
   ip_addresses:
@@ -312,9 +312,9 @@ NS:
   display_name: New School Libraries
   resolve_layout: layouts/cu/resolve
   search_layout: layouts/cu/search
-  login_attributes:
+  login:
     link_code: NS
-  view_attributes:
+  views:
     tabs_partial: search/ns/tabs
     sfx_base_url: http://sfx4.library.newschool.edu/ns?
   ip_addresses:
@@ -343,7 +343,7 @@ NS:
         COMMENTS_ABOUT_BOBCAT_LCL: help
 
 NYSID:
-  login_attributes:
+  login:
     link_code: NYSID
   resolve_layout: layouts/nysid/resolve
   search_layout: layouts/nysid/search

data/test/support/user_session.rb

@@ -1,6 +1,6 @@
 class UserSession < Authlogic::Session::Base
   pds_url "https://logindev.library.nyu.edu"
-  redirect_logout_url "https://logindev.library.nyu.edu/logout"
+  redirect_logout_url "http://bobcatdev.library.nyu.edu"
   calling_system "authpds"
   remember_me true
   remember_me_for 300

data/test/test_helper.rb

@@ -41,7 +41,7 @@ require File.dirname(__FILE__) + '/../lib/authpds'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 class ActiveSupport::TestCase
-  VALID_PDS_HANDLE_FOR_NYU = '83201295456116368349190324314'
+  VALID_PDS_HANDLE_FOR_NYU = '293201211510129623735547952389'
   VALID_PDS_HANDLE_FOR_NEWSCHOOL = '272201212284614806184193096120278'
   VALID_PDS_HANDLE_FOR_COOPER = '272201212284614806184193096120278'
   INVALID_PDS_HANDLE = "Invalid"

data/test/unit/pds_test.rb

@@ -26,10 +26,10 @@ class PdsTest < ActiveSupport::TestCase
     assert_equal("N12162279", get_attribute.response.at("//id").inner_text)
     get_attribute = Authpds::Exlibris::Pds::GetAttribute.new(@pds_url, @calling_system, @valid_pds_handle_for_nyu, "bor_verification")
     assert_equal("N12162279", get_attribute.response.at("//id").inner_text)
-    get_attribute = Authpds::Exlibris::Pds::GetAttribute.new(@pds_url, @calling_system, @valid_pds_handle_for_nyu, "authenticate")
-    assert_equal("N12162279", get_attribute.response.at("//id").inner_text)
     get_attribute = Authpds::Exlibris::Pds::GetAttribute.new(@pds_url, @calling_system, @valid_pds_handle_for_nyu, "bor_id")
     assert_equal("N12162279", get_attribute.response.at("//id").inner_text)
+    get_attribute = Authpds::Exlibris::Pds::GetAttribute.new(@pds_url, @calling_system, @valid_pds_handle_for_nyu, "authenticate")
+    assert_equal("N12162279", get_attribute.response.at("//id").inner_text)
   end
   
   test "get_attribute_invalid" do

data/test/unit/user_session_test.rb

@@ -17,7 +17,7 @@ class UserSessionTest < ActiveSupport::TestCase
   test "logout_url" do
     user_session = UserSession.new
     assert_equal(
-      "https://logindev.library.nyu.edu/pds?func=logout&url=https%253A%252F%252Flogindev.library.nyu.edu%252Flogout", 
+      "https://logindev.library.nyu.edu/pds?func=logout&url=http%3A%2F%2Fbobcatdev.library.nyu.edu", 
         user_session.logout_url)
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authpds
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2151877980 !ruby/object:Gem::Requirement
+  requirement: &2151877380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151877980
+  version_requirements: *2151877380
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &2151875960 !ruby/object:Gem::Requirement
+  requirement: &2151874980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151875960
+  version_requirements: *2151874980
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2151869700 !ruby/object:Gem::Requirement
+  requirement: &2151868120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151869700
+  version_requirements: *2151868120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2151865680 !ruby/object:Gem::Requirement
+  requirement: &2151864560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151865680
+  version_requirements: *2151864560
 description: Libraries that use Ex Libris products, can integrate Rails application
   with PDS to provide single sign-on across systems.
 email: