shibboleth-rails 0.3.7 → 0.3.8

data/app/views/user_sessions/new.html.erb

@@ -1,5 +1,5 @@
 <%= form_tag user_session_path do %>
-	Login as:
-	<%= select_tag :user_id, options_from_collection_for_select(@users, :id, :name_n) %>
-	<%= submit_tag "Login" %>
+  Login as:
+  <%= select_tag :user_id, options_from_collection_for_select(@users, :id, :name_n) %>
+  <%= submit_tag "Login" %>
 <% end %>

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-	unless Rails.env.production?
-		resource :user_session, :only => [:new, :create, :destroy]
-	end
+  unless Rails.env.production?
+    resource :user_session, :only => [:new, :create, :destroy]
+  end
 end

data/lib/shibboleth-rails/controller_additions.rb

@@ -1,42 +1,42 @@
 module Shibboleth::Rails
 
-	module ControllerAdditions
-		private
-
-		def authenticated?
-			request.env['employeeNumber'].present?
-		end
-
-		def shibboleth
-			{:emplid       => request.env['employeeNumber'],
-			 :name_n       => request.env['REMOTE_USER'].chomp("@osu.edu"),
-			 :affiliations => request.env['affiliation']}
-		end
-
-		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
-		end
-
-		def require_shibboleth
-			if current_user
-				current_user.update_usage_stats(request, :login => session['new'])
-				session.delete('new')
-			else
-				session['new'] = true
-				if Rails.env.production?
-					redirect_to [request.protocol, request.host,
-						'/Shibboleth.sso/Login?target=', CGI.escape(requested_url)].join
-				else
-				  session['target'] = requested_url
-					redirect_to new_user_session_url, :notice => 'Login first, please.'
-				end
-			end
-		end
+  module ControllerAdditions
+    private
+
+    def authenticated?
+      request.env['employeeNumber'].present?
+    end
+
+    def shibboleth
+      {:emplid       => request.env['employeeNumber'],
+       :name_n       => request.env['REMOTE_USER'].chomp("@osu.edu"),
+       :affiliations => request.env['affiliation']}
+    end
+
+    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
+    end
+
+    def require_shibboleth
+      if current_user
+        current_user.update_usage_stats(request, :login => session['new'])
+        session.delete('new')
+      else
+        session['new'] = true
+        if Rails.env.production?
+          redirect_to [request.protocol, request.host,
+            '/Shibboleth.sso/Login?target=', CGI.escape(requested_url)].join
+        else
+          session['target'] = requested_url
+          redirect_to new_user_session_url, :notice => 'Login first, please.'
+        end
+      end
+    end
 
     def requested_url
       if request.respond_to?(:url)
@@ -45,11 +45,11 @@ module Shibboleth::Rails
         request.protocol + request.host + request.request_uri
       end
     end
-	end
+  end
 
 end
 
 ActionController::Base.class_eval do
-	include Shibboleth::Rails::ControllerAdditions
-	helper_method :current_user
+  include Shibboleth::Rails::ControllerAdditions
+  helper_method :current_user
 end

data/lib/shibboleth-rails/engine.rb

@@ -1,6 +1,6 @@
 module Shibboleth::Rails
 
-	class Engine < ::Rails::Engine
-	end
+  class Engine < ::Rails::Engine
+  end
 
 end

data/lib/shibboleth-rails/user_model_additions.rb

@@ -1,50 +1,50 @@
 module Shibboleth::Rails
 
-	module ModelAdditions
-		def authenticated_by_shibboleth
-			extend ClassMethods
-			include InstanceMethods
-		end
-
-		module ClassMethods
-			def find_or_create_from_shibboleth(identity)
+  module ModelAdditions
+    def authenticated_by_shibboleth
+      extend ClassMethods
+      include InstanceMethods
+    end
+
+    module ClassMethods
+      def find_or_create_from_shibboleth(identity)
         affiliations = identity.delete(:affiliations)
 
-				user = find_or_create_by_emplid(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.update_role(affiliations) if user.respond_to?(:update_role)
-				user
-			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
+        user
+      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(:validate => false)
+      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.3.7"
+    VERSION = "0.3.8"
   end
 end

data/spec/controllers/user_sessions_controller_spec.rb

@@ -1,34 +1,34 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe UserSessionsController do
-	before { @user = Factory(:user) }
+  before { @user = Factory(:user) }
 
-	describe 'loading the login page' do
-		before { get :new }
-		it { should respond_with(:success) }
-		it { should assign_to(:user_session) }
-		it { should assign_to(:users), :with => [@user] }
-	end
+  describe 'loading the login page' do
+    before { get :new }
+    it { should respond_with(:success) }
+    it { should assign_to(:user_session) }
+    it { should assign_to(:users), :with => [@user] }
+  end
 
-	describe 'loggin in' do
-		before { post :create, :user_id => @user.id }
-		it 'should login the user' do
-			UserSession.find.user.should == @user
-		end
-		it { should respond_with(:redirect), :to => root_url }
-		it { should set_the_flash.to("You are now logged in as #{@user.name_n}.") }
-	end
+  describe 'loggin in' do
+    before { post :create, :user_id => @user.id }
+    it 'should login the user' do
+      UserSession.find.user.should == @user
+    end
+    it { should respond_with(:redirect), :to => root_url }
+    it { should set_the_flash.to("You are now logged in as #{@user.name_n}.") }
+  end
 
-	describe 'logging out' do
-		before do
-			UserSession.create(@user)
-			delete :destroy
-		end
-		it 'should log out the user' do
-			UserSession.find.should be_nil
-		end
-		it { should respond_with(:redirect), :to => new_user_session_url }
-		it { should set_the_flash.to('Logout successful!') }
-	end
+  describe 'logging out' do
+    before do
+      UserSession.create(@user)
+      delete :destroy
+    end
+    it 'should log out the user' do
+      UserSession.find.should be_nil
+    end
+    it { should respond_with(:redirect), :to => new_user_session_url }
+    it { should set_the_flash.to('Logout successful!') }
+  end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shibboleth-rails
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - mikegee
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 Z
+date: 2012-02-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails