shibboleth-rails 0.1.0 → 0.2.0

data/lib/shibboleth-rails/controller_additions.rb

@@ -15,14 +15,18 @@ module Shibboleth::Rails
 		def current_user
 			return @current_user if defined?(@current_user)
 			@current_user = if session[:simulate_id].present?
-												User.find(session[:simulate_id])
-											elsif authenticated?
-												User.find_or_create_from_shibboleth(shibboleth)
-											end
+			                  User.find(session[:simulate_id])
+			                elsif authenticated?
+			                  User.find_or_create_from_shibboleth(shibboleth)
+			                end
 		end
 
 		def require_shibboleth
-			unless current_user
+			if current_user
+				current_user.update_usage_stats(request, :login => session['new'])
+				session.delete('new')
+			else
+				session['new'] = true
 				if Rails.env.production?
 					base = request.protocol + request.host
 					requested_url = base + request.request_uri

data/lib/shibboleth-rails/user_model_additions.rb

@@ -1,15 +1,48 @@
 module Shibboleth::Rails
 
 	module ModelAdditions
-		def find_or_create_from_shibboleth(identity)
-			user = find_or_create_by_emplid(identity)
+		def authenticated_by_shibboleth
+			extend ClassMethods
+			include InstanceMethods
+		end
+
+		module ClassMethods
+			def find_or_create_from_shibboleth(identity)
+				user = find_or_create_by_emplid(identity)
 
-			# names change due to marriage, etc.
-			# update_attribute is a NOOP if not different
-			user.update_attribute(:name_n, identity[:name_n])
+				# names change due to marriage, etc.
+				# update_attribute is a NOOP if not different
+				user.update_attribute(:name_n, identity[:name_n])
 
-			user
+				user
+			end
 		end
-	end
 
+		module InstanceMethods
+			def update_usage_stats(request, args = {})
+				if args[:login]
+					if self.respond_to?(:login_count)
+						self.login_count ||= 0
+						self.login_count  += 1
+					end
+
+					if self.respond_to?(:current_login_at)
+						self.last_login_at = self.current_login_at if self.respond_to?(:last_login_at)
+						self.current_login_at = Time.now
+					end
+
+					if self.respond_to?(:current_login_ip)
+						self.last_login_ip = self.current_login_ip if self.respond_to?(:last_login_ip)
+						self.current_login_ip = request.remote_ip
+					end
+				end
+				self.last_request_at = Time.now if self.respond_to?(:last_request_at)
+
+				save
+			end
+		end
+
+	end
 end
+
+::ActiveRecord::Base.send :extend, Shibboleth::Rails::ModelAdditions

data/lib/shibboleth-rails/version.rb

@@ -1,5 +1,5 @@
 module Shibboleth
   module Rails
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shibboleth-rails
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - mikegee
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-27 00:00:00 Z
+date: 2011-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails