authpds 0.0.6 → 0.0.7

data/lib/authpds/controllers/authpds_controller.rb

@@ -30,13 +30,13 @@ module Authpds
         def current_primary_institution
             @current_primary_institution ||= 
               (InstitutionList.institutions_defined?) ?
-                (params["institution"].nil? or InstitutionList.instance.get(params["institution"]).nil?) ?
+                (params["#{institution_param_key}"].nil? or InstitutionList.instance.get(params["#{institution_param_key}"]).nil?) ?
                   (primary_institution_from_ip.nil?) ?
                     (current_user.nil? or current_user.primary_institution.nil?) ?
                       InstitutionList.instance.default_institutions.first :
                         current_user.primary_institution :
                           primary_institution_from_ip :
-                            InstitutionList.instance.get(params["institution"]) :
+                            InstitutionList.instance.get(params["#{institution_param_key}"]) :
                               nil
         end
 
@@ -55,13 +55,19 @@ module Authpds
 
         # Override to add institution.
         def url_for(options={})
-          options["institution"] = params["institution"] unless params["institution"].nil? or options["institution"]
+          options["#{institution_param_key}"] = 
+            params["#{institution_param_key}"] unless params["#{institution_param_key}"].nil? or 
+              options["#{institution_param_key}"]
           super(options)          
         end
 
         def user_session_redirect_url(url)
           (url.nil?) ? (request.referer.nil?) ? root_url : request.referer : url
         end
+        
+        def institution_param_key
+          @institution_param_key ||= UserSession.insitution_param
+        end
       end
     end
   end

data/lib/authpds/session.rb

@@ -137,6 +137,12 @@ module Authpds
         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")
+      end
+      alias_method :institution_param_key=, :institution_param_key
     end 
     
     module AuthpdsCallbackMethods

data/lib/authpds/version.rb

@@ -1,3 +1,3 @@
 module Authpds
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authpds
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2151877340 !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: *2151877340
+  version_requirements: *2151878000
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &2151876140 !ruby/object:Gem::Requirement
+  requirement: &2151876580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151876140
+  version_requirements: *2151876580
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2151870360 !ruby/object:Gem::Requirement
+  requirement: &2151871400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151870360
+  version_requirements: *2151871400
 description: Libraries that use Ex Libris products, can integrate Rails application
   with PDS to provide single sign-on across systems.
 email: