cafe-grader-web Commit - r157:1ed23f0780ca

cafe-grader-web

Commit `r157:1ed23f0780ca` public

parent | child

Description:

more work on registration git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@296 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r157:1ed23f0780ca - Fri, 05 Dec 2008 16:57:03 - 6 files changed: 102 inserted, 4 deleted

app/views/users/new.html.haml created 644 ¶ +29

@@ -0,0 +1,29
	1	+ %h1 New user registration
	2	+
	3	+ = error_messages_for :user, :header_message => 'Errors occured during registration'
	4	+
	5	+ %table
	6	+ - form_for :user, @user, :url => { :action => 'register' } do \|f\|
	7	+ %tr
	8	+ %td Login:
	9	+ %td= f.text_field :login
	10	+ %tr
	11	+ %td
	12	+ %td
	13	+ %small Only a-z, A-Z, 0-9 and _
	14	+ %tr
	15	+ %td Full name:
	16	+ %td= f.text_field :full_name
	17	+ %tr
	18	+ %td E-mail:
	19	+ %td= f.text_field :email
	20	+ %tr
	21	+ %td
	22	+ %td
	23	+ %small
	24	+ Please make sure that your e-mail is correct.
	25	+ %br/
	26	+ You'll need to verify your account by email.
	27	+ %tr
	28	+ %td{:colspan => 2}= submit_tag "Register"
	29	+

app/views/users/new_splash.html.haml created 644 ¶ +11

@@ -0,0 +1,11
	1	+ %h1 Registration successful
	2	+
	3	+ We have sent a confimation message to your e-mail.
	4	+ %br/
	5	+ Please check at
	6	+ = "#{@user.email}."
	7	+ %br/
	8	+ %br/
	9	+
	10	+ Go back to
	11	+ = link_to 'login page.', :controller => 'main', :action => 'login'

app/controllers/users_controller.rb ¶ +25

+            + require 'pony'
+            +
               class UsersController < ApplicationController
                 before_filter :authenticate, :except => [:new, :register]
                 verify :method => :post, :only => [:chg_passwd],
                        :redirect_to => { :action => :index }
                 in_place_edit_for :user, :alias_for_editing
                 in_place_edit_for :user, :email_for_editing
                 def index
                   if !Configuration['system.user_setting_enabled']
                 def chg_passwd
                   user = User.find(session[:user_id])
                   user.password = params[:passwd]
                   user.password_confirmation = params[:passwd_verify]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
                   redirect_to :action => 'index'
                 end
+            +   def new
+            +     @user = User.new
+            +     render :action => 'new', :layout => 'empty'
                 end
+            +
+            +   def register
+            +     @user = User.new(params[:user])
+            +     @user.password_confirmation = @user.password = User.random_password
+            +     @user.activated = false
+            +     if (@user.valid?) and (@user.save)
+            +       send_confirmation_email(@user)
+            +       render :action => 'new_splash', :layout => 'empty'
+            +     else
+            +       @user.errors.add_to_base("Email cannot be blank") if @user.email==''
+            +       render :action => 'new', :layout => 'empty'
+            +     end
+            +   end
+            +
+            +   protected
+            +
+            +   def send_confirmation_email(user)
+            +   end
+            +
+            + end

app/models/user.rb ¶ +23

                          :class_name => "Message",
                          :foreign_key => "sender_id",
                          :order => 'created_at DESC'
                 has_many :replied_messages,
                          :class_name => "Message",
                          :foreign_key => "receiver_id",
                          :order => 'created_at DESC'
                 belongs_to :site
                 belongs_to :country
+            +   named_scope :activated, :conditions => {:activated => true}
+            +
                 validates_presence_of :login
+            +   validates_uniqueness_of :login
+            +   validates_format_of :login, :with => /^[\_a-z0-9]+$/
+            +   validates_length_of :login, :within => 3..10
+            +
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
+            +   validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :allow_blank => true
+            +
+            +   validate :uniqueness_of_email_from_activated_users
+            +
                 attr_accessor :password
                 before_save :encrypt_new_password
                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   return user if user && user.authenticated?(password)
                 end
                 def authenticated?(password)
                   if self.activated
                     hashed_password == User.encrypt(password,self.salt)
                 def alias_for_editing=(e)
                   self.alias=e
                 end
                 def activation_key
                   Digest::SHA1.hexdigest(self.hashed_password)[0..7]
                 end
                 def verify_activation_key(key)
                   key == activation_key
                 end
