user_authentication 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0771aa4338882aa29e939ae140e6e8ada1c3657
-  data.tar.gz: e9da8225270fdb650182d2ef831fbb9abb82d511
+  metadata.gz: ffb87963dca325931b4e2c6dff618271efbd2d47
+  data.tar.gz: 6236635ec627f6096717abaa7d272fca85a5329f
 SHA512:
-  metadata.gz: f6690895ae172015719d53c1fb06468fd16c41cb6e8b5ff4fcd9fb20d7837d5635f2956b090d2f3d312319b410fbb50ce1e06265efd15a200b10dfbe1585779e
-  data.tar.gz: 3635aa3ded98da7f7d8cba087431b12bb67ef6e1e8d7efe0fddaadfb363f14d9c6b9dca6ae7b68df9d34c44a83c47490750cce43852c5a4bec0d21b71013011d
+  metadata.gz: 901e26a4ca310b42d4b8d74bf8328923f73dca947b9b08cbf93daf5aa159423abfbd07f830721338ccec8ddf7b93d558b831ee82e88887dc05fc049a7b55b7c8
+  data.tar.gz: e21a2c29d3c4eb32fa9554d323b780d2bdad7a9a4eb606c8fbb209db0c75671545fea0cf26d02c731ae6cd9dd588dc11236b6bfbbe5ac0d7047f8b14df472d8b

data/app/controllers/application_controller.rb

@@ -19,7 +19,12 @@ class ApplicationController < ActionController::Base
   end
 
   def set_current_user
-    @current_user ||= User.find(session[:user_id]) if session[:user_id]
+    if session[:user_id].nil?
+      @current_user = nil
+    elsif @current_user.nil? || @current_user.id != session[:user_id]
+      @current_user = User.find session[:user_id]
+    end
+
     true
   end
 end

data/app/controllers/users_controller.rb

@@ -1,19 +1,50 @@
+controller = File.join Rails.root, 'app/controllers/users_controller.rb'
+require controller if File.exists? controller
+
 class UsersController < ApplicationController
   def login
     user = User.find_by_email params[:email]
     if user && user.authenticate(params[:password])
       session[:user_id] = user.id
-      redirect_to session.delete(:return_to) || root_path
+      set_current_user
+
+      if respond_to? :on_login
+        on_login
+      else
+        redirect_to :back
+      end
     else
-      redirect_to root_path, alert: "Please check email and password."
+      redirect_to :back, alert: 'Please check email and password.'
     end
   end
 
   def logout
-    session.delete :return_to
     session.delete :user_id
+    set_current_user
 
-    redirect_to root_path
+    if respond_to? :on_logout
+      on_logout
+    else
+      redirect_to :back
+    end
   end
-end
 
+  def signup
+    user = User.new
+    user.email = params[:email]
+    user.password = params[:password]
+
+    if user.save
+      session[:user_id] = user.id
+      set_current_user
+
+      if respond_to? :on_signup
+        on_signup
+      else
+        redirect_to :back
+      end
+    else
+      redirect_to :back, alert: 'Please check email and password.'
+    end
+  end
+end

data/app/models/user.rb

@@ -4,7 +4,7 @@ class User < ActiveRecord::Base
   has_secure_password
 
   before_validation { |user| user.password = Random.password if user.password.nil? }
-  validates_presence_of :email
+  validates :email, presence: true, uniqueness: true, email: true
 end
 
 app_model = File.join Rails.root, 'app/models/user.rb'

data/app/validators/email_validator.rb

@@ -0,0 +1,11 @@
+# Adapted from http://my.rails-royce.org/2010/07/21/email-validation-in-ruby-on-rails-without-regexp/
+
+require 'mail'
+
+class EmailValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    email = Mail::Address.new(value)
+    valid = email.domain && email.address == value && email.__send__(:tree).domain.dot_atom_text.elements.size > 1 rescue false
+    record.errors[attribute] << (options[:message] || 'is malformed') unless valid
+  end
+end

data/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
-  match "login" => "users#login", :via => :post
-  match "logout" => "users#logout", :via => :get
+  match 'login' => 'users#login', :via => :post
+  match 'logout' => 'users#logout', :via => :get
+  match 'signup' => 'users#signup', :via => :post
 end

data/lib/user_authentication/version.rb

@@ -1,3 +1,3 @@
 module UserAuthentication
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: user_authentication
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Sujoy Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -95,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: specstar-controllers
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: specstar-models
+  name: specstar-controllers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: webrat
   requirement: !ruby/object:Gem::Requirement
@@ -147,13 +147,13 @@ files:
 - app/controllers/users_controller.rb
 - app/helpers/application_helper.rb
 - app/models/user.rb
+- app/validators/email_validator.rb
 - app/views/users/_login.html.erb
 - config/routes.rb
 - db/migrate/20121009010000_create_users.rb
 - 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

data/lib/user_authentication/version.rb~

@@ -1,3 +0,0 @@
-module UserAuthentication
-  VERSION = "0.0.8"
-end