cafe-grader-web Commit - r745:75264caa616f

cafe-grader-web

Commit `r745:75264caa616f` public

parent | child

Description:

change depricated before_filter to before_action

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r745:75264caa616f - Wed, 03 Jul 2019 10:25:07 - 20 files changed: 38 inserted, 31 deleted

Gemfile ¶ +1

               gem 'rails', '~>5.0'
               gem 'activerecord-session_store'
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               #---------------- database ---------------------
               #the database
               gem 'mysql2'
               #for testing
               gem 'sqlite3'
+            + gem 'rails-controller-testing'
               #for dumping database into yaml
               gem 'yaml_db'
               # Gems used only for assets and not required
               # in production environments by default.
               gem 'sass-rails'
               gem 'coffee-rails'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
               gem 'uglifier'

Gemfile.lock ¶ +5

                   rails (5.0.7.2)
                     actioncable (= 5.0.7.2)
                     actionmailer (= 5.0.7.2)
                     actionpack (= 5.0.7.2)
                     actionview (= 5.0.7.2)
                     activejob (= 5.0.7.2)
                     activemodel (= 5.0.7.2)
                     activerecord (= 5.0.7.2)
                     activesupport (= 5.0.7.2)
                     bundler (>= 1.3.0)
                     railties (= 5.0.7.2)
                     sprockets-rails (>= 2.0.0)
+            +     rails-controller-testing (1.0.4)
+            +       actionpack (>= 5.0.1.x)
+            +       actionview (>= 5.0.1.x)
+            +       activesupport (>= 5.0.1.x)
                   rails-dom-testing (2.0.3)
                     activesupport (>= 4.2.0)
                     nokogiri (>= 1.6)
                   rails-html-sanitizer (1.0.4)
                     loofah (~> 2.2, >= 2.2.2)
                   rails_bootstrap_sortable (2.0.6)
                     momentjs-rails (>= 2.8.3)
                   railties (5.0.7.2)
                     actionpack (= 5.0.7.2)
                     activesupport (= 5.0.7.2)
                     method_source
                     rake (>= 0.8.7)
                 in_place_editing
                 jquery-countdown-rails
                 jquery-datatables-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-rails
                 mail
                 minitest-reporters
                 momentjs-rails
                 mysql2
                 rails (~> 5.0)
+            +   rails-controller-testing
                 rails_bootstrap_sortable
                 rdiscount
                 rouge
                 sass-rails
                 sassc-rails (>= 2.1.0)
                 select2-rails
                 sqlite3
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)
                 yaml_db

app/controllers/announcements_controller.rb ¶ +1 -1

               class AnnouncementsController < ApplicationController
-            -   before_filter :admin_authorization
+            +   before_action :admin_authorization
                 in_place_edit_for :announcement, :published
                 # GET /announcements
                 # GET /announcements.xml
                 def index
                   @announcements = Announcement.order(created_at: :desc)
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @announcements }
                   end

app/controllers/application_controller.rb ¶ +1 -1

               class ApplicationController < ActionController::Base
                 protect_from_forgery
-            -   before_filter :current_user
+            +   before_action :current_user
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
                 MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login'
                 #report and redirect for unauthorized activities
                 def unauthorized_redirect
                   flash[:notice] = 'You are not authorized to view the page you requested'
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 # Returns the current logged-in user (if any).
                 def current_user

app/controllers/configurations_controller.rb ¶ +2 -2

               class ConfigurationsController < ApplicationController
-            -   before_filter :authenticate
+            +   before_action :authenticate
-            -   before_filter { |controller| controller.authorization_by_roles(['admin'])}
+            +   before_action { |controller| controller.authorization_by_roles(['admin'])}
                 def index
                   @configurations = GraderConfiguration.order(:key)
                   @group = GraderConfiguration.pluck("grader_configurations.key").map{ |x| x[0...(x.index('.'))] }.uniq.sort
                 end
                 def reload
                   GraderConfiguration.reload
                   redirect_to :action => 'index'
                 end

app/controllers/contest_management_controller.rb ¶ +1 -1

               class ContestManagementController < ApplicationController
-            -   before_filter :admin_authorization
+            +   before_action :admin_authorization
                 def index
                   @num_contests = Contest.count()
                 end
                 def user_stat
                   if not GraderConfiguration.indv_contest_mode?
                     redirect_to :action => 'index' and return
                   end
                   @users = User.all
                   @start_times = {}

app/controllers/contests_controller.rb ¶ +1 -1

               class ContestsController < ApplicationController
-            -   before_filter :admin_authorization
+            +   before_action :admin_authorization
                 in_place_edit_for :contest, :title
                 in_place_edit_for :contest, :enabled
                 # GET /contests
                 # GET /contests.xml
                 def index
                   @contests = Contest.all
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @contests }

