cafe-grader-web Commit - r155:f1e975d4e9fc

cafe-grader-web

Commit `r155:f1e975d4e9fc` public

parent | child

Description:

start working on e-mail registration git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@294 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

r155:f1e975d4e9fc - Fri, 05 Dec 2008 08:52:15 - 14 files changed: 144 inserted, 8 deleted

db/migrate/20081204081043_add_more_options_to_configurations.rb created 644 ¶ +23

@@ -0,0 +1,23
	1	+ class AddMoreOptionsToConfigurations < ActiveRecord::Migration
	2	+ def self.up
	3	+ # If the server is in contest mode and
	4	+ # Configuration['contest.multisites'] is true
	5	+ # the menu for site administrator is shown.
	6	+
	7	+ Configuration.create(:key => 'contest.multisites',
	8	+ :value_type => 'boolean',
	9	+ :value => 'false')
	10	+
	11	+ # If Configuration['system.online_registration'] is true,
	12	+ # the registration menu would appear
	13	+
	14	+ Configuration.create(:key => 'system.online_registration',
	15	+ :value_type => 'boolean',
	16	+ :value => 'false')
	17	+ end
	18	+
	19	+ def self.down
	20	+ Configuration.find_by_key('contest.multisites').destroy
	21	+ Configuration.find_by_key('system.online_registration').destroy
	22	+ end
	23	+ end

db/migrate/20081204122651_add_activated_to_users.rb created 644 ¶ +15

@@ -0,0 +1,15
	1	+ class AddActivatedToUsers < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :users, :activated, :boolean, :default => 0
	4	+
	5	+ User.find(:all).each do \|user\|
	6	+ user.activated = true
	7	+ user.save
	8	+ end
	9	+ end
	10	+
	11	+
	12	+ def self.down
	13	+ remove_column :users, :activated
	14	+ end
	15	+ end

script/dbconsole created 755 ¶ +3

@@ -0,0 +1,3
	1	+ #!/usr/bin/env ruby
	2	+ require File.dirname(__FILE__) + '/../config/boot'
	3	+ require 'commands/dbconsole'

script/performance/request created 755 ¶ +3

@@ -0,0 +1,3
	1	+ #!/usr/bin/env ruby
	2	+ require File.dirname(__FILE__) + '/../../config/boot'
	3	+ require 'commands/performance/request'

spec/models/user_spec.rb created 644 ¶ +53

@@ -0,0 +1,53
	1	+
	2	+ require File.dirname(__FILE__) + '/../spec_helper'
	3	+
	4	+ describe User do
	5	+
	6	+ before(:each) do
	7	+ @password = "hello"
	8	+ @salt = "123"
	9	+ @john = stub_model(User, :salt => @salt,
	10	+ :hashed_password => User.encrypt(@password,@salt))
	11	+ end
	12	+
	13	+ it "should authenticate activated user" do
	14	+ @john.should_receive(:activated).and_return(true)
	15	+ @john.authenticated?(@password).should == true
	16	+ end
	17	+
	18	+ it "should not authenticate inactivated user" do
	19	+ @john.should_receive(:activated).and_return(false)
	20	+ @john.authenticated?(@password).should == false
	21	+ end
	22	+
	23	+ it "should not authenticate user with incorrect password" do
	24	+ @john.should_receive(:activated).and_return(true)
	25	+ @john.should_receive(:hashed_password).and_return("byebye")
	26	+ @john.authenticated?(@password).should == false
	27	+ end
	28	+
	29	+ end
	30	+
	31	+ describe User, "during registration" do
	32	+
	33	+ class User
	34	+ public :encrypt_new_password
	35	+ end
	36	+
	37	+ before(:each) do
	38	+ @john = User.new(:login => 'john', :password => 'hello')
	39	+ @john.encrypt_new_password
	40	+ end
	41	+
	42	+ it "should produce and accept activation key" do
	43	+ activation_key = @john.activation_key
	44	+
	45	+ @john.verify_activation_key(activation_key).should == true
	46	+ end
	47	+
	48	+ it "should not accept invalid activation key" do
	49	+ @john.verify_activation_key("12345").should == false
	50	+ end
	51	+
	52	+
	53	+ end

app/controllers/user_admin_controller.rb ¶ +2

                 end
                 def show
                   @user = User.find(params[:id])
                 end
                 def new
                   @user = User.new
                 end
                 def create
                   @user = User.new(params[:user])
+            +     @user.activated = true
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
                 def create_from_list
                   lines = params[:user_list]
                   lines.split("\n").each do |line|
                     items = line.chomp.split(',')
                     if items.length==4
                       user = User.new
                       user.login = items[0]
                       user.full_name = items[1]
                       user.alias = items[2]
                       user.password = items[3]
                       user.password_confirmation = items[3]
+            +         user.activated = true
                       user.save
                     end
                   end
                   redirect_to :action => 'list'
                 end
                 def edit
                   @user = User.find(params[:id])
                 end
                 def update
                   @user = User.find(params[:id])

app/models/configuration.rb ¶ +5 -1

                 def self.read_config
                   @@configurations = {}
                   Configuration.find(:all).each do |conf|
                     key = conf.key
                     val = conf.value
                     @@configurations[key] = Configuration.convert_type(val,conf.value_type)
                   end
                 end
                 def self.read_one_key(key)
                   conf = Configuration.find_by_key(key)
