user_authentication 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6426ee5790ceed405afdbe0fe48a3e10d7fcffb
-  data.tar.gz: 860ff4cffc4435d8e28a4f40f625afe7eb8bc1f7
+  metadata.gz: 17f2717aefc439f9917b101b30ba05ad47a4beae
+  data.tar.gz: 8f5836d3a23da681d90d6967929275f036e2e82c
 SHA512:
-  metadata.gz: 526a67e1cc0914b4b91b17c4a79e0258474d559f7a81a0aa4e5c3907baa62137ba8f645cc975b1a4774865737ad1a7ddf2b3b44eaccc6eac52775a9eb887d644
-  data.tar.gz: a89ea4aa16cb3c8acc76bc00cc689f182bdf6b22d13b83ab5ff48162aa6717b312a228bb28d6272df84ef54f20a3824e184e7215638d1d746ff763cc57d98d1c
+  metadata.gz: 8aab8a8a433b7b7dd6e1919de7233f7e59755049b269b98d1aea019aa3fdf3a2fea9a0554787f799aa6ddc39205d2d4fe0b76dc4fefc5edd06e57d42d697fe4b
+  data.tar.gz: 45d750a8beddee8285497e2c3ee3af5e8c4d23d63c23bd95b55caeeaf019c401eaea040926a2d206a3d8f5c4eb4d1f6e79e5e13c2ed01ce4a60f18f245e05af4

data/app/controllers/application_controller.rb

@@ -4,9 +4,9 @@ class ApplicationController < ActionController::Base
  # private
 
   def authorize
-    # Not using skip_before_filter, since main app could inadvertently override that, for example,
-    # by using a before_filter in its application_controller.
-    if params[:controller] == 'users' && ['login', 'logout', 'signup'].include?(params[:action])
+    # 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])
       return true
     end
 
@@ -31,4 +31,4 @@ class ApplicationController < ActionController::Base
   end
 end
 
-require File.join Rails.root, 'app/controllers/application_controller'
+require File.join Rails.root, "app/controllers/application_controller"

data/app/controllers/users_controller.rb

@@ -2,6 +2,12 @@ class UsersController < ApplicationController
   before_filter :authorize, only: [:set_password]
 
   def login
+  end
+
+  def signup
+  end
+
+  def do_login
     user = User.find_by_email params[:email]
     if user && user.authenticate(params[:password])
       session[:user_id] = user.id
@@ -10,25 +16,25 @@ class UsersController < ApplicationController
       if respond_to? :on_login
         on_login
       else
-        redirect_to :back
+        redirect_to params[:redirect] || :back
       end
     else
       redirect_to :back, alert: 'Please check email and password.'
     end
   end
 
-  def logout
+  def do_logout
     session.delete :user_id
     set_current_user
 
     if respond_to? :on_logout
       on_logout
     else
-      redirect_to :back
+      redirect_to root_path
     end
   end
 
-  def signup
+  def do_signup
     user = User.new
     user.email = params[:email]
     user.password = params[:password]
@@ -40,7 +46,7 @@ class UsersController < ApplicationController
       if respond_to? :on_signup
         on_signup
       else
-        redirect_to :back
+        redirect_to params[:redirect] || :back
       end
     else
       redirect_to :back, alert: 'Please check email and password.'
@@ -54,7 +60,7 @@ class UsersController < ApplicationController
     if respond_to? :on_set_password
       on_set_password
     else
-      redirect_to :back
+      redirect_to params[:redirect] || :back
     end
   end
 end

data/app/views/{users → shared}/_login.html.erb

@@ -1,4 +1,7 @@
 <%= form_tag login_path do %>
+    <% if local_assigns.include?(:redirect) %>
+      <%= hidden_field_tag :redirect, redirect %>
+    <% end %>
     <%= label_tag :email %>
     <br>
     <%= text_field_tag :email, params[:email] %>

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

@@ -0,0 +1,18 @@
+<%= form_tag signup_path do %>
+  <% if local_assigns.include?(:redirect) %>
+    <%= hidden_field_tag :redirect, redirect %>
+  <% end %>
+  <%= label_tag :email, "Your email" %>
+  <br>
+  <%= text_field_tag :email, params[:email] %>
+  <br>
+  <%= label_tag :email_confirmation, "Confirm your email" %>
+  <br>
+  <%= text_field_tag :email_confirmation, params[:email_confirmation] %>
+  <br>
+  <%= label_tag :password, "Choose a password" %>
+  <br>
+  <%= password_field_tag :password %>
+  <br>
+  <%= submit_tag "Sign Up" %>
+<% end %>

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

@@ -0,0 +1 @@
+<%= render "shared/login" %>

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

@@ -0,0 +1 @@
+<%= render "shared/signup" %>

data/config/routes.rb

@@ -1,6 +1,11 @@
 Rails.application.routes.draw do
-  match 'login' => 'users#login', :via => :post
-  match 'logout' => 'users#logout', :via => :get
-  match 'signup' => 'users#signup', :via => :post
-  match 'set_password' => 'users#set_password', :via => :post
+  match "login" => "users#login", :via => :get
+  match "login" => "users#do_login", :via => :post
+
+  match "logout" => "users#do_logout", :via => :get
+
+  match "signup" => "users#signup", :via => :get
+  match "signup" => "users#do_signup", :via => :post
+
+  match "set_password" => "users#set_password", :via => :post
 end

data/lib/user_authentication/version.rb

@@ -1,3 +1,3 @@
 module UserAuthentication
-  VERSION = '0.1.2'
+  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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sujoy Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -162,7 +162,10 @@ files:
 - app/helpers/application_helper.rb
 - app/models/user.rb
 - app/validators/email_validator.rb
-- app/views/users/_login.html.erb
+- app/views/shared/_login.html.erb
+- app/views/shared/_signup.html.erb
+- app/views/users/login.html.erb
+- app/views/users/signup.html.erb
 - config/routes.rb
 - db/migrate/20121009010000_create_users.rb
 - lib/random.rb