authpds 0.0.16 → 0.0.17

data/lib/authpds/institution.rb

@@ -1,4 +1,4 @@
-class Institution < Struct.new(:display_name, :name, :default, 
+class Institution < Struct.new(:display_name, :name, :default,
   :application_layout, :ip_addresses, :parent_institution, :view_attributes, :login_attributes)
   require 'ipaddr'
 
@@ -9,8 +9,8 @@ class Institution < Struct.new(:display_name, :name, :default,
     members.each {|m| self.send( ("#{m}=").to_sym , (h.delete("#{m}".to_sym) || h.delete("#{m}"))) }
     # 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
+    self.default= true if name == "default" or name == "DEFAULT"
+    self.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/institution_list.rb

@@ -51,6 +51,7 @@ class InstitutionList
       # Turn the institution hashes to Institutions
       institution_list.each_pair do |institution_name, institution_hash|
         institution_hash["name"] = institution_name
+        institution_hash["default"] = false if institution_hash["default"].nil?
         # Merge with parent institution
         institution_hash = 
           institution_list[institution_hash["parent_institution"]].

data/lib/authpds/version.rb

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

data/test/test_helper.rb

@@ -37,11 +37,11 @@ ActiveRecord::Schema.define(:version => 1) do
 end
 
 # Load support files
-require File.dirname(__FILE__) + '/../lib/authpds' unless defined?(Authpds)
+require File.dirname(__FILE__) + '/../lib/authpds'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 class ActiveSupport::TestCase
-  VALID_PDS_HANDLE_FOR_NYU = '73201295126115517644686139782'
+  VALID_PDS_HANDLE_FOR_NYU = '732012103839115682024010207789'
   VALID_PDS_HANDLE_FOR_NEWSCHOOL = '272201212284614806184193096120278'
   VALID_PDS_HANDLE_FOR_COOPER = '272201212284614806184193096120278'
   INVALID_PDS_HANDLE = "Invalid"

data/test/unit/institution_list_test.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+
+class InstitutionListTest < ActiveSupport::TestCase
+
+  def setup
+    InstitutionList.class_variable_set(:@@institutions_yaml_path, nil)
+    InstitutionList.instance.instance_variable_set(:@institutions, nil)
+    @yaml_path = "#{File.dirname(__FILE__)}/../support/config/institutions.yml"
+  end
+  
+  test "yaml_path" do
+    assert_raise ArgumentError do
+      InstitutionList.yaml_path=  nil
+    end
+    assert_raise NameError do
+      InstitutionList.yaml_path= "garbage_path"
+    end
+    assert_nothing_raised do
+      InstitutionList.yaml_path= @yaml_path
+      InstitutionList.instance.institutions
+    end
+  end
+  
+  test "defined" do
+    assert(!InstitutionList.institutions_defined?)
+    InstitutionList.yaml_path= @yaml_path
+    assert(InstitutionList.institutions_defined?)
+  end
+  
+  test "defaults" do
+    assert_raise ArgumentError do
+      InstitutionList.instance.defaults
+    end
+    assert_nothing_raised do
+      InstitutionList.yaml_path= @yaml_path
+      InstitutionList.instance.defaults
+    end
+    assert_not_nil(InstitutionList.instance.defaults)
+    assert_equal([InstitutionList.instance.get("NYUAD")], InstitutionList.instance.defaults)
+  end
+  
+  test "institutions_with_ip" do
+    assert_raise ArgumentError do
+      InstitutionList.instance.institutions_with_ip "128.122.149.122"
+    end
+    assert_nothing_raised do
+      InstitutionList.yaml_path= @yaml_path
+      InstitutionList.instance.institutions_with_ip "128.122.149.122"
+    end
+    assert_not_nil(InstitutionList.instance.institutions_with_ip "128.122.149.122")
+    assert_equal([InstitutionList.instance.get("NYU")], InstitutionList.instance.institutions_with_ip("128.122.149.122"))
+  end
+end

data/test/unit/institution_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class InstitutionTest < ActiveSupport::TestCase
+
+  def setup
+  end
+  
+  test "default" do
+    default_name_institution = Institution.new({"name" => "default"})
+    assert(default_name_institution.default, "Default name didn't work.")
+    regular_institution = Institution.new({"name" => "not_default"})
+    assert(!regular_institution.default, "Default attribute didn't work.")
+    default_attribute_institution = Institution.new({"name" => "not_default", "default" => "true"})
+    assert(default_attribute_institution.default)
+  end
+  
+end

data/test/unit/pds_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class PdsTest < ActiveSupport::TestCase
   
   def setup
-    @pds_url = "https://login.library.nyu.edu"
+    @pds_url = "https://logindev.library.nyu.edu"
     @calling_system = "authpds"
     @valid_pds_handle_for_nyu = VALID_PDS_HANDLE_FOR_NYU
     @valid_pds_handle_for_newschool = VALID_PDS_HANDLE_FOR_NEWSCHOOL
@@ -37,7 +37,7 @@ class PdsTest < ActiveSupport::TestCase
     assert_equal("Error User does not exist", get_attribute.error)
   end
   
-  test "bor_info_valid" do
+  test "bor_info_valid_nyu" do
     nyu = Authpds::Exlibris::Pds::BorInfo.new(@pds_url, @calling_system, @valid_pds_handle_for_nyu, @bor_info_attributes)
     assert_equal("N12162279", nyu.id)
     assert_equal("std5", nyu.uid)
@@ -52,6 +52,9 @@ class PdsTest < ActiveSupport::TestCase
     assert_equal("GA", nyu.college_code)
     assert_equal("CSCI", nyu.dept_code)
     assert_equal("Information Systems", nyu.major)
+  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)
     assert_equal("N00206454", newschool.id)
     assert_equal("314519567249252", newschool.uid)

data/test/unit/user_test.rb

@@ -41,13 +41,12 @@ class UserSessionTest < ActiveSupport::TestCase
   
   test "primary_institution" do
     user = User.new
-    assert_raise ArgumentError do
-      user.primary_institution= "NYU"
-    end
-    InstitutionList.yaml_path= "#{File.dirname(__FILE__)}/../support/config/institutions.yml"
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authpds
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2151877240 !ruby/object:Gem::Requirement
+  requirement: &2151877280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151877240
+  version_requirements: *2151877280
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &2151876040 !ruby/object:Gem::Requirement
+  requirement: &2151876220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151876040
+  version_requirements: *2151876220
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2151869520 !ruby/object:Gem::Requirement
+  requirement: &2151869780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151869520
+  version_requirements: *2151869780
 description: Libraries that use Ex Libris products, can integrate Rails application
   with PDS to provide single sign-on across systems.
 email:
@@ -73,6 +73,8 @@ files:
 - 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
@@ -110,6 +112,8 @@ test_files:
 - 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