tkh_authentication 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d466049d8b3bea327fc5e5e66df0be9deba26a98
-  data.tar.gz: c98d0bb35daf3c923c88b4e8c9dc153b97ff96dc
+  metadata.gz: 6447b44c0f5ec6faf90612f3aa9f2699c0e5d367
+  data.tar.gz: 5a096e8728434da167fd31c8a0ac1b74e17ab9ce
 SHA512:
-  metadata.gz: c3801142b727c8227956c77472dbfb446fa4c77670e1e3c939a299fcc4a0c8a9e71d6f6477c27997b399d5e8a672cd1ef28e4b8f2823ee10c0151b88e9b21528
-  data.tar.gz: 864d09cf6881b228ff872fc605e7132dbeeb0b829b5fe5ab3c0824516a070144c56f8db9349fbf566ac8dda7065a1df16b4fb492d7860ae00d518982f0af75a9
+  metadata.gz: 9f4bf1b128d359322d248c5a9f4c9038e0b3f86d869f40b357221dc22091d76f78b3f24f5a251290926492a2a9f3266b496168a636c8297e305304c1d8832bf2
+  data.tar.gz: 1b74b75b06caaab4aa8d81d37cc825fd36ea7808ee9bf6e9a429f9dbbe5f72c959879db090bc89d8d107aa76a630306b1d0e06d713493b31a26c4fc6be64c52d

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 
 
+## 0.9.3
+
+* Various fixes and tweaks related to the Rails 4 upgrade
+* Added other_name attribute to user model
+* Added edit feature to user resource
+* Started to change the flow of user creation. Will eventually confirm email and be ajaxified.
+
+
 ## 0.9
 
 * Upgraded gem to Rails 4

data/app/controllers/password_resets_controller.rb

@@ -1,5 +1,5 @@
 class PasswordResetsController < ApplicationController
-  
+
   def create
     user = User.find_by_email(params[:email])
     if user
@@ -16,13 +16,21 @@ class PasswordResetsController < ApplicationController
 
   def update
     @user = User.find_by_password_reset_token!(params[:id])
-    if @user.password_reset_sent_at < 24.hours.ago
+    if @user.password_reset_sent_at < 2.hours.ago
       redirect_to new_password_reset_path, :alert => t('authentication.warning.password_reset_expired')
     elsif @user.update_attributes(params[:user])
-      redirect_to root_url, :notice => t('authentication.password_reset_confirmation')
+      cookies[:auth_token] = @user.auth_token # logging in the user
+      redirect_to session[:target_page] || safe_root_url, notice: t('authentication.password_reset_confirmation')
+      destroy_target_page
     else
       render :edit
     end
   end
 
-end
+  private
+
+  def destroy_target_page
+    session[:target_page] = nil
+  end
+
+end

data/app/controllers/sessions_controller.rb

@@ -1,12 +1,13 @@
 class SessionsController < ApplicationController
 
   def new
+    set_target_page
     redirect_to root_path if current_user
   end
 
   def create
-    user = User.find_by_email(params[:email])
     set_target_page
+    user = User.find_by_email(params[:email])
     if user && user.authenticate(params[:password])
       if params[:remember_me]
         cookies.permanent[:auth_token] = user.auth_token
@@ -14,7 +15,7 @@ class SessionsController < ApplicationController
         cookies[:auth_token] = user.auth_token
       end
       redirect_to (session[:target_page] || safe_root_url), notice: t('authentication.login_confirmation')
-      session[:target_page] = nil
+      destroy_target_page
     else
       flash.now.alert = t('authentication.warning.email_or_password_invalid')
       render "new"
@@ -23,13 +24,18 @@ class SessionsController < ApplicationController
 
   def destroy
     cookies.delete(:auth_token)
+    destroy_target_page
     redirect_to safe_root_url, notice: t('authentication.logout_confirmation')
   end
-  
+
   private
