authpds 0.1.2 → 0.2.0

data/lib/authpds/version.rb

@@ -1,3 +1,3 @@
 module Authpds
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/test/support/user.rb

@@ -1,9 +1,9 @@
 class User < ActiveRecord::Base
-	serialize :user_attributes  
+  serialize :user_attributes  
 
-	acts_as_authentic do |c|
-		c.validations_scope = :username
-		c.validate_password_field = false
-		c.require_password_confirmation = false  
-	end
+  acts_as_authentic do |c|
+    c.validations_scope = :username
+    c.validate_password_field = false
+    c.require_password_confirmation = false  
+  end
 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 = '293201211510129623735547952389'
+  VALID_PDS_HANDLE_FOR_NYU = '9112012142711297424383587031443'
   VALID_PDS_HANDLE_FOR_NEWSCHOOL = '272201212284614806184193096120278'
   VALID_PDS_HANDLE_FOR_COOPER = '272201212284614806184193096120278'
   INVALID_PDS_HANDLE = "Invalid"

data/test/unit/authpds_controller_test.rb

@@ -1,14 +1,14 @@
 require 'test_helper'
 class ApplicationControllerTest < ActiveSupport::TestCase
-  
+
   def setup
     activate_authlogic
     controller.session[:session_id] = "FakeSessionID"
-    InstitutionList.class_variable_set(:@@institutions_yaml_path, nil)
-    InstitutionList.instance.instance_variable_set(:@institutions, nil)
+    Institutions.send(:instance_variable_set, :@loadpaths, nil)
+    Institutions.send(:instance_variable_set, :@institutions, nil)
     controller.instance_variable_set(:@current_primary_institution, nil)
   end
-  
+
   test "current_user_session_nil" do
     assert_nil(controller.current_user_session)
   end
@@ -39,17 +39,16 @@ class ApplicationControllerTest < ActiveSupport::TestCase
   test "current_primary_institution_default" do
     assert_nil(controller.current_primary_institution)
     controller.request[:session_id] = "FakeSessionID"
-    InstitutionList.yaml_path= "#{File.dirname(__FILE__)}/../support/config/institutions.yml"
-    assert_equal(InstitutionList.instance.get("NYUAD"), controller.current_primary_institution)
+    Institutions.loadpaths<< "#{File.dirname(__FILE__)}/../support/config"
+    assert_equal(Institutions.institutions[:NYUAD], controller.current_primary_institution)
   end
 
-
   test "current_primary_institution_user" do
     assert_nil(controller.current_primary_institution)
-    InstitutionList.yaml_path= "#{File.dirname(__FILE__)}/../support/config/institutions.yml"
+    Institutions.loadpaths<< "#{File.dirname(__FILE__)}/../support/config"
     controller.cookies[:PDS_HANDLE] = { :value => VALID_PDS_HANDLE_FOR_NYU }
     assert_equal("N12162279", controller.current_user.username)
-    assert_equal(InstitutionList.instance.get("NYU"), controller.current_user.primary_institution)
-    assert_equal(InstitutionList.instance.get("NYU"), controller.current_primary_institution)
+    assert_equal(Institutions.institutions[:NYU], controller.current_user.primary_institution)
+    assert_equal(Institutions.institutions[:NYU], controller.current_primary_institution)
   end
 end

data/test/unit/authpds_user_sessions_controller_test.rb

@@ -1,12 +1,12 @@
 require 'test_helper'
 class UserSessionsControllerTest < ActiveSupport::TestCase
-  
+
   def setup
     activate_authlogic
     controller.session[:session_id] = "FakeSessionID"
     controller.cookies[:PDS_HANDLE] = { :value => VALID_PDS_HANDLE_FOR_NYU }
   end
-  
+
   test "current_user_session" do
     user_session = controller.current_user_session
   end

data/test/unit/pds_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class PdsTest < ActiveSupport::TestCase
-  
+
   def setup
     @pds_url = "https://logindev.library.nyu.edu"
     @calling_system = "authpds"
@@ -9,18 +9,8 @@ class PdsTest < ActiveSupport::TestCase
     @valid_pds_handle_for_newschool = VALID_PDS_HANDLE_FOR_NEWSCHOOL
     @invalid_pds_handle = INVALID_PDS_HANDLE
     @attribute = "bor_info"
-    # Ordered in Ruby 1.9 so :uid will overwrite id
-    @bor_info_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" }
   end
-  
+
   test "get_attribute_valid" do
     get_attribute = Authpds::Exlibris::Pds::GetAttribute.new(@pds_url, @calling_system, @valid_pds_handle_for_nyu, "bor_info")
     assert_equal("N12162279", get_attribute.response.at("//id").inner_text)
@@ -31,23 +21,21 @@ class PdsTest < ActiveSupport::TestCase
     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
     get_attribute = Authpds::Exlibris::Pds::GetAttribute.new(@pds_url, @calling_system, @invalid_pds_handle, "bor_info")
     assert_equal("Error User does not exist", get_attribute.error)
   end
