cafe-grader-web Commit - r76:d35e4fe536bb

r76:d35e4fe536bb - Sun, 30 Mar 2008 10:53:00 - 16 files changed: 281 inserted, 12 deleted

app/controllers/configurations_controller.rb created 644 ¶ +20

			@@ -0,0 +1,20
		1	+ class ConfigurationsController < ApplicationController
		2	+
		3	+ before_filter :authenticate
		4	+ before_filter { \|controller\| controller.authorization_by_roles(['admin'])}
		5	+
		6	+ in_place_edit_for :configuration, :key
		7	+ in_place_edit_for :configuration, :type
		8	+ in_place_edit_for :configuration, :value
		9	+
		10	+ def index
		11	+ @configurations = Configuration.find(:all,
		12	+ :order => '`key`')
		13	+ end
		14	+
		15	+ def reload
		16	+ Configuration.reload
		17	+ redirect_to :action => 'index'
		18	+ end
		19	+
		20	+ end

app/helpers/configurations_helper.rb created 644 ¶ +2

			@@ -0,0 +1,2
		1	+ module ConfigurationsHelper
		2	+ end

app/models/configuration.rb created 644 ¶ +43

			@@ -0,0 +1,43
		1	+ class Configuration < ActiveRecord::Base
		2	+
		3	+ @@configurations = nil
		4	+
		5	+ def self.get(key)
		6	+ if @@configurations == nil
		7	+ self.read_config
		8	+ end
		9	+ return @@configurations[key]
		10	+ end
		11	+
		12	+ def self.[](key)
		13	+ self.get(key)
		14	+ end
		15	+
		16	+ def self.reload
		17	+ self.read_config
		18	+ end
		19	+
		20	+ def self.clear
		21	+ @@configurations = nil
		22	+ end
		23	+
		24	+ protected
		25	+ def self.read_config
		26	+ @@configurations = {}
		27	+ Configuration.find(:all).each do \|conf\|
		28	+ key = conf.key
		29	+ val = conf.value
		30	+ case conf.value_type
		31	+ when 'string'
		32	+ @@configurations[key] = val
		33	+
		34	+ when 'integer'
		35	+ @@configurations[key] = val.to_i
		36	+
		37	+ when 'boolean'
		38	+ @@configurations[key] = (val=='true')
		39	+ end
		40	+ end
		41	+ end
		42	+
		43	+ end

app/views/configurations/index.html.haml created 644 ¶ +26

			@@ -0,0 +1,26
		1	+ - content_for :head do
		2	+ = javascript_include_tag :defaults
		3	+
		4	+ %h1 Grader configuration
		5	+
		6	+ %table
		7	+ %tr
		8	+ %th Key
		9	+ %th Type
		10	+ %th Value
		11	+
		12	+ - @configurations.each do \|conf\|
		13	+ - @configuration = conf
		14	+ %tr
		15	+ %td
		16	+ = in_place_editor_field :configuration, :key, {}, :rows=>1
		17	+ %td
		18	+ = in_place_editor_field :configuration, :value_type, {}, :rows=>1
		19	+ %td
		20	+ = in_place_editor_field :configuration, :value, {}, :rows=>1
		21	+
		22	+ %br/
		23	+ = link_to '[Reload configuration]', :action => 'reload'
		24	+ %br/
		25	+ Your config is saved, but it does not automatically take effect.
		26	+ You must reload.

db/migrate/022_create_configurations.rb created 644 ¶ +37

			@@ -0,0 +1,37
		1	+ class CreateConfigurations < ActiveRecord::Migration
		2	+ def self.up
		3	+ create_table :configurations do \|t\|
		4	+ t.column :key, :string
		5	+ t.column :value_type, :string
		6	+ t.column :value, :string
		7	+ t.timestamps
		8	+ end
		9	+
		10	+ Configuration.reset_column_information
		11	+
		12	+ Configuration.create(:key => 'system.single_user_mode',
		13	+ :value_type => 'boolean',
		14	+ :value => 'false')
		15	+
		16	+ Configuration.create(:key => 'ui.front.title',
		17	+ :value_type => 'string',
		18	+ :value => 'Grader')
		19	+
		20	+ Configuration.create(:key => 'ui.front.welcome_message',
		21	+ :value_type => 'string',
		22	+ :value => 'Welcome!')
		23	+
		24	+ Configuration.create(:key => 'ui.show_score',
		25	+ :value_type => 'boolean',
		26	+ :value => 'true')
		27	+
		28	+ Configuration.create(:key => 'contest.time_limit',
		29	+ :value_type => 'string',
		30	+ :value => 'unlimited')
		31	+
		32	+ end
		33	+
		34	+ def self.down
		35	+ drop_table :configurations
		36	+ end
		37	+ end

