tkh_authentication 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 
 
+## 0.1.3
+
+* Added login module partial to embed in pages and set it up with bootstrap tabs
+* Refactored login and signup forms
+* A logged-in user cannot got to login or signup page. They are redirected to the root page.
+* The two reset password views have now headings and one explanation. More friendly and it makes it clear that it can be used to change one's password even without having forgotten it.
+
+
 ## 0.1.2
 
 * Minor translation fix

data/app/controllers/sessions_controller.rb

@@ -1,10 +1,12 @@
 class SessionsController < ApplicationController
 
   def new
+    redirect_to root_path if current_user
   end
 
   def create
     user = User.find_by_email(params[:email])
+    set_target_page
     if user && user.authenticate(params[:password])
       if params[:remember_me]
         cookies.permanent[:auth_token] = user.auth_token
@@ -23,5 +25,11 @@ class SessionsController < ApplicationController
     cookies.delete(:auth_token)
     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
 
 end

data/app/controllers/users_controller.rb

@@ -14,8 +14,9 @@ class UsersController < ApplicationController
 
   def create
     @user = User.new(params[:user])
+    set_target_page
     if @user.save
-      cookies[:auth_token] = @user.auth_token
+      cookies[:auth_token] = @user.auth_token # logging in the user
       redirect_to session[:target_page] || safe_root_url, notice: t('authentication.signup_confirmation')
       session[:target_page] = nil
     else
@@ -37,4 +38,10 @@ class UsersController < ApplicationController
     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
+  
 end

data/app/models/user.rb

@@ -2,7 +2,9 @@ class User < ActiveRecord::Base
   
   has_secure_password
   
+  # associations connected to tkh_content gem. Any page or comment model will do
   has_many :pages
+  has_many :comments, :dependent => :destroy
   
   # 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

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

@@ -1,3 +1,5 @@
+<h1>Create a new Password</h1>
+
 <%= simple_form_for @user, :url => password_reset_path(params[:id]) do |f| %>
 <%= f.error_notification %>
 
@@ -6,5 +8,4 @@
     <%= f.input :password_confirmation %>
   </div>
   <div class="actions"><%= f.submit t('authentication.update_password') %></div>
-<% end %>
-
+<% end %>

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

@@ -1,3 +1,7 @@
+<h1>Request a new Password</h1>
+
+<p>Whether you forgot your password or you just want to change it, please give us your email address. We will send you an email with instructions on how to complete the two-click, 30 second process.</p>
+
 <%= form_tag password_resets_path, :method => :post do %>
   <div class="field">
     <%= label_tag :email %>

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

@@ -0,0 +1,33 @@
+<%= 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">
+		    <%= text_field_tag :email, params[:email], :html => { class: 'string email required' } %>
+				<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">
+		    <%= password_field_tag :password %>
+				<p class="help-block"><%= link_to t('authentication.forgot_password'), new_password_reset_path %></p>
+			</div>
+	  </div>
+
+		<div class="control-group boolean optional">
+			<div class="controls">
+				<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 %>

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

@@ -1,38 +1,6 @@
 <h1><%= t('authentication.login_now') %></h1>
 
-<%= 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">
-		    <%= text_field_tag :email, params[:email], :html => { class: 'string email required' } %>
-				<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">
-		    <%= password_field_tag :password %>
-				<p class="help-block"><%= link_to t('authentication.forgot_password'), new_password_reset_path %></p>
-			</div>
-	  </div>
-
-		<div class="control-group boolean optional">
-			<div class="controls">
-				<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 %>
+<%= render 'form' %>
 
 <%# partial in tkh_menus gem or has to be added in host app %>
 <%= render './shared/menus' %>

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

@@ -0,0 +1,13 @@
+<ul class="nav nav-tabs" id="loginTab">
+	<li class="active"><a href="#login-tab" data-toggle="tab">login</a></li>
+	<li><a href="#signup-tab" data-toggle="tab">create account</a></li>
+</ul>
+ 
+<div class="tab-content">
+	<div class="tab-pane active" id="login-tab">
+		<%= render 'sessions/form' %>
+	</div>
+	<div class="tab-pane" id="signup-tab">
+		<%= render 'users/form', user: User.new %>
+	</div>
+</div>

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

@@ -0,0 +1,15 @@
+<%= simple_form_for user, :html => { class: 'form-horizontal' } do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :email %>
+		<%= f.input :first_name %>
+		<%= f.input :last_name %>
+    <%= f.input :password %>
+		<%= f.input :password_confirmation, required: true %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t('authentication.create_account'), :class => 'btn btn-primary' %>
+  </div>
+<% end %>

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

@@ -1,20 +1,6 @@
 <h1><%= t('authentication.create_account') %></h1>
 
-<%= simple_form_for @user, :html => { class: 'form-horizontal' } do |f| %>
-  <%= f.error_notification %>
-
-  <div class="form-inputs">
-    <%= f.input :email %>
-		<%= f.input :first_name %>
-		<%= f.input :last_name %>
-    <%= f.input :password %>
-		<%= f.input :password_confirmation, required: true %>
-  </div>
-
-  <div class="form-actions">
-    <%= f.button :submit, t('authentication.create_account'), :class => 'btn btn-primary' %>
-  </div>
-<% end %>
+<%= render 'form', user: @user %>
 
 <%# partial in tkh_menus gem or has to be added in host app %>
 <%= render './shared/menus' %>

data/lib/tkh_authentication/version.rb

@@ -1,3 +1,3 @@
 module TkhAuthentication
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_authentication
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -106,10 +106,13 @@ files:
 - 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_login_module.html.erb
 - app/views/shared/_login_info.html.erb
 - app/views/shared/_login_info_for_sidebar.html.erb
 - app/views/user_mailer/password_reset.text.erb
+- app/views/users/_form.html.erb
 - app/views/users/index.html.erb
 - app/views/users/new.html.erb
 - config/routes.rb
@@ -173,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3853324972041632603
+      hash: -4266320656794431571
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -182,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3853324972041632603
+      hash: -4266320656794431571
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23