authpds 0.0.17 → 0.0.18

data/lib/authpds/exlibris/pds.rb

@@ -42,16 +42,23 @@ module Authpds
       class BorInfo < GetAttribute
 
         protected
-        def initialize(pds_url, calling_system, pds_handle, bor_info_attributes)
+        def initialize(pds_url, calling_system, pds_handle)
           super(pds_url, calling_system, pds_handle, "bor_info")
           raise RuntimeError.new( 
             "Error in #{self.class}."+
             "Unrecognized response: #{@response}.") unless @response.root.name.eql?("bor-info") or @response.root.name.eql?("pds")
-          bor_info_attributes.each { |local_attribute, xml_attribute|
-            self.class.send(:attr_reader, local_attribute)
-            instance_variable_set("@#{local_attribute}".to_sym, 
-              @response.at("#{xml_attribute}").inner_text) unless @response.at("//bor-info/#{xml_attribute}").nil?
+          return unless @response.root.name.eql?("bor-info")
+          bor_info = @response.root.children.each { |xml_element|
+            pds_attr = xml_element.name.gsub("-", "_")
+            self.class.send(:attr_reader, pds_attr)
+            instance_variable_set("@#{pds_attr}".to_sym, xml_element.inner_text) unless xml_element.inner_text.nil?
           }
+          # bor_info_attributes.each_value { |xml_element|
+          #   pds_attr = xml_element.gsub("-", "_")
+          #   self.class.send(:attr_reader, pds_attr)
+          #   instance_variable_set("@#{pds_attr}".to_sym, 
+          #     @response.at("#{xml_element}").inner_text) unless @response.at("//bor-info/#{xml_element}").nil?
+          # }
         end
       end
     end

data/lib/authpds/session.rb

@@ -110,7 +110,8 @@ module Authpds
 
       # Mapping of PDS attributes
       def pds_attributes(value = nil)
-        rw_config(:pds_attributes, value, {:id => "id", :email => "email", :firstname => "name", :lastname => "name" })
+        value.each_value { |pds_attr| pds_attr.gsub!("-", "_") } unless value.nil?
+        rw_config(:pds_attributes, value, {:email => "email", :firstname => "name", :lastname => "name", :primary_institution => "institute" })
       end
       alias_method :pds_attributes=, :pds_attributes
 
@@ -132,12 +133,6 @@ module Authpds
       end
       alias_method :pds_record_identifier=, :pds_record_identifier
 
-      # PDS user method to call to get users primary institution
-      def pds_record_primary_institution(value = nil)
-        rw_config(:pds_record_primary_institution, value, :institute)
-      end
-      alias_method :pds_record_primary_institution=, :pds_record_primary_institution
-
       # Querystring parameter key for the institution value
       def institution_param_key(value = nil)
         rw_config(:institution_param_key, value, "institute")
@@ -154,12 +149,7 @@ module Authpds
     module AuthpdsCallbackMethods
       # Hook for more complicated logic to determine PDS user record identifier
       def pds_record_identifier
-        self.class.pds_record_identifier
-      end
-
-      # Hook for more complicated logic to determine PDS user primary institution
-      def pds_record_primary_institution
-        self.class.pds_record_primary_institution
+        @pds_record_identifier ||= self.class.pds_record_identifier
       end
 
       # Hook to determine if we should set up an SSO session
@@ -215,7 +205,7 @@ module Authpds
 
       def pds_user
         begin
-          @pds_user ||= Authpds::Exlibris::Pds::BorInfo.new(self.class.pds_url, self.class.calling_system, pds_handle, pds_attributes) unless pds_handle.nil?
+          @pds_user ||= Authpds::Exlibris::Pds::BorInfo.new(self.class.pds_url, self.class.calling_system, pds_handle) unless pds_handle.nil?
           return @pds_user unless @pds_user.nil? or @pds_user.error
         rescue Exception => e
           # Delete the PDS_HANDLE, since this isn't working.
@@ -252,9 +242,9 @@ module Authpds
       end
       
       # Get the record associated with this PDS user.
-      def get_record(username)
-    		record = klass.send(:find_by_username, username)
-        record = klass.new :username => username if record.nil?
+      def get_record(login)
+    		record = klass.find_by_smart_case_login_field(login)
+        record = klass.new login_field => login if record.nil?
         return record
       end
 
@@ -264,12 +254,14 @@ module Authpds
         self.attempted_record.expiration_date = expiration_date
         # Do this part only if user data has expired.
         if self.attempted_record.expired?
-          self.attempted_record.primary_institution= pds_user.send(pds_record_primary_institution)
-          pds_attributes.each_key { |user_attr|
-            self.attempted_record.send("#{user_attr}=".to_sym, 
-              pds_user.send(user_attr.to_sym)) if self.attempted_record.respond_to?("#{user_attr}=".to_sym)
+          pds_attributes.each do |record_attr, pds_attr|
+            self.attempted_record.send("#{record_attr}=".to_sym, 
+              pds_user.send(pds_attr.to_sym)) if self.attempted_record.respond_to?("#{record_attr}=".to_sym)
+          end
+          pds_user.class.public_instance_methods(false).each do |pds_attr_reader|
             self.attempted_record.user_attributes = {
-              user_attr.to_sym => pds_user.send(user_attr.to_sym) }}
+              pds_attr_reader.to_sym => pds_user.send(pds_attr_reader.to_sym) }
+          end
         end
         self.attempted_record.user_attributes= additional_attributes
       end