spec/models/configuration_spec.rb created 644 ¶ +90

			@@ -0,0 +1,90
		1	+
		2	+ require File.dirname(__FILE__) + '/../spec_helper'
		3	+
		4	+ describe Configuration do
		5	+
		6	+ before(:each) do
		7	+ @int_config = mock(Configuration,
		8	+ :id => 1,
		9	+ :key => 'mode',
		10	+ :value_type => 'integer',
		11	+ :value => '30')
		12	+
		13	+ @string_config = mock(Configuration,
		14	+ :id => 2,
		15	+ :key => 'title',
		16	+ :value_type => 'string',
		17	+ :value => 'Hello')
		18	+
		19	+ @boolean_config = mock(Configuration,
		20	+ :id => 3,
		21	+ :key => 'single_user_mode',
		22	+ :value_type => 'boolean',
		23	+ :value => 'true')
		24	+ end
		25	+
		26	+ it "should retrieve int config" do
		27	+ Configuration.should_receive(:find).once.with(:all).
		28	+ and_return([@int_config, @string_config, @boolean_config])
		29	+
		30	+ Configuration.clear
		31	+ val = Configuration.get('mode')
		32	+ val.should == 30
		33	+ end
		34	+
		35	+ it "should retrieve boolean config" do
		36	+ Configuration.should_receive(:find).once.with(:all).
		37	+ and_return([@int_config, @string_config, @boolean_config])
		38	+
		39	+ Configuration.clear
		40	+ val = Configuration.get('single_user_mode')
		41	+ val.should == true
		42	+ end
		43	+
		44	+ it "should retrieve string config" do
		45	+ Configuration.should_receive(:find).once.with(:all).
		46	+ and_return([@int_config, @string_config, @boolean_config])
		47	+
		48	+ Configuration.clear
		49	+ val = Configuration.get('title')
		50	+ val.should == "Hello"
		51	+ end
		52	+
		53	+ it "should retrieve config with []" do
		54	+ Configuration.should_receive(:find).once.with(:all).
		55	+ and_return([@int_config, @string_config, @boolean_config])
		56	+
		57	+ Configuration.clear
		58	+ val = Configuration['title']
		59	+ val.should == "Hello"
		60	+ end
		61	+
		62	+ it "should read config table once" do
		63	+ Configuration.should_receive(:find).once.with(:all).
		64	+ and_return([@int_config, @string_config, @boolean_config])
		65	+
		66	+ Configuration.clear
		67	+ val = Configuration.get('title')
		68	+ val.should == "Hello"
		69	+ val = Configuration.get('single_user_mode')
		70	+ val.should == true
		71	+ val = Configuration.get('mode')
		72	+ val.should == 30
		73	+ end
		74	+
		75	+ it "should be able to reload config" do
		76	+ Configuration.should_receive(:find).twice.with(:all).
		77	+ and_return([@int_config, @string_config, @boolean_config],
		78	+ [mock(Configuration,
		79	+ :key => 'title', :value_type => 'string',
		80	+ :value => 'Goodbye')])
		81	+
		82	+ Configuration.clear
		83	+ val = Configuration.get('title')
		84	+ val.should == "Hello"
		85	+ Configuration.reload
		86	+ val = Configuration.get('title')
		87	+ val.should == "Goodbye"
		88	+ end
		89	+
		90	+ end

test/fixtures/configurations.yml created 644 ¶ +7

			@@ -0,0 +1,7
		1	+ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
		2	+
		3	+ # one:
		4	+ # column: value
		5	+ #
		6	+ # two:
		7	+ # column: value

test/functional/configurations_controller_test.rb created 644 ¶ +8

			@@ -0,0 +1,8
		1	+ require File.dirname(__FILE__) + '/../test_helper'
		2	+
		3	+ class ConfigurationsControllerTest < ActionController::TestCase
		4	+ # Replace this with your real tests.
		5	+ def test_truth
		6	+ assert true
		7	+ end
		8	+ end

test/unit/configuration_test.rb created 644 ¶ +8

			@@ -0,0 +1,8
		1	+ require File.dirname(__FILE__) + '/../test_helper'
		2	+
		3	+ class ConfigurationTest < ActiveSupport::TestCase
		4	+ # Replace this with your real tests.
		5	+ def test_truth
		6	+ assert true
		7	+ end
		8	+ end

app/controllers/application.rb ¶ +13 -1

                 # Pick a unique cookie name to distinguish our session data from others'
                 session :session_key => '_grader_session_id'