-            -     return Configuration.convert_type(conf.value,conf.value_type)
+            +     if conf
+            +       return Configuration.convert_type(conf.value,conf.value_type)
+            +     else
+            +       return nil
+            +     end
                 end
                 def self.read_grading_info
                   f = File.open(TASK_GRADING_INFO_FILENAME)
                   @@task_grading_info = YAML.load(f)
                   f.close
                 end
               end

app/models/user.rb ¶ +13 -1

                 validates_confirmation_of :password, :if => :password_required?
                 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)
-            -     hashed_password == User.encrypt(password,self.salt)
+            +     if self.activated
+            +       hashed_password == User.encrypt(password,self.salt)
+            +     else
+            +       false
+            +     end
                 end
                 def admin?
                   self.roles.detect {|r| r.name == 'admin' }
                 end
                 def email_for_editing
                   if self.email==nil
                     "(unknown)"
                   elsif self.email==''
                     "(blank)"
                   else
                     "(unknown)"
                   elsif self.alias==''
                     "(blank)"
                   else
                     self.alias
                   end
                 end
                 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
+            +
                 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)

app/views/main/login.html.haml ¶ +8 -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.mode']=='contest'
+            + -# 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|
                       = "siteList[#{country.id}][#{site.id}] = \"#{site.name}\";"
                   var allSiteList = new Array();
                   - @site_select.each do |sel|
                     = "allSiteList[#{sel[1]}]=\"#{sel[0]}\";"
                 %script{:type => 'text/javascript', :src => '/javascripts/site_update.js'}

config/boot.rb ¶ +4 -4

                     def gem_version
                       if defined? RAILS_GEM_VERSION
                         RAILS_GEM_VERSION
                       elsif ENV.include?('RAILS_GEM_VERSION')
                         ENV['RAILS_GEM_VERSION']
                       else
                         parse_gem_version(read_environment_rb)
                       end
                     end
                     def load_rubygems
                       require 'rubygems'
+            +         min_version = '1.1.1'
-            -         unless rubygems_version >= '0.9.4'
+            +         unless rubygems_version >= min_version
-            -           $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+            +           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
                         exit 1
                       end
                     rescue LoadError
-            -         $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+            +         $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
                       exit 1
                     end
                     def parse_gem_version(text)
                       $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
                     end
                     private
                       def read_environment_rb
                         File.read("#{RAILS_ROOT}/config/environment.rb")
                       end
                   end

config/environment.rb.SAMPLE ¶ +7

                 # This is necessary if your schema can't be completely dumped by the schema dumper,
                 # like if you have constraints or database-specific column types
                 # config.active_record.schema_format = :sql
                 # Activate observers that should always be running
                 # config.active_record.observers = :cacher, :garbage_collector
                 # Make Active Record use UTC-base instead of local time
                 config.active_record.default_timezone = :utc
                 # See Rails::Configuration for more options
+            +   # -------------
+            +   # Required gems
+            +   # -------------
+            +
                 # This is for rspec
                 config.gem "rspec-rails", :lib => "spec"
+            +   config.gem "haml"
+            +   config.gem "pony"
+            +   #config.gem "BlueCloth", :lig => "bluecloth"
               end
               # Add new inflection rules using the following format
               # (all these examples are active by default):
               # Inflector.inflections do |inflect|
               #   inflect.plural /^(ox)$/i, '\1en'
               #   inflect.singular /^(ox)en/i, '\1'
               #   inflect.irregular 'person', 'people'
               #   inflect.uncountable %w( fish sheep )
               # end
               # Add new mime types for use in respond_to blocks:

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20081107145815) do
+            + ActiveRecord::Schema.define(:version => 20081204122651) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",  :default => false
                 end
                 create_table "configurations", :force => true do |t|
                   t.string   "key"
                 add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id"
                 create_table "users", :force => true do |t|
                   t.string  "login",           :limit => 10
                   t.string  "full_name"
                   t.string  "hashed_password"
                   t.string  "salt",            :limit => 5
                   t.string  "alias"
                   t.string  "email"
                   t.integer "site_id"
                   t.integer "country_id"
+            +     t.boolean "activated",                     :default => false
                 end
                 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
               end

spec/models/configuration_spec.rb ¶ +5

               require File.dirname(__FILE__) + '/../spec_helper'
               describe Configuration do
+            +   # only work with cached configuration
+            +   class Configuration
+            +     @@cache = true
+            +   end
+            +
                 before(:each) do
                   @int_config = mock(Configuration,
                                      :id => 1,
                                      :key => 'mode',
                                      :value_type => 'integer',
                                      :value => '30')
                   @string_config = mock(Configuration,
                                         :id => 2,
                                         :key => 'title',
                                         :value_type => 'string',
                                         :value => 'Hello')

vendor/plugins/haml/init.rb ¶ +1

               begin
                 require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here
               rescue LoadError
                 require 'haml' # From gem
               end
+            + # Load Haml and Sass
               Haml.init_rails(binding)

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

r155:f1e975d4e9fc - Fri, 05 Dec 2008 08:52:15 - 14 files changed: 144 inserted, 8 deleted

Sign in to your account

Commit r155:f1e975d4e9fc public

Author

r155:f1e975d4e9fc - Fri, 05 Dec 2008 08:52:15 - 14 files changed: 144 inserted, 8 deleted

Commit `r155:f1e975d4e9fc` public