-  
+
   test "bor_info_valid_nyu" do
     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)
     assert_equal("51", nyu.bor_status)
     assert_equal("CB", nyu.bor_type)
-    assert_equal("true", nyu.opensso)
-    assert_equal("Scot Thomas", nyu.name)
-    assert_equal("Scot Thomas", nyu.givenname)
-    assert_equal("Dalton", nyu.sn)
+    assert_equal("SCOT THOMAS", nyu.name)
+    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)
@@ -57,7 +45,6 @@ class PdsTest < ActiveSupport::TestCase
   test "bor_info_valid_newschool" do
     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)
     assert_equal("31", newschool.bor_status)
     assert_equal("0", newschool.bor_type)
@@ -67,7 +54,7 @@ class PdsTest < ActiveSupport::TestCase
     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)
     assert_equal("Error User does not exist", get_attribute.error)

data/test/unit/user_session_test.rb

@@ -1,70 +1,68 @@
 require 'test_helper'
 class UserSessionTest < ActiveSupport::TestCase
-  
+
   def setup
     activate_authlogic
     controller.session[:session_id] = "FakeSessionID"
     controller.cookies[:PDS_HANDLE] = { :value => VALID_PDS_HANDLE_FOR_NYU }
   end
-  
+
   test "login_url" do
     user_session = UserSession.new
     assert_equal(
-      "https://logindev.library.nyu.edu/pds?func=load-login&institute=&calling_system=authpds&url=http%3A%2F%2Frailsapp.library.nyu.edu%2Fvalidate%3Freturn_url%3D", 
+      "https://logindev.library.nyu.edu/pds?func=load-login&institute=&calling_system=authpds&url=http%3A%2F%2Frailsapp.library.nyu.edu%2Fvalidate%3Freturn_url%3D",
         user_session.login_url)
   end
-  
+
   test "logout_url" do
     user_session = UserSession.new
     assert_equal(
-      "https://logindev.library.nyu.edu/pds?func=logout&url=http%3A%2F%2Fbobcatdev.library.nyu.edu", 
+      "https://logindev.library.nyu.edu/pds?func=logout&url=http%3A%2F%2Fbobcatdev.library.nyu.edu",
         user_session.logout_url)
   end
-  
+
   test "sso_url" do
     user_session = UserSession.new
     assert_equal(
-    "https://logindev.library.nyu.edu/pds?func=sso&institute=&calling_system=authpds&url=http%3A%2F%2Frailsapp.library.nyu.edu%2Fvalidate%3Freturn_url%3D", 
+    "https://logindev.library.nyu.edu/pds?func=sso&institute=&calling_system=authpds&url=http%3A%2F%2Frailsapp.library.nyu.edu%2Fvalidate%3Freturn_url%3D",
         user_session.sso_url)
   end
-  
+
   test "validate_url" do
     user_session = UserSession.new
     assert_equal(
-      "http://railsapp.library.nyu.edu/validate?return_url=http://railsapp.library.nyu.edu", 
+      "http://railsapp.library.nyu.edu/validate?return_url=http://railsapp.library.nyu.edu",
         user_session.send(:validate_url, :return_url => "http://railsapp.library.nyu.edu"))
     assert_equal(
-      "http://railsapp.library.nyu.edu/validate?return_url=http://railsapp.library.nyu.edu&authpds_custom_param1=custom_param1", 
-        user_session.send(:validate_url, :controller => "test_controller", 
+      "http://railsapp.library.nyu.edu/validate?return_url=http://railsapp.library.nyu.edu&authpds_custom_param1=custom_param1",
+        user_session.send(:validate_url, :controller => "test_controller",
           :action => "test_action", :return_url => "http://railsapp.library.nyu.edu",
             :custom_param1 => "custom_param1"))
   end
-  
+
   test "pds_handle" do
     user_session = UserSession.new
     assert_equal(VALID_PDS_HANDLE_FOR_NYU, user_session.send(:pds_handle))
   end
-  
+
   test "pds_user" do
     user_session = UserSession.new
     pds_user = user_session.pds_user
     assert_instance_of(Authpds::Exlibris::Pds::BorInfo, pds_user)
     assert_equal("N12162279", pds_user.id)
-    assert_equal("std5", pds_user.uid)
     assert_equal("N12162279", pds_user.nyuidn)
     assert_equal("51", pds_user.bor_status)
     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.givenname)
-    assert_equal("Dalton", pds_user.sn)
+    assert_equal("SCOT THOMAS", pds_user.name)
+    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)
     assert_equal("Information Systems", pds_user.major)
     assert_equal("NYU", pds_user.institute)
   end
-  
+
   test "persist_session" do
     user_session = UserSession.new
     assert_nil(controller.session["authpds_credentials"])
@@ -77,7 +75,7 @@ class UserSessionTest < ActiveSupport::TestCase
     assert_nil(user_session.record)
     assert_equal("N12162279", user_session.send(:attempted_record).username)
   end
-  
+
   test "find" do
     user_session = UserSession.new
     assert_nil(controller.session["authpds_credentials"])