-  
+
   def set_target_page
     session[:target_page] = request.referer unless session[:target_page] # && !request.referer.nil?
   end
 
+  def destroy_target_page
+    session[:target_page] = nil
+  end
+
 end

data/app/controllers/users_controller.rb

@@ -1,8 +1,8 @@
 class UsersController < ApplicationController
-  
+
   before_filter :authenticate, only: 'index'
-  before_filter :authenticate_with_admin, except: ['new', 'create']
-  
+  before_filter :authenticate_with_admin, except: ['new', 'create', 'detect_existence']
+
   def index
     @users = User.by_recent
     render layout: 'admin'
@@ -13,7 +13,7 @@ class UsersController < ApplicationController
   end
 
   def create
-    @user = User.new(params[:user])
+    @user = User.new(user_params)
     set_target_page
     if @user.save
       cookies[:auth_token] = @user.auth_token # logging in the user
@@ -23,25 +23,49 @@ class UsersController < ApplicationController
       render "new"
     end
   end
-  
+
+  def detect_existence
+    set_target_page
+    @detected_email = params[:user][:email]
+    user = User.where('email = ?',@detected_email).first
+    if user && !user.password_digest.blank? && user.password != 'temporary'
+      flash[:notice] = "Our records show you have an account with us. Please login."
+      redirect_to login_path(email: @detected_email)
+    else
+      if user
+        newbie = Newbie.where('email = ?', params[:user][:email]).first
+      else
+        newbie = Newbie.create(email: params[:user][:email])
+      end
+      newbie.send_password_set
+      flash[:notice] = "Our records show you do not have an account with us. We need to verify your email address. Please check your email inbox (or spam filter if you have nothing after several minutes) and click on the confirmation link."
+      redirect_to safe_root_url
+    end
+  end
+
   def make_admin
     user = User.find(params[:id])
     user.admin = true
     user.save
     redirect_to users_path, notice: t('authentication.admin_enabled_confirmation')
   end
-  
+
   def remove_admin
     user = User.find(params[:id])
     user.admin = false
     user.save
     redirect_to users_path, notice: t('authentication.admin_disabled_confirmation')
   end
-  
+
   private
-  
+
   def set_target_page
     session[:target_page] = request.referer unless session[:target_page] # && !request.referer.nil?
   end
-  
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def user_params
+    params.require(:user).permit :email, :password, :password_confirmation, :first_name, :last_name, :other_name
+  end
+
 end

data/app/mailers/user_mailer.rb

@@ -1,5 +1,5 @@
 class UserMailer < ActionMailer::Base
-  
+
   default :from => Setting.first.try(:contact_email) ? Setting.first.try(:contact_email) : 'info@tenthousandhours.eu'
 
   # Subject can be set in your I18n file at config/locales/en.yml
@@ -7,9 +7,14 @@ class UserMailer < ActionMailer::Base
   #
   #   en.user_mailer.password_reset.subject
   #
-  def password_reset(user)  
+  def password_reset(user)
     @user = user
     mail :to => user.email, :subject => t('authentication.password_reset_email_subject') + ' | ' + Setting.first.try(:site_name)
   end
 
-end
+  def password_set(user)
+    @user = user
+    mail :to => user.email, :subject => t('authentication.email_validation_subject') + ' | ' + Setting.first.try(:site_name)
+  end
+
+end

data/app/models/newbie.rb

@@ -0,0 +1,12 @@
+class Newbie < User
+
+  def send_password_set
+    generate_token(:password_reset_token)
+    self.password_reset_sent_at = Time.zone.now
+    # necessary to pass has_secure_password validations
+    self.password, self.password_confirmation = 'temporary', 'temporary'
+    save!
+    UserMailer.password_set(self).deliver
+  end
+
+end

data/app/models/user.rb

@@ -4,19 +4,22 @@ class User < ActiveRecord::Base
 
   # associations connected to tkh_content gem. Any page or comment model will do
   has_many :pages