app/controllers/graders_controller.rb ¶ +1 -1

               class GradersController < ApplicationController
-            -   before_filter :admin_authorization
+            +   before_action :admin_authorization
                 verify :method => :post, :only => ['clear_all',
                                                    'start_exam',
                                                    'start_grading',
                                                    'stop_all',
                                                    'clear_terminated'],
                        :redirect_to => {:action => 'index'}
                 def index
                   redirect_to :action => 'list'
                 end

app/controllers/heartbeat_controller.rb ¶ +1 -1

               class HeartbeatController < ApplicationController
-            -   before_filter :admin_authorization, :only => ['index']
+            +   before_action :admin_authorization, :only => ['index']
                 def edit
                   #@user = User.find_by_login(params[:id])
                   #unless @user
                   #  render text: "LOGIN_NOT_FOUND"
                   #  return
                   #end
                   #hb = HeartBeat.where(user_id: @user.id, ip_address: request.remote_ip).first
                   #puts "status = #{params[:status]}"
                   #if hb
                   #  if params[:status]

app/controllers/main_controller.rb ¶ +5 -5

               class MainController < ApplicationController
-            -   before_filter :authenticate, :except => [:index, :login]
+            +   before_action :authenticate, :except => [:index, :login]
-            -   before_filter :check_viewability, :except => [:index, :login]
+            +   before_action :check_viewability, :except => [:index, :login]
-            -   append_before_filter :confirm_and_update_start_time,
+            +   append_before_action :confirm_and_update_start_time,
                                      :except => [:index,
                                                  :login,
                                                  :confirm_contest_start]
                 # to prevent log in box to be shown when user logged out of the
                 # system only in some tab
-            -   prepend_before_filter :reject_announcement_refresh_when_logged_out,
+            +   prepend_before_action :reject_announcement_refresh_when_logged_out,
                                       :only => [:announcements]
-            -   before_filter :authenticate_by_ip_address, :only => [:list]
+            +   before_action :authenticate_by_ip_address, :only => [:list]
                 # COMMENTED OUT: filter in each action instead
                 # before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 # COMMENT OUT: only need when having high load
                 # caches_action :index, :login
                 # NOTE: This method is not actually needed, 'config/routes.rb' has
                 # assigned action login as a default action.

app/controllers/messages_controller.rb ¶ +1 -1

               class MessagesController < ApplicationController
-            -   before_filter :authenticate
+            +   before_action :authenticate
                 verify :method => :post, :only => ['create'],
                        :redirect_to => { :action => 'list' }
                 before_filter :admin_authorization, :only => ['console','show',
                                                               'reply','hide','list_all']
                 def list
                   @user = User.find(session[:user_id])
                   @messages = Message.find_all_sent_by_user(@user)
                 end

app/controllers/report_controller.rb ¶ +3 -3

               require 'csv'
               class ReportController < ApplicationController
-            -   before_filter :authenticate
+            +   before_action :authenticate
-            -   before_filter :admin_authorization, only: [:login_stat,:submission_stat, :stuck, :cheat_report, :cheat_scruntinize, :show_max_score, :current_score]
+            +   before_action :admin_authorization, only: [:login_stat,:submission_stat, :stuck, :cheat_report, :cheat_scruntinize, :show_max_score, :current_score]
-            -   before_filter(only: [:problem_hof]) { |c|
+            +   before_action(only: [:problem_hof]) { |c|
                   return false unless authenticate
                   admin_authorization unless GraderConfiguration["right.user_view_submission"]
                 }
                 def max_score
                 end
                 def current_score
                   @problems = Problem.available_problems
                   @users = User.includes(:contests).includes(:contest_stat).where(enabled: true)
                   @scorearray = calculate_max_score(@problems, @users,0,0,true)

app/controllers/site_controller.rb ¶ +1 -1

               class SiteController < ApplicationController
-            -   before_filter :site_admin_authorization, :except => 'login'
+            +   before_action :site_admin_authorization, :except => 'login'
                 def login
                   # Site administrator login
                   @countries = Country.includes(:sites).all
                   @country_select = @countries.collect { |c| [c.name, c.id] }
                   @country_select_with_all = [['Any',0]]
                   @countries.each do |country|
                     @country_select_with_all << [country.name, country.id]
                   end
                   @site_select = []

app/controllers/sites_controller.rb ¶ +1 -1

               class SitesController < ApplicationController
-            -   before_filter :admin_authorization
+            +   before_action :admin_authorization
                 # GET /sites
                 # GET /sites.xml
                 def index
                   @sites = Site.order(:country_id)
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @sites }
                   end
                 end