@@ -92,12 +90,12 @@ class UserSessionTest < ActiveSupport::TestCase
     assert_equal(controller.session["authpds_credentials"], user_session.record.persistence_token)
     assert_equal("N12162279", user_session.record.username)
   end
-  
+
   test "expiration_date" do
     user_session = UserSession.new
     assert_in_delta(-0.00001, 1.day.ago.to_f, user_session.expiration_date.to_f)
   end
-  
+
   test "get_record" do
     user_session = UserSession.new
     record = user_session.send(:get_record, "std5")

data/test/unit/user_test.rb

@@ -1,12 +1,11 @@
 require 'test_helper'
 class UserSessionTest < ActiveSupport::TestCase
-  
   def setup
     activate_authlogic
     controller.session[:session_id] = "FakeSessionID"
     controller.cookies[:PDS_HANDLE] = { :value => VALID_PDS_HANDLE_FOR_NYU }
-    InstitutionList.class_variable_set(:@@institutions_yaml_path, nil)
-    InstitutionList.instance.instance_variable_set(:@institutions, nil)
+    Institutions.send(:instance_variable_set, :@loadpaths, nil)
+    Institutions.send(:instance_variable_set, :@institutions, nil)
   end
 
   test "username=" do
@@ -20,8 +19,6 @@ class UserSessionTest < ActiveSupport::TestCase
     assert_not_equal(token1, token2)
   end
 
-  
-  
   test "user_attributes" do
     user = User.new
     user.user_attributes= {:test_attribute1 => "value1", :test_attribute2 => "value2"}
@@ -38,30 +35,39 @@ class UserSessionTest < ActiveSupport::TestCase
     assert_equal("value3.1", user.user_attributes[:test_attribute3])
     assert_equal("value4.1", user.user_attributes[:test_attribute4])
   end
-  
+
   test "primary_institution" do
+    Institutions.loadpaths<< "#{File.dirname(__FILE__)}/../support/config"
+    user = User.new
+    assert_nothing_raised ArgumentError do
+      user.primary_institution= "NYU"
+    end
+    assert_equal(Institutions.institutions[:NYU], user.primary_institution)
+  end
+
+  test "primary_institution no institutions" do
     user = User.new
     assert_nothing_raised ArgumentError do
       user.primary_institution= "NYU"
     end
     assert_equal(nil, user.primary_institution)
-    InstitutionList.yaml_path= "#{File.dirname(__FILE__)}/../support/config/institutions.yml"
-    assert_equal(InstitutionList.instance.get("NYU"), user.primary_institution)
   end
-  
+
   test "institutions" do
+    Institutions.loadpaths<< "#{File.dirname(__FILE__)}/../support/config"
     user = User.new
     assert_raise ArgumentError do
       user.institutions= "NYU"
     end
-    assert_raise ArgumentError do
-      user.institutions= ["NYU"]
-    end
-    assert_nil(user.institutions)
-    InstitutionList.yaml_path= "#{File.dirname(__FILE__)}/../support/config/institutions.yml"
     user.institutions= ["NYU"]
     assert_not_nil(user.institutions)
-    assert_equal([InstitutionList.instance.get("NYU")], user.institutions)
+    assert_equal([Institutions.institutions[:NYU]], user.institutions)
+  end
+
+  test "institutions not set" do
+    user = User.new
+    user.institutions= ["NYU"]
+    assert_nil(user.institutions)
   end
 
   test "expired?" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authpds
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,19 +32,35 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+- !ruby/object:Gem::Dependency
+  name: institutions
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -87,8 +103,6 @@ files:
 - lib/authpds/controllers/authpds_controller.rb
 - lib/authpds/controllers/authpds_sessions_controller.rb
 - lib/authpds/exlibris/pds.rb
-- lib/authpds/institution.rb
-- lib/authpds/institution_list.rb
 - lib/authpds/session.rb
 - lib/authpds/version.rb
 - lib/authpds.rb
@@ -99,14 +113,11 @@ files:
 - test/authpds_test.rb
 - test/fixtures/users.yml
 - test/support/config/institutions.yml
-- test/support/config/institutions2.yml
 - test/support/user.rb
 - test/support/user_session.rb
 - test/test_helper.rb
 - test/unit/authpds_controller_test.rb
 - test/unit/authpds_user_sessions_controller_test.rb
-- test/unit/institution_list_test.rb
-- test/unit/institution_test.rb
 - test/unit/pds_test.rb
 - test/unit/user_session_test.rb
 - test/unit/user_test.rb
@@ -122,12 +133,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3555265848561160058
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3555265848561160058
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -139,14 +156,11 @@ test_files:
 - test/authpds_test.rb
 - test/fixtures/users.yml
 - test/support/config/institutions.yml
-- test/support/config/institutions2.yml
 - test/support/user.rb
 - test/support/user_session.rb
 - test/test_helper.rb
 - test/unit/authpds_controller_test.rb
 - test/unit/authpds_user_sessions_controller_test.rb
-- test/unit/institution_list_test.rb
-- test/unit/institution_test.rb
 - test/unit/pds_test.rb
 - test/unit/user_session_test.rb
 - test/unit/user_test.rb