-  has_many :comments, :dependent => :destroy
+  has_many :comments, :dependent => :destroy, foreign_key: 'author_id'
 
   # not allowed are :admin:boolean, :auth_token:string, password_reset_token:string, password_reset_sent_at:datetime
-  attr_accessible :email, :password, :password_confirmation, :first_name, :last_name, :other_name
+  # attr_accessible :email, :password, :password_confirmation, :first_name, :last_name, :other_name
 
   validates_presence_of :email
   validates_uniqueness_of :email, :case_sensitive => false
-  validates_presence_of :password, on: :create
-  validates_presence_of :first_name
-  validates_presence_of :last_name
+  # validates_presence_of :password, on: :create
 
-  scope :alphabetically, order('last_name, first_name')
-  scope :administrators, where('admin = ?', true)
+  # TODO - this needs to be somehow integrated in the click flow
+  # validates_presence_of :first_name
+  # validates_presence_of :last_name
+
+  scope :alphabetically, -> { order('last_name, first_name') }
+  scope :administrators, -> { where('admin = ?', true) }
+  scope :by_recent, -> { order('updated_at desc') }
 
   before_create { generate_token(:auth_token) }
 
@@ -25,7 +28,6 @@ class User < ActiveRecord::Base
     "#{id}-#{name.to_url}"
   end
 
-  scope :by_recent, :order => 'updated_at desc'
 
   def name
     "#{first_name} #{last_name}".strip

data/app/views/password_resets/edit.html.erb

@@ -8,4 +8,7 @@
     <%= f.input :password_confirmation %>
   </div>
   <div class="actions"><%= f.submit t('authentication.update_password') %></div>
-<% end %>
+<% end %>
+
+<%# partial in tkh_menus gem or has to be added in host app %>
+<%= render './shared/menus' %>

data/app/views/sessions/_form.html.erb

@@ -1,7 +1,6 @@
 <%= form_tag sessions_path, class: 'simple_form form-horizontal' do %>
 
 	<div class="form-inputs">
-		
 	  <div class="control-group email required">
 	    <%= label_tag :email, t('activerecord.attributes.user.email'), class: "email required control-label" %>
 			<div class="controls">
@@ -9,7 +8,7 @@
 				<p class="help-block"><%= link_to t('authentication.not_registered'), signup_path %></p>
 			</div>
 	  </div>
-	
+
 		<div class="control-group password required">
 	    <%= label_tag :password, t('activerecord.attributes.user.password'), class: "password required control-label" %>
 			<div class="controls">
@@ -23,11 +22,11 @@
 				<label class="checkbox"><input class="boolean optional" id="remember_me" name="remember_me" type="checkbox" value="1" /><%= t('authentication.remember_me') %></label>
 			</div>
 		</div>
-	
+
 	</div>
-	
+
 	<div class="form-actions">
     <%= submit_tag t('authentication.login_now'), class: 'btn btn-primary' %>
   </div>
-	
-<% end %>
+
+<% end %>

data/app/views/shared/_embedded_access_control.html.erb

@@ -0,0 +1,4 @@
+<div class="embedded-access-control">
+  <%= render 'users/detect_user_existence_form', user: (current_user || User.new) %>
+</div>
+

data/app/views/shared/_login_info_for_navbar.html.erb

@@ -1,6 +1,14 @@
-<li class='dropdown'>
-	<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= current_user.email %> <b class="caret"></b></a>
-	<ul class="dropdown-menu">
-		<%= content_tag :li, link_to(t('logout'), logout_path) %>
-	</ul>
-</li>
+<% if current_user %>
+  <ul class="nav navbar-nav navbar-right">
+    <li class='dropdown'>
+    	<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= current_user.email %> <b class="caret"></b></a>
+    	<ul class="dropdown-menu">
+    		<%= content_tag :li, link_to(t('logout'), logout_path) %>
+    	</ul>
+    </li>
+  </ul>
+<% else %>
+  <ul class="nav navbar-nav navbar-right">
+    <%= content_tag :li, link_to(t('authentication.login_now'), login_path) %>
+  </ul>
+<% end %>