+            +   def self.random_password(length=5)
+            +     chars = 'abcdefghjkmnopqrstuvwxyz'
+            +     password = ''
+            +     length.times { password << chars[rand(chars.length - 1)] }
+            +     password
+            +   end
+            +
                 protected
                   def encrypt_new_password
                     return if password.blank?
                     self.salt = (10+rand(90)).to_s
                     self.hashed_password = User.encrypt(self.password,self.salt)
                   end
                   def password_required?
                     self.hashed_password.blank? || !self.password.blank?
                   end
                   def self.encrypt(string,salt)
                     Digest::SHA1.hexdigest(salt + string)
                   end
+            +
+            +     def uniqueness_of_email_from_activated_users
+            +       if User.activated.find_by_email(self.email)!=nil
+            +         self.errors.add_to_base("Email has already been taken")
                     end
+            +     end
+            + end

app/views/main/login.html.haml ¶ +1 -1

                 - form_tag :controller => 'login', :action => 'login' do
                   %table
                     %tr
                       %td{:align => "right"} Login:
                       %td= text_field_tag 'login'
                     %tr
                       %td{:align => "right"} Password:
                       %td= password_field_tag
                   = submit_tag 'Login'
               %br/
-            - -# if Configuration['system.online_registration']
+            + - if Configuration['system.online_registration']
                 Want to participate?
                 %b
                   Please
                   = link_to 'register.', :controller => :users, :action => :new
                 %br/
               - if (Configuration['system.mode']=='contest') and (Configuration['contest.multisites'])
                 %script{:type => 'text/javascript'}
                   var siteList = new Array();
                   - @countries.each do |country|
                     = "siteList[#{country.id}] = new Array();"
                     - country.sites.each do |site|

spec/models/user_spec.rb ¶ +13 -3

               require File.dirname(__FILE__) + '/../spec_helper'
               describe User do
                 before(:each) do
                   @password = "hello"
                   @salt = "123"
                   @john = stub_model(User, :salt => @salt,
                                      :hashed_password => User.encrypt(@password,@salt))
                 end
-            -   it "should authenticate activated user" do
+            +   it "should be authenticated if activated" do
                   @john.should_receive(:activated).and_return(true)
                   @john.authenticated?(@password).should == true
                 end
-            -   it "should not authenticate inactivated user" do
+            +   it "should not be authenticated if inactivated" do
                   @john.should_receive(:activated).and_return(false)
                   @john.authenticated?(@password).should == false
                 end
-            -   it "should not authenticate user with incorrect password" do
+            +   it "should not be authenticated if incorrect password is provided" do
                   @john.should_receive(:activated).and_return(true)
                   @john.should_receive(:hashed_password).and_return("byebye")
                   @john.authenticated?(@password).should == false
                 end
               end
               describe User, "during registration" do
                 class User
                   public :encrypt_new_password
                 end
                 end
                 it "should produce and accept activation key" do
                   activation_key = @john.activation_key
                   @john.verify_activation_key(activation_key).should == true
                 end
                 it "should not accept invalid activation key" do
                   @john.verify_activation_key("12345").should == false
                 end
+            + end
+            +
+            + describe User, "as a class" do
+            +
+            +   it "should be able to generate random password" do
+            +     password1 = User.random_password
+            +     password2 = User.random_password
+            +
+            +     password1.should_not == password2
+            +   end
               end

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r157:1ed23f0780ca - Fri, 05 Dec 2008 16:57:03 - 6 files changed: 102 inserted, 4 deleted

Sign in to your account

Commit r157:1ed23f0780ca public

Author

r157:1ed23f0780ca - Fri, 05 Dec 2008 16:57:03 - 6 files changed: 102 inserted, 4 deleted

Commit `r157:1ed23f0780ca` public