data/lib/authpds/version.rb

@@ -1,3 +1,3 @@
 module Authpds
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/test/support/user_session.rb

@@ -7,16 +7,7 @@ class UserSession < Authlogic::Session::Base
   httponly true
   secure true
   login_inaccessible_url "http://library.nyu.edu/errors/bobcat-library-nyu-edu/"
-  pds_attributes :id => "id", :uid => "uid", 
-    :opensso => "opensso", :name => "name", :firstname => "givenname", 
-    :lastname => "sn", :commonname => "cn", :email => "email",
-    :nyuidn => "nyuidn", :verification => "verification", :institute => "institute",
-    :bor_status => "bor-status", :bor_type => "bor-type",
-    :college_code => "college_code", :college_name => "college_name",
-    :dept_name => "dept_name", :dept_code => "dept_code",
-    :major_code => "major_code", :major => "major", :ill_permission => "ill-permission", 
-    :newschool_ldap => "newschool_ldap"
-  
+  pds_attributes :firstname => "givenname", :lastname => "sn", :email => "email", :primary_institution => "institute" 
   def expiration_date
     1.day.ago
   end

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 = '732012103839115682024010207789'
+  VALID_PDS_HANDLE_FOR_NYU = '83201295456116368349190324314'
   VALID_PDS_HANDLE_FOR_NEWSCHOOL = '272201212284614806184193096120278'
   VALID_PDS_HANDLE_FOR_COOPER = '272201212284614806184193096120278'
   INVALID_PDS_HANDLE = "Invalid"
@@ -69,6 +69,9 @@ class Authlogic::TestCase::MockController
   def root_url
   end
 
+  def redirect_to(*args)
+  end
+  
   def validate_url(options={})
     return "http://railsapp.library.nyu.edu/validate?return_url=#{options[:return_url]}"
   end

data/test/unit/pds_test.rb

@@ -38,7 +38,7 @@ class PdsTest < ActiveSupport::TestCase
   end
   
   test "bor_info_valid_nyu" do
-    nyu = Authpds::Exlibris::Pds::BorInfo.new(@pds_url, @calling_system, @valid_pds_handle_for_nyu, @bor_info_attributes)
+    nyu = Authpds::Exlibris::Pds::BorInfo.new(@pds_url, @calling_system, @valid_pds_handle_for_nyu)
     assert_equal("N12162279", nyu.id)
     assert_equal("std5", nyu.uid)
     assert_equal("N12162279", nyu.nyuidn)
@@ -46,8 +46,8 @@ class PdsTest < ActiveSupport::TestCase
     assert_equal("CB", nyu.bor_type)
     assert_equal("true", nyu.opensso)
     assert_equal("Scot Thomas", nyu.name)
-    assert_equal("Scot Thomas", nyu.firstname)
-    assert_equal("Dalton", nyu.lastname)
+    assert_equal("Scot Thomas", nyu.givenname)
+    assert_equal("Dalton", nyu.sn)
     assert_equal("Y", nyu.ill_permission)
     assert_equal("GA", nyu.college_code)
     assert_equal("CSCI", nyu.dept_code)
@@ -55,7 +55,7 @@ class PdsTest < ActiveSupport::TestCase
   end
 
   test "bor_info_valid_newschool" do
-    newschool = Authpds::Exlibris::Pds::BorInfo.new(@pds_url, @calling_system, @valid_pds_handle_for_newschool, @bor_info_attributes)
+    newschool = Authpds::Exlibris::Pds::BorInfo.new(@pds_url, @calling_system, @valid_pds_handle_for_newschool)
     assert_equal("N00206454", newschool.id)
     assert_equal("314519567249252", newschool.uid)
     assert_equal("N00206454", newschool.nyuidn)
@@ -63,13 +63,13 @@ class PdsTest < ActiveSupport::TestCase
     assert_equal("0", newschool.bor_type)
     assert_equal("true", newschool.newschool_ldap)
     assert_equal("Allen", newschool.name)
-    assert_equal("Allen", newschool.firstname)
-    assert_equal("Jones", newschool.lastname)
+    assert_equal("Allen", newschool.givenname)
+    assert_equal("Jones", newschool.sn)
     assert_equal("Y", newschool.ill_permission)
   end
   
   test "bor_info_invalid" do
-    get_attribute = Authpds::Exlibris::Pds::BorInfo.new(@pds_url, @calling_system, @invalid_pds_handle, @bor_info_attributes)
+    get_attribute = Authpds::Exlibris::Pds::BorInfo.new(@pds_url, @calling_system, @invalid_pds_handle)
     assert_equal("Error User does not exist", get_attribute.error)
   end
 end

data/test/unit/user_session_test.rb

@@ -56,8 +56,8 @@ class UserSessionTest < ActiveSupport::TestCase
     assert_equal("CB", pds_user.bor_type)
     assert_equal("true", pds_user.opensso)
     assert_equal("Scot Thomas", pds_user.name)
-    assert_equal("Scot Thomas", pds_user.firstname)
-    assert_equal("Dalton", pds_user.lastname)
+    assert_equal("Scot Thomas", pds_user.givenname)
+    assert_equal("Dalton", pds_user.sn)
     assert_equal("Y", pds_user.ill_permission)
     assert_equal("GA", pds_user.college_code)
     assert_equal("CSCI", pds_user.dept_code)

metadata

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