data/app/views/user_mailer/password_set.text.erb

@@ -0,0 +1 @@
+<%= t 'authentication.email_validation_instructions', reset_url:  edit_password_reset_url(@user.password_reset_token, locale: I18n.locale) %>

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

@@ -0,0 +1,11 @@
+<%= simple_form_for user, url: detect_existence_users_path do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :email %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, value: 'proceed', :class => 'btn btn-primary' %>
+  </div>
+<% end %>

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

@@ -8,6 +8,7 @@
 			<th><%= t 'authentication.name' %></th>
 	    <th><%= t 'activerecord.attributes.user.email' %></th>
 			<th><%= t('question_mark_inverted') %><%= t('activerecord.attributes.user.admin') %><%= t('question_mark') %></th>
+			<th><%= t('actions') %></th>
 	  </tr>
 	</thead>
 
@@ -23,6 +24,7 @@
 						<span class="label label-success">✓</span> <%= link_to t('authentication.disable_admin'), remove_admin_user_path(user), class: 'btn btn-mini', method: :post %>
 					<% end -%>
 				</td>
+				<td><%= link_to t('edit'), edit_detail_path(user), class: 'btn btn-mini' %><%= link_to t('delete'), Detail.find(user.id), method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
 		  </tr>
 		<% end %>
 	</tbody>

data/config/routes.rb

@@ -9,8 +9,9 @@ Rails.application.routes.draw do
         post :make_admin
         post :remove_admin
       end
+      collection { post :detect_existence }
     end
     resources :sessions
     resources :password_resets
   end
-end
+end

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

@@ -1,10 +1,10 @@
 de:
-  
+
   activerecord:
     models:
       user: 'Benutzer'
       users: 'Benutzer'
-      
+
     attributes:
       user:
         admin: 'Administrator'
@@ -20,6 +20,8 @@ de:
     create_account: 'Nutzerkonto erstellen'
     disable_admin: 'löschen'
     enable_admin: 'erstellen'
+    email_validation_subject: "Email validation"
+    email_validation_instructions: "To confirm your email address, please visit this link: %{reset_url} and create your password \n\nIf you did not wish to create a new account with us, please ignore this email."
     forgot_password: "Kennwort vergessen?"
     login_confirmation: "Du bist eingelogged!"
     login_now: "einloggen"
@@ -46,5 +48,5 @@ de:
       email_or_password_invalid: "Email oder Kennwort ungültig"
       login_needed: "Du musst dich einloggen um auf diese Seite zuzugreifen. Du wurdest zum Login umgeleitet."
       no_such_email: "Es gibt kein Nutzerkonto mit dieser Email-Adresse."
-      password_reset_expired: "Das Zurücksetzen des Kennworts ist abgelaufen. Dies war nur für 24 Stunden möglich"
+      password_reset_expired: "Das Zurücksetzen des Kennworts ist abgelaufen. Dies war nur für 2 Stunden möglich"
       restricted_access: "Diese Sektion ist nur für Administratoren zugänglich. Kontaktiere den Inhaber der Webseite, wenn du Administrator-Rechte erhalten möchtest."

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

@@ -1,10 +1,10 @@
 en:
-  
+
   activerecord:
     models:
       user: 'user'
       users: 'users'
-      
+
     attributes:
       user:
         admin: 'admin' # admin is short for administrator. put full word if necessary
@@ -19,7 +19,9 @@ en:
     admin_enabled_confirmation: 'you have empowered this user to be an administrator'
     create_account: 'create an account'
     disable_admin: 'disable'
-    enable_admin: 'enable' 
+    enable_admin: 'enable'
+    email_validation_subject: "Email validation"
+    email_validation_instructions: "To confirm your email address, please visit this link: %{reset_url} and create your password \n\nIf you did not wish to create a new account with us, please ignore this email."
     forgot_password: "forgot your password?"
     login_confirmation: "You have been logged in!"
     login_now: "log in"
