tkh_authentication 0.0.5 → 0.0.6

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 
 
+
+## 0.0.6
+
+* Redirect users to target page upon logging in if they had been interrupted by authenticate or authenticate_with_admin filters
+
+
+
 ## 0.0.5
 
 * Users controller has both an authenticate and an authenticate_with_admin before_filters

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 YOURNAME
+Copyright 2012 | Ten Thousand Hours - Swami Atma
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/sessions_controller.rb

@@ -11,7 +11,8 @@ class SessionsController < ApplicationController
       else
         cookies[:auth_token] = user.auth_token
       end
-      redirect_to root_url, notice: t('authentication.login_confirmation')
+      redirect_to (session[:target_page] || root_url), notice: t('authentication.login_confirmation')
+      session[:target_page] = nil
     else
       flash.now.alert = t('authentication.warning.email_or_password_invalid')
       render "new"

data/app/controllers/users_controller.rb

@@ -16,7 +16,8 @@ class UsersController < ApplicationController
     @user = User.new(params[:user])
     if @user.save
       cookies[:auth_token] = @user.auth_token
-      redirect_to root_url, notice: t('authentication.signup_confirmation')
+      redirect_to session[:target_page] || root_url, notice: t('authentication.signup_confirmation')
+      session[:target_page] = nil
     else
       render "new"
     end

data/app/views/users/index.html.erb

@@ -14,7 +14,7 @@
 		  <tr>
 		    <td><%= user.name %></td>
 				<td><%= user.email %></td>
-				<td><%= user.admin? ? 'YES' : 'no' %></td>
+				<td><%= user.admin? ? '✓' : 'X' %></td>
 		  </tr>
 		<% end %>
 	</tbody>

data/lib/generators/tkh_authentication/create_or_update_locales/templates/fr.yml

@@ -179,6 +179,17 @@ fr:
   
   # custom sections - the obove is provided by rails
   language_name: Français
+  
+  
+  activerecord: 
+      attributes:
+        user:
+          first_name: "prénom"
+          last_name: "nom de famille"
+          email: "courriel"
+          password: 'mot de passe'
+          password_confirmation: 'confirmation de mot de passe'
+          
   authentication:
     create_your_account: 'créez votre compte'
     forgot_password: "avez vous oublié votre mot de passe ?"

data/lib/tasks/tkh_authentication_tasks.rake

@@ -4,7 +4,4 @@ namespace :tkh_authentication do
     system 'rails g tkh_authentication:create_migration'
     system 'rails g tkh_authentication:create_or_update_locales'
   end
-end
-
-
-
+end

data/lib/tkh_authentication/tkh_authentication_action_controller_extension.rb

@@ -1,8 +1,6 @@
 module TkhAuthenticationActionControllerExtension
   def self.included(base)
     base.send(:include, InstanceMethods) 
-    # base.before_filter :authenticate
-    # base.after_filter :my_method_2
   end
 
   module InstanceMethods
@@ -11,11 +9,17 @@ module TkhAuthenticationActionControllerExtension
     end
 
     def authenticate
-      redirect_to login_url, alert: t('authentication.warning.login_needed') if current_user.nil?
+      if current_user.nil?
+        session[:target_page] = request.url
+        redirect_to login_url, alert: t('authentication.warning.login_needed')
+      end
     end
     
     def authenticate_with_admin
-      redirect_to root_url, alert: t('authentication.warning.restricted_access') unless current_user && current_user.admin?
+      unless current_user && current_user.admin?
+        session[:target_page] = request.url if session[:target_page].nil?
+        redirect_to root_url, alert: t('authentication.warning.restricted_access')
+      end
     end
   end
 end

data/lib/tkh_authentication/version.rb

@@ -1,3 +1,3 @@
 module TkhAuthentication
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_authentication
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -197654925651461113
+      hash: -1846270554673356204
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -197654925651461113
+      hash: -1846270554673356204
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23