+            +   SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
+            +
+            +   def authorization_by_roles(allowed_roles)
+            +     return false unless authenticate
+            +     user = User.find(session[:user_id])
+            +     unless user.roles.detect { |role| allowed_roles.member?(role.name) }
+            +       flash[:notice] = 'You are not authorized to view the page you requested'
+            +       redirect_to :controller => 'main', :action => 'login'
+            +       return false
+            +     end
+            +   end
+            +
                 protected
                 def authenticate
                   unless session[:user_id]
                   end
                   # check if run in single user mode
-            -     if defined?(SINGLE_USER_MODE) and (SINGLE_USER_MODE)
+            +     if (Configuration[SINGLE_USER_MODE_CONF_KEY])
                     user = User.find(session[:user_id])
                     if user==nil or user.login != 'root'
                       redirect_to :controller => 'main', :action => 'login'

app/controllers/main_controller.rb ¶ +6

                 end
                 def login
+            +     saved_notice = flash[:notice]
                   reset_session
+            +     flash[:notice] = saved_notice
+            +
+            +     @title = Configuration['ui.front.title']
+            +     @welcome = Configuration['ui.front.welcome_message']
+            +
                   render :action => 'login', :layout => 'empty'
                 end

app/helpers/application_helper.rb ¶ +5

                   # general options
                   append_to menu_items, '[Settings]', 'users', 'index'
+            +
+            +     if (user!=nil) and (user.admin?)
+            +       append_to menu_items, '[Site config]', 'configurations', 'index'
+            +     end
+            +
                   append_to menu_items, '[Log out]', 'main', 'login'
                   menu_items

app/views/main/login.rhtml ¶ +2 -2

-            - <h1>Grader</h1>
+            + <h1><%= @title %></h1>
-            - <b>Welcome back!</b><br/>
+            + <b><%= @welcome %></b><br/>
               Please login to see the problem list.<br/><br/>
               <% if flash[:notice] %>

config/environment.rb.SAMPLE ¶ -3

               # These are where inputs and outputs of test requests are stored
               TEST_REQUEST_INPUT_FILE_DIR = RAILS_ROOT + '/data/test_request/input'
               TEST_REQUEST_OUTPUT_FILE_DIR = RAILS_ROOT + '/data/test_request/output'
+            -
-            - # Uncomment this for single user mode (only root is allowed to log in)
-            - # SINGLE_USER_MODE = true

db/schema.rb ¶ +9 -1

               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 21) do
+            + ActiveRecord::Schema.define(:version => 22) do
+            +
+            +   create_table "configurations", :force => true do |t|
+            +     t.string   "key"
+            +     t.string   "value_type"
+            +     t.string   "value"
+            +     t.datetime "created_at"
+            +     t.datetime "updated_at"
+            +   end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20

spec/controllers/main_controller_spec.rb ¶ +5 -5

                                      :source => 'sample source',
                                      :compiler_message => 'none')
                   @user = mock(User, :id => 1, :login => 'john')
-            -     Submission.should_receive(:find).with(@user.id.to_s).and_return(@submission)
+            +     Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
                 end
                 it "should let user sees her own source" do
-            -     get 'source', {:id => 1}, {:user_id => 1}
+            +     get 'source', {:id => @submission.id}, {:user_id => 1}
                   response.should be_success
                 end
                 it "should let user sees her own compiler message" do
-            -     get 'compiler_msg', {:id => 1}, {:user_id => 1}
+            +     get 'compiler_msg', {:id => @submission.id}, {:user_id => 1}
                   response.should be_success
                 end
                 it "should not let user sees other user's source" do
-            -     get 'source', {:id => 1}, {:user_id => 2}
+            +     get 'source', {:id => @submission.id}, {:user_id => 2}
                   flash[:notice].should =~ /[Ee]rror/
                   response.should redirect_to(:action => 'list')
                 end
                 it "should not let user sees other user's compiler message" do
-            -     get 'compiler_msg', {:id => 1}, {:user_id => 2}
+            +     get 'compiler_msg', {:id => @submission.id}, {:user_id => 2}
                   flash[:notice].should =~ /[Ee]rror/
                   response.should redirect_to(:action => 'list')
                 end

	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

r76:d35e4fe536bb - Sun, 30 Mar 2008 10:53:00 - 16 files changed: 281 inserted, 12 deleted

Sign in to your account

Commit r76:d35e4fe536bb public

Author

r76:d35e4fe536bb - Sun, 30 Mar 2008 10:53:00 - 16 files changed: 281 inserted, 12 deleted

Commit `r76:d35e4fe536bb` public