@@ -46,33 +48,33 @@ en:
       email_or_password_invalid: "Email or password is invalid"
       login_needed: "You must be logged in to access this page. You have been redirected to the login form."
       no_such_email: "We do not have any accounts with the email you have provided."
-      password_reset_expired: "Password reset has expired. There was a 24 hours grace period"
+      password_reset_expired: "Password reset has expired. There was a 2 hours grace period"
       restricted_access: "This section is reserved to the site's administrators. Contact the site owner if you would like access to be granted to you."
-    
-    
+
+
   # leaving these until I have used up all the ones I need.
-  access_control:  
-    already_signed_up_message: "You already have a La Source account. Please login to your existing account." 
+  access_control:
+    already_signed_up_message: "You already have a La Source account. Please login to your existing account."
     email_hint: This address will be used as your login id
     email_must_be_valid: Please enter a valid email address before submitting
-    
-    
+
+
     have_an_account: 'have an account?'
     hello: hello
     hello_name: "Hi %{name},"
     invalid_email_or_password: "Invalid email or password. Please double check your data, modify it, and resubmit the form"
     login: "log in"
-    
-    
+
+
     login_now_in_text: log in here
-    
-    
+
+
     my_profile: 'my profile'
     new_password: New Password
     new_password_confirmation: New Password confirmation
 
     not_authorized_alert: "You are not authorized to access this page. You have been redirected to the home page."
-    
+
     or: "or"
     password: password
     password_confirmation: password confirmation
@@ -84,10 +86,10 @@ en:
     phone_entry_request: "If enrolling in a course, we would appreciate at least one phone number."
     please_log_in: Please log in to see your personal information.
     remember_me: "stay logged in"
-    
-    
+
+
     signup: "create an account"
-    
+
     signup_now: "create an account"
 
-    valid_email_needed: 'Please enter a valid email address'
+    valid_email_needed: 'Please enter a valid email address'

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

@@ -1,10 +1,10 @@
 es:
-  
+
   activerecord:
     models:
       user: 'user'
       users: 'users'
-      
+
     attributes:
       user:
         first_name: "nombre de pila"
@@ -12,13 +12,15 @@ es:
         email: "email"
         password: 'contraseña'
         password_confirmation: 'confirmar contraseña'
-          
+
   authentication:
     admin_disabled_confirmation: "Este usuario no es un administrador"
     admin_enabled_confirmation: 'Este usuario es ahora un administrador'
     create_account: 'crea tu cuenta'
     disable_admin: 'eliminar el poder'
     enable_admin: 'autorizar'
+    email_validation_subject: "Email validation"
+    email_validation_instructions: "To confirm your email address, please visit this link: %{reset_url} and create your password \n\nIf you did not wish to create a new account with us, please ignore this email."
     forgot_password: '¿olvidaste tu contraseña?'
     login_confirmation: 'Conectado con éxito'
     login_now: "conectar"
@@ -45,5 +47,5 @@ es:
       email_or_password_invalid: 'Correo electrónico o contraseña no válidos'
       login_needed: 'Tienes que estar conectado para acceder a esta pagina. Te redirijimos al formulario para conectar.'
       no_such_email:  'No existe ninguna cuenta con el correo electronico que nos has proporcionado.'
-      password_reset_expired: 'El reestablecimiento de la contraseña ha caducado. Tienes 24 horas para intentarlo otra vez.'
-      restricted_access: "Esta parte del sitio está reservado para los administradores. Por favor, pedir permiso al propietario del sitio."
+      password_reset_expired: 'El reestablecimiento de la contraseña ha caducado. Tienes 2 horas para intentarlo otra vez.'
+      restricted_access: "Esta parte del sitio está reservado para los administradores. Por favor, pedir permiso al propietario del sitio."

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

@@ -1,10 +1,10 @@
 fr:
-  
+
   activerecord:
     models:
       user: 'utilisateur'
       users: 'les utilisateurs'
-      
+
     attributes:
       user:
         admin: 'administrateur' # admin is short for administrator. put full word if necessary
@@ -13,13 +13,15 @@ fr:
         email: "courriel"
         password: 'mot de passe'
         password_confirmation: 'confirmation de mot de passe'
-          
+
   authentication:
     admin_disabled_confirmation: "cet utilisateur n'est plus un administrateur"
     admin_enabled_confirmation: 'cet utilisateur est maintenant un administrateur'
     create_account: 'créez un compte'
     disable_admin: 'enlever le pouvoir'
     enable_admin: 'donner le pouvoir'
+    email_validation_subject: "Vérification de votre adresse email"
+    email_validation_instructions: "Pour confirmer votre adresse email, veuillez accéder cette page web et créer un mot de passe : %{reset_url}\n\nSi vous ne désirez pas créer un compte sur notre site, veuillez ignorer cet email."
     forgot_password: "avez vous oublié votre mot de passe ?"
     login_confirmation: "Merci de vous être identifié !"
     login_now: "identifiez-vous"
@@ -47,40 +49,40 @@ fr:
       no_such_email: "Désolé nous n'avons pas d'utilisateur avec cette adresse email"
       password_reset_expired: "Votre mot de passe n'a pu être réinitialisé car votre demande date de plus de 24 heures."
       restricted_access: "Cette partie du site est réservée aux administrateurs. Veuillez demander l'autorisation au propriétaire du site."
-    
-    
-    
+
+
+
   # leaving these until I have used up all the ones I need.
-  access_control:  
+  access_control:
     already_signed_up_message: "Vous avez déjà un compte La Source. Veuillez vous identifier avec ce compte existant."
-    
+
     email_hint: Cette adresse sera votre identifiant
     email_must_be_valid: Vous devez entrer une adresse courriel avant d'envoyer votre demande
 
-    
+
     have_an_account: 'vous avez un compte ?'
     hello: bonjour
     hello_name: "Bonjour %{name} ,"
     invalid_email_or_password: "Erreur d'email ou de mot de passe. Veuillez vérifier vos données, les corriger et essayer à nouveau."
     login: "s'identifier"
-    
-    
+
+
     login_now_in_text: vous identifier
 
-    
+
     my_profile: 'mon profil'
     new_password: Nouveau mot de passe
     new_password_confirmation: Confirmation du nouveau mot de passe
-    
+
     not_authorized_alert: "Vous n'avez pas l'autorization d'acceder cette page. Vous avez été redirigé sur la page d'accueil."
-    
+
     or: ou
     password: mot de passe
     password_confirmation: confirmation du mot de passe
 
- 
+
     password_must_match_confirmation: 'Le mot de passe et sa confirmation doivent être identiques'
-    password_on_its_way: "Nous avons crée votre nouveau mot de passe et vous devriez le recevoir dans les 24 heures qui suivent à cette adresse : %{email_address}."
+    password_on_its_way: "Nous avons crée votre nouveau mot de passe et vous devriez le recevoir dans les 2 heures qui suivent à cette adresse : %{email_address}."
     password_reset: Réinitialisation du mot de passe
     please_log_in: Veuillez vous identifier pour voir votre information personnalisée.
     phone_entry_request: "Si vous joignez un cours, nous vous serions reconnaissant de nous fournir au moins un numéro de téléphone."
@@ -88,7 +90,7 @@ fr:
     reset_instructions: "Pour réinitialiser votre mot de passe, cliquez sur le lien en-dessous :"
     reset_instructions2: "Si vous n’avez pas demandé la réinitialisation de votre mot de passe, veuillez ignorer ce courriel. Votre mot de passe restera le même."
     signup: "créer un compte"
-    
+
     signup_now: "créez un compte"
