Added the ability to return to the last visited page after signing in. This required a monkey patch to Warden as Warden wipes out the entire session after signing out. Closes fredwu#5.

Author: fredwu

app/controllers/application_controller.rb

@@ -5,8 +5,9 @@ class ApplicationController < ActionController::Base
 
   layout proc { |controller| controller.request.xhr? ? nil : 'application' }
 
-  before_filter :require_login,    :unless => :devise_controller?
-  before_filter :ensure_ownership, :unless => :devise_controller?, :except => [:index, :show]
+  before_filter :require_login,           :unless => :devise_controller?
+  before_filter :ensure_ownership,        :unless => :devise_controller?, :except => [:index, :show]
+  after_filter  :record_last_visted_page, :unless => :devise_controller?, :if => Proc.new { request.get? && !request.xhr? }
 
   protected
 
@@ -24,6 +25,10 @@ def ensure_ownership
     end
   end
 
+  def record_last_visted_page
+    session[:user_return_to] = request.path
+  end
+
   def deny_access
     render :text => t('system.access_denied'), :status => 403
   end

app/views/layouts/application.html.slim

@@ -25,6 +25,7 @@ body
       h1= link_to t('site.name'), root_path
       nav
         ul
+          li= link_to_current t('label.home'), root_path
           li= link_to_current t('label.startups'), startups_path
           li= link_to_current t('label.entrepreneurs'), entrepreneurs_path
           li= link_to_current t('label.investors'), investors_path

config/application.rb

@@ -58,3 +58,4 @@ class Application < Rails::Application
 end
 
 require Rails.root + 'lib/monkey_patches/array'
+require Rails.root + 'lib/monkey_patches/warden'

config/locales/en.yml

@@ -55,6 +55,7 @@ en:
     time_ago: '%{time} ago'
     time_ago_by: '%{time} ago by'
   label:
+    home: Home
     loading: Loading
     create: Create
     update: Update

lib/monkey_patches/warden.rb

@@ -0,0 +1,6 @@
+module Warden::Mixins::Common
+  # overwrites session reset so that we could keep things like 'last_visited_page'
+  def reset_session!
+    nil
+  end
+end

spec/requests/session_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe "session" do
+  let(:user) do
+    u = User.make!
+    u.confirm!
+    u
+  end
+
+  let(:startup) { Startup.make! }
+
+  before do
+    startup.attach_user(user, :member, 'Founder')
+
+    post user_session_path, :user => {
+                              :login    => user.email,
+                              :password => 'password'
+                            }
+
+    get startups_path
+  end
+
+  it "records the last visited page for a normal GET request" do
+    get investors_path
+
+    session[:user_return_to].should == investors_path
+  end
+
+  it "doesn't record the last visited page for a normal POST request" do
+    post my_private_messages_path, :users => 1, :message => { :content => 'hello' }, :format => :json
+
+    session[:user_return_to].should == startups_path
+  end
+
+  it "doesn't record the last visited page for an AJAX GET request" do
+    get startup_path(startup)
+    xhr :get, startup_profile_details_path(startup)
+
+    session[:user_return_to].should == startup_path(startup)
+  end
+
+  it "doesn't record the last visited page for an AJAX POST request" do
+    get startup_path(startup)
+    xhr :post, "#{startup_path(startup)}/update_user?role_identifier=member&uid=1", :member_title => 'CEO'
+
+    session[:user_return_to].should == startup_path(startup)
+  end
+
+  it "doesn't record the last visited page for a user session request" do
+    get new_user_session_path
+
+    session[:user_return_to].should == startups_path
+  end
+end