user_authentication 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17f2717aefc439f9917b101b30ba05ad47a4beae
-  data.tar.gz: 8f5836d3a23da681d90d6967929275f036e2e82c
+  metadata.gz: 7cab4b717fa05399b7c8bccd19fd3e9b20803ff0
+  data.tar.gz: 225aa6d85665d2e2c70233b0f1c2bb486961e289
 SHA512:
-  metadata.gz: 8aab8a8a433b7b7dd6e1919de7233f7e59755049b269b98d1aea019aa3fdf3a2fea9a0554787f799aa6ddc39205d2d4fe0b76dc4fefc5edd06e57d42d697fe4b
-  data.tar.gz: 45d750a8beddee8285497e2c3ee3af5e8c4d23d63c23bd95b55caeeaf019c401eaea040926a2d206a3d8f5c4eb4d1f6e79e5e13c2ed01ce4a60f18f245e05af4
+  metadata.gz: 0d012c397a7afde1c31d821c53502ca50054272576ef8a59341a94a08d878c428d0684a2b0220e8bbc6f1fb8470e1b24ddc09a6a2f96677d48b828ae010f7672
+  data.tar.gz: 0d9dc1a12b89d5fda9932bc482632e3436f585344c1680348a4fdc24bf5a8c2aeceb0fffb2842570f87712f824af9d5ffb43d9353b70f70b340d6de7b7f02e3a

data/app/controllers/application_controller.rb

@@ -1,9 +1,10 @@
 class ApplicationController < ActionController::Base
   before_filter :set_current_user
 
- # private
+  # private
 
-  def authorize
+  # redirect: Path to login page.
+  def authorize(redirect=nil)
     # Not using skip_before_filter, since main app could inadvertently override that
     # by using a before_filter :authorize in its application_controller.
     if params[:controller] == "users" && ["login", "logout", "signup"].include?(params[:action])
@@ -11,8 +12,10 @@ class ApplicationController < ActionController::Base
     end
 
     if current_user.nil?
-      session[:return_to] = url_for params
-      redirect_to root_path, alert: "Please log in to access this page."
+      session[:redirect] = url_for params
+      redirect_to redirect || login_path, alert: "Please log in to access this page."
+    else
+      return true
     end
   end
 
@@ -29,6 +32,11 @@ class ApplicationController < ActionController::Base
 
     true
   end
+
+  def redirect
+    session_redirect = session.delete(:redirect)
+    redirect_to params[:redirect] || session_redirect || :back
+  end
 end
 
 require File.join Rails.root, "app/controllers/application_controller"

data/app/controllers/users_controller.rb

@@ -16,10 +16,10 @@ class UsersController < ApplicationController
       if respond_to? :on_login
         on_login
       else
-        redirect_to params[:redirect] || :back
+        redirect
       end
     else
-      redirect_to :back, alert: 'Please check email and password.'
+      redirect_to :back, alert: "Please check email and password."
     end
   end
 
@@ -30,7 +30,7 @@ class UsersController < ApplicationController
     if respond_to? :on_logout
       on_logout
     else
-      redirect_to root_path
+      redirect_to :back
     end
   end
 
@@ -46,10 +46,10 @@ class UsersController < ApplicationController
       if respond_to? :on_signup
         on_signup
       else
-        redirect_to params[:redirect] || :back
+        redirect
       end
     else
-      redirect_to :back, alert: 'Please check email and password.'
+      redirect_to :back, alert: "Please check email and password."
     end
   end
 
@@ -60,7 +60,7 @@ class UsersController < ApplicationController
     if respond_to? :on_set_password
       on_set_password
     else
-      redirect_to params[:redirect] || :back
+      redirect
     end
   end
 end

data/lib/user_authentication/version.rb

@@ -1,3 +1,3 @@
 module UserAuthentication
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/user_authentication/version.rb~

@@ -0,0 +1,3 @@
+module UserAuthentication
+  VERSION = '0.1.3'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: user_authentication
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sujoy Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,6 +171,7 @@ files:
 - lib/random.rb
 - lib/tasks/user_authentication_tasks.rake
 - lib/user_authentication/version.rb
+- lib/user_authentication/version.rb~
 - lib/user_authentication.rb
 - MIT-LICENSE
 - Rakefile