-    
-    valid_email_needed: 'Veuillez nous fournir votre adresse email'
+
+    valid_email_needed: 'Veuillez nous fournir votre adresse email'

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

@@ -1,10 +1,10 @@
 it:
-  
+
   activerecord:
     models:
       user: 'user'
       users: 'users'
-      
+
     attributes:
       user:
         first_name: "first name"
@@ -18,7 +18,9 @@ it:
     admin_enabled_confirmation: 'you have empowered this user to be an administrator'
     create_account: 'create an account'
     disable_admin: 'disable'
-    enable_admin: 'enable' 
+    enable_admin: 'enable'
+    email_validation_subject: "Email validation"
+    email_validation_instructions: "To confirm your email address, please visit this link: %{reset_url} and create your password \n\nIf you did not wish to create a new account with us, please ignore this email."
     forgot_password: "forgot your password?"
     login_confirmation: "You have been logged in!"
     login_now: "log in"
@@ -45,6 +47,6 @@ it:
       email_or_password_invalid: "Email or password is invalid"
       login_needed: "You must be logged in to access this page. You have been redirected to the login form."
       no_such_email: "We do not have any accounts with the email you have provided."
-      password_reset_expired: "Password reset has expired. There was a 24 hours grace period"
+      password_reset_expired: "Password reset has expired. There was a 2 hours grace period"
       restricted_access: "This section is reserved to the site's administrators. Contact the site owner if you would like access to be granted to you."
-    
+

data/lib/tasks/tkh_authentication_tasks.rake

@@ -4,10 +4,10 @@ namespace :tkh_authentication do
     system 'rails g tkh_authentication:create_or_update_migrations'
     system 'rails g tkh_authentication:create_or_update_locales -f'
   end
-  
+
   desc "Update files. Skip existing migrations. Force overwrite locales"
   task :update do
     system 'rails g tkh_authentication:create_or_update_migrations -s'
     system 'rails g tkh_authentication:create_or_update_locales -f'
   end
-end
+end

data/lib/tkh_authentication/version.rb

@@ -1,3 +1,3 @@
 module TkhAuthentication
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: tkh_authentication
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Rails engine for access control authentication customized for Ten Thousand
@@ -88,20 +88,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/controllers/password_resets_controller.rb
 - app/controllers/sessions_controller.rb
 - app/controllers/users_controller.rb
 - app/mailers/user_mailer.rb
+- app/models/newbie.rb
 - app/models/user.rb
 - app/views/password_resets/edit.html.erb
 - app/views/password_resets/new.html.erb
 - app/views/sessions/_form.html.erb
 - app/views/sessions/new.html.erb
+- app/views/shared/_embedded_access_control.html.erb
 - app/views/shared/_embedded_login_module.html.erb
 - app/views/shared/_login_info.html.erb
 - app/views/shared/_login_info_for_navbar.html.erb
 - app/views/shared/_login_info_for_sidebar.html.erb
 - app/views/user_mailer/password_reset.text.erb
+- app/views/user_mailer/password_set.text.erb
+- app/views/users/_detect_user_existence_form.html.erb
 - app/views/users/_form.html.erb
 - app/views/users/index.html.erb
 - app/views/users/new.html.erb
@@ -116,19 +124,18 @@ files:
 - lib/generators/tkh_authentication/create_or_update_migrations/templates/add_other_name_to_users.rb
 - lib/generators/tkh_authentication/create_or_update_migrations/templates/create_users.rb
 - lib/tasks/tkh_authentication_tasks.rake
+- lib/tkh_authentication.rb
 - lib/tkh_authentication/tkh_authentication_action_controller_extension.rb
 - lib/tkh_authentication/tkh_authentication_helper.rb
 - lib/tkh_authentication/version.rb
-- lib/tkh_authentication.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
-- CHANGELOG.md
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -144,13 +151,10 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/config.ru
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/test_helper.rb
 - test/tkh_authentication_test.rb
@@ -163,17 +167,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Simple authentication Rails engine.