app/controllers/tasks_controller.rb ¶ +1 -1

               class TasksController < ApplicationController
-            -   before_filter :authenticate, :check_viewability
+            +   before_action :authenticate, :check_viewability
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
                   @problems = @user.available_problems
                 end
                 # this has contest-wide access control
                 def view
                   base_name = params[:file]

app/controllers/test_controller.rb ¶ +1 -1

               class TestController < ApplicationController
-            -   before_filter :authenticate, :check_viewability
+            +   before_action :authenticate, :check_viewability
               #
               #  COMMENT OUT: filter in each action instead
               #
               #  before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 def index
                   prepare_index_information
                 end

app/controllers/user_admin_controller.rb ¶ +1 -1

               require 'csv'
               class UserAdminController < ApplicationController
                 include MailHelperMethods
-            -   before_filter :admin_authorization
+            +   before_action :admin_authorization
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [
                                                     :create, :create_from_list,
                                                     :update,
                                                     :manage_contest,
                                                     :bulk_mail
                                                   ],
                        :redirect_to => { :action => :list }
                 def index
                   @user_count = User.count

app/controllers/users_controller.rb ¶ +4 -4

               require 'net/smtp'
               class UsersController < ApplicationController
                 include MailHelperMethods
-            -   before_filter :authenticate, :except => [:new,
+            +   before_action :authenticate, :except => [:new,
                                                          :register,
                                                          :confirm,
                                                          :forget,
                                                          :retrieve_password]
-            -   before_filter :verify_online_registration, :only => [:new,
+            +   before_action :verify_online_registration, :only => [:new,
                                                                      :register,
                                                                      :forget,
                                                                      :retrieve_password]
-            -   before_filter :authenticate, :profile_authorization, only: [:profile]
+            +   before_action :authenticate, :profile_authorization, only: [:profile]
-            -   before_filter :admin_authorization, only: [:stat, :toggle_activate, :toggle_enable]
+            +   before_action :admin_authorization, only: [:stat, :toggle_activate, :toggle_enable]
                 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 !GraderConfiguration['system.user_setting_enabled']
                     redirect_to :controller => 'main', :action => 'list'
                   else

config/routes.rb ¶ +2 -1

               CafeGrader::Application.routes.draw do
                 resources :tags
                 get "sources/direct_edit"
                 root :to => 'main#login'
                 #logins
-            -   get 'login/login',  to: 'login#login'
+            +   match 'login/login',  to: 'login#login', via: [:get,:post]
+            +
                 resources :contests
                 resources :sites
                 resources :announcements do
                   member do
                     get 'toggle','toggle_front'
                   end
                 end
                 resources :problems do

test/integration/login_test.rb ¶ +4 -4

               require 'test_helper'
               class LoginTest < ActionDispatch::IntegrationTest
                 # test "the truth" do
                 #   assert true
                 # end
                 test "login with invalid information" do
                   get root_path
                   assert_response :success
-            -     post login_login_path, login: "root", password: "hahaha"
+            +     post login_login_path, params: {login: "root", password: "hahaha"}
                   assert_redirected_to root_path
                 end
                 test "normal user login" do
                   get root_path
                   assert_response :success
-            -     post login_login_path, {login: "john", password: "hello" }
+            +     post login_login_path, params: {login: "john", password: "hello" }
                   assert_redirected_to main_list_path
                 end
                 test "normal user login in single_user mode" do
                   GraderConfiguration.find_by(key: GraderConfiguration::SINGLE_USER_KEY).update_attributes(value: 'true')
                   GraderConfiguration.reload
                   get root_path
                   assert_response :success
-            -     post login_login_path, {login: "john", password: "hello" }
+            +     post login_login_path, params: {login: "john", password: "hello" }
                   follow_redirect!
                   assert_redirected_to root_path
                 end
                 test "root login in in single_user mode" do
                   GraderConfiguration.find_by(key: GraderConfiguration::SINGLE_USER_KEY).update_attributes(value: 'true')
                   GraderConfiguration.reload
                   get root_path
                   assert_response :success
-            -     post login_login_path, {login: "admin", password: "admin" }
+            +     post login_login_path, params: {login: "admin", password: "admin" }
                   assert_redirected_to main_list_path
                 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

r745:75264caa616f - Wed, 03 Jul 2019 10:25:07 - 20 files changed: 38 inserted, 31 deleted

Sign in to your account

Commit r745:75264caa616f public

Author

r745:75264caa616f - Wed, 03 Jul 2019 10:25:07 - 20 files changed: 38 inserted, 31 deleted

Commit `r745:75264caa616f` public