authpds 0.2.2 → 0.2.3

data/lib/authpds/controllers/authpds_controller/institution_attributes.rb

@@ -28,6 +28,12 @@ module Authpds
                         all_institutions[institution_param]
         end
 
+        # Override Rails ActionController#url_for to add institution.
+        def url_for(options={})
+          options[institution_param_key] ||= institution_param unless institution_param.nil?
+          super options
+        end
+
         # Grab the first institution that matches the client IP
         def primary_institution_from_ip
           Institutions.with_ip(request.remote_ip).first unless request.nil?

data/lib/authpds/controllers/authpds_controller/url_handling.rb

@@ -2,12 +2,6 @@ module Authpds
   module Controllers
     module AuthpdsController
       module UrlHandling
-        # Override Rails ActionController#url_for to add institution.
-        def url_for(options={})
-          options[institution_param_key] ||= institution_param unless institution_param.nil?
-          super options
-        end
-
         # Controller method to generate the Appropriate redirect url
         def user_session_redirect_url(url)
           (url.nil? or url.empty?) ? (request.referer.nil?) ? root_url : request.referer : url

data/lib/authpds/session.rb

@@ -48,8 +48,10 @@ module Authpds
     include Authpds::Session::Callbacks
     include Authpds::Session::ExceptionHandling
     include Authpds::Session::InstitutionAttributes
+    include Authpds::Session::PdsHandle
     include Authpds::Session::PdsUser
     include Authpds::Session::Record
+    include Authpds::Session::SessionId
     include Authpds::Session::UrlHandling
 
     def self.included(klass)

data/lib/authpds/session/core_attributes.rb

@@ -29,17 +29,6 @@ module Authpds
       def validate_url_name
         @validate_url_name ||= self.class.validate_url_name
       end
-
-      def pds_handle
-        @pds_handle ||= (controller.cookies[:PDS_HANDLE] || controller.params[:pds_handle])
-      end
-
-      def session_id
-        @session_id ||=
-          (controller.session.respond_to?(:session_id)) ?
-            (controller.session.session_id) ?
-              controller.session.session_id : controller.session[:session_id] : controller.session[:session_id]
-      end
     end
   end
 end

data/lib/authpds/session/pds_handle.rb

@@ -0,0 +1,9 @@
+module Authpds
+  module Session
+    module PdsHandle
+      def pds_handle
+        @pds_handle ||= (controller.cookies[:PDS_HANDLE] || controller.params[:pds_handle])
+      end
+    end
+  end
+end

data/lib/authpds/session/session_id.rb

@@ -0,0 +1,12 @@
+module Authpds
+  module Session
+    module SessionId
+      def session_id
+        @session_id ||=
+          (controller.session.respond_to?(:session_id)) ?
+            (controller.session.session_id) ?
+              controller.session.session_id : controller.session[:session_id] : controller.session[:session_id]
+      end
+    end
+  end
+end

data/lib/authpds/version.rb

@@ -1,3 +1,3 @@
 module Authpds
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/test/user_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-class UserSessionTest < ActiveSupport::TestCase
+class UserTest < ActiveSupport::TestCase
   def setup
     activate_authlogic
     controller.session[:session_id] = "FakeSessionID"
@@ -47,7 +47,7 @@ class UserSessionTest < ActiveSupport::TestCase
 
   test "primary_institution no institutions" do
     user = User.new
-    assert_nothing_raised ArgumentError do
+    assert_nothing_raised do
       user.primary_institution= "NYU"
     end
     assert_equal(nil, user.primary_institution)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authpds
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -80,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.8.0
 description: Libraries that use Ex Libris products, can integrate Rails application
   with PDS to provide single sign-on across systems.
 email:
@@ -165,8 +165,10 @@ files:
 - lib/authpds/session/core_attributes.rb
 - lib/authpds/session/exception_handling.rb
 - lib/authpds/session/institution_attributes.rb
+- lib/authpds/session/pds_handle.rb
 - lib/authpds/session/pds_user.rb
 - lib/authpds/session/record.rb
+- lib/authpds/session/session_id.rb
 - lib/authpds/session/url_handling.rb
 - lib/authpds/session.rb
 - lib/authpds/version.rb
@@ -209,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1210947203680701813
+      hash: -4197567884040698077
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -218,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1210947203680701813
+      hash: -4197567884040698077
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24