cafe-grader-web Commit - r758:d23edd5adc06

cafe-grader-web

Commit `r758:d23edd5adc06` public

parent | child

Description:

revert simple_form_for to form_tag

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

r758:d23edd5adc06 - Fri, 12 Jul 2019 12:43:27 - 5 files changed: 11 inserted, 30 deleted

Gemfile.lock ¶ -19

                     marcel (~> 0.3.1)
                   activesupport (5.2.3)
                     concurrent-ruby (~> 1.0, >= 1.0.2)
                     i18n (>= 0.7, < 2)
                     minitest (~> 5.1)
                     tzinfo (~> 1.1)
                   addressable (2.6.0)
                     public_suffix (>= 2.0.2, < 4.0)
                   ansi (1.5.0)
                   arel (9.0.0)
                   autoprefixer-rails (9.5.1.1)
                     execjs
                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
                   bindex (0.7.0)
                   bootsnap (1.4.4)
                     msgpack (~> 1.0)
                   bootstrap-datepicker-rails (1.8.0.1)
                     railties (>= 3.0)
                   bootstrap-sass (3.4.1)
                     autoprefixer-rails (>= 5.2.1)
                     sassc (>= 2.0.0)
                   bootstrap-switch-rails (3.3.4)
                   bootstrap-toggle-rails (2.2.1.0)
                   bootstrap3-datetimepicker-rails (4.17.47)
                     momentjs-rails (>= 2.8.1)
                   builder (3.2.3)
                   byebug (11.0.1)
                   capybara (3.25.0)
                     addressable
                     mini_mime (>= 0.1.3)
                     nokogiri (~> 1.8)
                     rack (>= 1.6.0)
                     rack-test (>= 0.6.3)
                     regexp_parser (~> 1.5)
                     xpath (~> 3.2)
                   childprocess (1.0.1)
                     rake (< 13.0)
                   coffee-rails (4.2.2)
                     coffee-script (>= 2.2.0)
                     railties (>= 4.0.0)
                   coffee-script (2.4.1)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.12.2)
                   concurrent-ruby (1.1.5)
                   crass (1.0.4)
-            -     diff-lcs (1.3)
                   dynamic_form (1.1.4)
                   erubi (1.8.0)
                   erubis (2.7.0)
                   execjs (2.7.0)
                   ffi (1.11.1)
                   fuzzy-string-match (1.0.1)
                     RubyInline (>= 3.8.6)
                   globalid (0.4.2)
                     activesupport (>= 4.2.0)
                   haml (5.1.0)
                     temple (>= 0.8.0)
                     tilt
                   haml-rails (1.0.0)
                     actionpack (>= 4.0.1)
                     activesupport (>= 4.0.1)
                     haml (>= 4.0.6, < 6.0)
                     html2haml (>= 1.0.1)
                     railties (>= 4.0.1)
                   html2haml (2.2.0)
                     erubis (~> 2.7.0)
                     haml (>= 4.0, < 6)
                     nokogiri (>= 1.6.0)
                     ruby_parser (~> 3.5)
                   i18n (1.6.0)
                     concurrent-ruby (~> 1.0)
                   in_place_editing (1.2.0)
                   jbuilder (2.9.1)
                     activesupport (>= 4.2.0)
                   jquery-countdown-rails (2.0.2)
                   jquery-datatables-rails (3.4.0)
                     actionpack (>= 3.1)
                     jquery-rails
                     railties (>= 3.1)
                     sass-rails
                   jquery-rails (4.3.3)
                     rails-dom-testing (>= 1, < 3)
                     railties (>= 4.2.0)
                     thor (>= 0.14, < 2.0)
                   jquery-tablesorter (1.26.1)
                     railties (>= 3.2, < 6)
                   jquery-timepicker-addon-rails (1.4.1)
                     railties (>= 3.1)
                   jquery-ui-rails (6.0.1)
                     railties (>= 3.2.16)
                   listen (3.1.5)
                     rb-fsevent (~> 0.9, >= 0.9.4)
                     rb-inotify (~> 0.9, >= 0.9.7)
                     ruby_dep (~> 1.2)
                   multi_json (1.13.1)
                   mysql2 (0.5.2)
                   nio4r (2.3.1)
                   nokogiri (1.10.3)
                     mini_portile2 (~> 2.4.0)
                   public_suffix (3.1.1)
                   puma (4.0.0)
                     nio4r (~> 2.0)
                   rack (2.0.7)
                   rack-test (1.1.0)
                     rack (>= 1.0, < 3)
                   rails (5.2.3)
                     actioncable (= 5.2.3)
                     actionmailer (= 5.2.3)
                     actionpack (= 5.2.3)
                     actionview (= 5.2.3)
                     activejob (= 5.2.3)
                     activemodel (= 5.2.3)
                     activerecord (= 5.2.3)
                     activestorage (= 5.2.3)
                     activesupport (= 5.2.3)
                     bundler (>= 1.3.0)
                     railties (= 5.2.3)
                     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.2.3)
                     actionpack (= 5.2.3)
                     activesupport (= 5.2.3)
                     method_source
                     rake (>= 0.8.7)
                     thor (>= 0.19.0, < 2.0)
                   rake (12.3.2)
                   rb-fsevent (0.10.3)
                   rb-inotify (0.10.0)
                     ffi (~> 1.0)
                   rdiscount (2.2.0.1)
                   regexp_parser (1.5.1)
                   rouge (3.3.0)
-            -     rspec-core (3.8.2)
-            -       rspec-support (~> 3.8.0)
-            -     rspec-expectations (3.8.4)
-            -       diff-lcs (>= 1.2.0, < 2.0)
-            -       rspec-support (~> 3.8.0)
-            -     rspec-mocks (3.8.1)
-            -       diff-lcs (>= 1.2.0, < 2.0)
-            -       rspec-support (~> 3.8.0)
-            -     rspec-rails (3.8.2)
-            -       actionpack (>= 3.0)
-            -       activesupport (>= 3.0)
-            -       railties (>= 3.0)
-            -       rspec-core (~> 3.8.0)
-            -       rspec-expectations (~> 3.8.0)
-            -       rspec-mocks (~> 3.8.0)
-            -       rspec-support (~> 3.8.0)
-            -     rspec-support (3.8.2)
                   ruby-progressbar (1.10.0)
                   ruby_dep (1.5.0)
                   ruby_parser (3.13.1)
                     sexp_processor (~> 4.9)
                   rubyzip (1.2.3)
                   sass (3.7.4)
                     sass-listen (~> 4.0.0)
                   sass-listen (4.0.0)
                     rb-fsevent (~> 0.9, >= 0.9.4)
                     rb-inotify (~> 0.9, >= 0.9.7)
                   sass-rails (5.0.7)
                     railties (>= 4.0.0, < 6)
                     sass (~> 3.1)
                     sprockets (>= 2.8, < 4.0)
                     sprockets-rails (>= 2.0, < 4.0)
                     tilt (>= 1.1, < 3)
                   sassc (2.0.1)
                     ffi (~> 1.9)
                     rake
                   sassc-rails (2.1.1)
                     railties (>= 4.0.0)
                     sassc (>= 2.0)
                     sprockets (> 3.0)
                     sprockets-rails
                     tilt
                   select2-rails (4.0.3)
                     thor (~> 0.14)
                   selenium-webdriver (3.142.3)
                     childprocess (>= 0.5, < 2.0)
                     rubyzip (~> 1.2, >= 1.2.2)
                   sexp_processor (4.12.0)
                   simple_form (4.1.0)
                     actionpack (>= 5.0)
                     activemodel (>= 5.0)
                   spring (2.1.0)
                   spring-watcher-listen (2.0.1)
                     listen (>= 2.7, < 4.0)
                     spring (>= 1.2, < 3.0)
                   sprockets (3.7.2)
                     concurrent-ruby (~> 1.0)
                     rack (> 1, < 3)
                   sprockets-rails (3.2.1)
                     actionpack (>= 4.0)
                     activesupport (>= 4.0)
                     sprockets (>= 3.0.0)
                   sqlite3 (1.4.1)
                   temple (0.8.1)
                   thor (0.20.3)
                   websocket-extensions (0.1.4)
                   will_paginate (3.0.12)
                   xpath (3.2.0)
                     nokogiri (~> 1.8)
                   yaml_db (0.7.0)
                     rails (>= 3.0)
                     rake (>= 0.8.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 ace-rails-ap
                 activerecord-session_store
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootsnap (>= 1.1.0)
                 bootstrap-datepicker-rails
                 bootstrap-sass (~> 3.4.1)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
                 bootstrap3-datetimepicker-rails
                 byebug
                 capybara (>= 2.15)
                 coffee-rails
                 dynamic_form
                 fuzzy-string-match
                 haml
                 haml-rails
                 in_place_editing
                 jbuilder (~> 2.5)
                 jquery-countdown-rails
                 jquery-datatables-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-rails
                 listen (>= 3.0.5, < 3.2)
                 mail
                 minitest-reporters
                 momentjs-rails
                 mysql2
                 puma
                 rails (~> 5.2)
                 rails-controller-testing
                 rails_bootstrap_sortable
                 rdiscount
                 rouge
-            -   rspec-rails
                 sassc-rails
                 select2-rails
                 selenium-webdriver
                 simple_form
                 spring
                 spring-watcher-listen (~> 2.0.0)
                 sqlite3
                 uglifier
                 web-console (>= 3.3.0)
                 webdriver
                 will_paginate (~> 3.0.7)
                 yaml_db
               BUNDLED WITH
 .17.2

app/models/problem.rb ¶ +3 -3

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 has_and_belongs_to_many :contests, :uniq => true
                 #has_and_belongs_to_many :groups
                 has_many :groups_problems, class_name: 'GroupProblem'
                 has_many :groups, :through => :groups_problems
                 has_many :problems_tags, class_name: 'ProblemTag'
                 has_many :tags, through: :problems_tags
                 has_many :test_pairs, :dependent => :delete_all
                 has_many :testcases, :dependent => :destroy
                 has_many :submissions
                 validates_presence_of :name
                 validates_format_of :name, :with => /\A\w+\z/
                 validates_presence_of :full_name
                 scope :available, -> { where(available: true) }
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def self.available_problems
                   available.order(date_added: :desc).order(:name)
                   #Problem.available.all(:order => "date_added DESC, name ASC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   org_problem = old_problem || Problem.new
-            -     import_params, problem = Problem.extract_params_and_check(params,
+            +     import_params, problem = Problem.extract_params_and_check(params,
                                                                             org_problem)
                   if !problem.errors.empty?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100
                   problem.date_added = Time.new
                   problem.test_allowed = true
                   problem.output_only = false
                   problem.available = false
                   if not problem.save
                     return problem, 'Error importing'
                   end
                   import_to_db = params.has_key? :import_to_db
                   importer = TestdataImporter.new(problem)
-            -     if not importer.import_from_file(import_params[:file],
+            +     if not importer.import_from_file(import_params[:file],
-            -                                      import_params[:time_limit],
+            +                                      import_params[:time_limit],
                                                    import_params[:memory_limit],
                                                    import_params[:checker_name],
                                                    import_to_db)
                     problem.errors.add(:base,'Import error.')
                   end
                   return problem, importer.log_msg
                 end
                 def self.download_file_basedir
                   return "#{Rails.root}/data/tasks"
                 end
                 def get_submission_stat
                   result = Hash.new
                   #total number of submission
                   result[:total_sub] = Submission.where(problem_id: self.id).count
                   result[:attempted_user] = Submission.where(problem_id: self.id).group(:user_id)
                   result[:pass] = Submission.where(problem_id: self.id).where("points >= ?",self.full_score).count
                   return result
                 end
                 def long_name
                   "[#{name}] #{full_name}"
                 end
                 protected
                 def self.to_i_or_default(st, default)
                   if st!=''
                     result = st.to_i
                   end
                   result ||= default
                 end
                 def self.to_f_or_default(st, default)
                   if st!=''
                     result = st.to_f
                   end
                   result ||= default
                 end
                 def self.extract_params_and_check(params, problem)
                   time_limit = Problem.to_f_or_default(params[:time_limit],
                                                        DEFAULT_TIME_LIMIT)
                   memory_limit = Problem.to_i_or_default(params[:memory_limit],
                                                          DEFAULT_MEMORY_LIMIT)

app/views/problems/import.html.haml ¶ +1 -1

               - content_for :head do
                 = stylesheet_link_tag 'problems'
               %h1 Import problems
               %p= link_to '[Back to problem list]', problems_path
               - if @problem and @problem.errors
                 =error_messages_for 'problem'
-            - = simple_form_for :problem, url: do_import_problems_path, :multipart => true  do |f|
+            + = form_tag do_import_problems_path, :multipart => true  do |f|
                 .submitbox
                   %table
                     %tr
                       %td Name:
                       %td= text_field_tag 'name'
                     %tr
                       %td Full name:
                       %td
                         = text_field_tag 'full_name'
                         %span{:class => 'help'} Leave blank to use the same value as the name above.
                     %tr
                       %td Testdata file:
                       %td= file_field_tag 'file'
                     %tr
                       %td
                       %td
                         %span{:class => 'help'}
                           In .zip, .tgz, tar.gz, .tar format.
                           It should includes inputs (e.g., 1.in, 2a.in, 2b.in)
                           and solutions (e.g., 1.sol, 2a.sol, 2b.sol).
                           %br/
                           You may put task description in *.html for raw html
                           and *.md or *.markdown for markdown.
                           %br/
                           You may also put a pdf file for the task description
                     %tr
                       %td Checker:
                       %td= select_tag 'checker', options_for_select([['Text checker','text'],['Float checker','float']], 'text')
                     %tr
                       %td
                       %td
                         %span{:class => 'help'}
                           "Text" checker checks if the text (including numbers) is the same, ignoring any whitespace
                           %br/
                           "Float" checker checks if all numbers is within EPSILON error using formula |a-b| < EPSILON * max(|a|,|b|)
                     - if @allow_test_pair_import
                       %tr
                         %td
                         %td
                           = check_box_tag 'import_to_db'
                           Import test data to database (for a test-pair task)
                     %tr
                       %td Time limit:
                       %td
                         = text_field_tag 'time_limit'
                         %span{:class => 'help'} In seconds. Leave blank to use 1 sec.

db/seeds.rb ¶ +6 -6

                 role = Role.create(:name => 'admin')
                 user_admin_right = Right.create(:name => 'user_admin',
                                                 :controller => 'user_admin',
                                                 :action => 'all')
                 problem_admin_right = Right.create(:name=> 'problem_admin',
                                                    :controller => 'problems',
                                                    :action => 'all')
                 graders_right = Right.create(:name => 'graders_admin',
                                              :controller => 'graders',
                                              :action => 'all')
                 role.rights << user_admin_right;
                 role.rights << problem_admin_right;
                 role.rights << graders_right;
                 role.save
               end
               def seed_root
                 return if User.find_by_login('root')
                 root = User.new(:login => 'root',
                                 :full_name => 'Administrator',
                                 :alias => 'root')
                 root.password = 'ioionrails';
                 class << root
                   public :encrypt_new_password
                   def valid?(context=nil)
                     true
                   end
                 end
                 root.encrypt_new_password
                 root.roles << Role.find_by_name('admin')
                 root.activated = true
                 root.save
               end
               def seed_users_and_roles
                 seed_roles
                 seed_root
               end
               def seed_more_languages
                 Language.delete_all
-            -   Language.create( name: 'c', pretty_name: 'C', ext: 'c', common_ext: 'c' )
+            +   Language.find_or_create_by( name: 'c', pretty_name: 'C', ext: 'c', common_ext: 'c' )
-            -   Language.create( name: 'cpp', pretty_name: 'C++', ext: 'cpp', common_ext: 'cpp,cc' )
+            +   Language.find_or_create_by( name: 'cpp', pretty_name: 'C++', ext: 'cpp', common_ext: 'cpp,cc' )
-            -   Language.create( name: 'pas', pretty_name: 'Pascal', ext: 'pas', common_ext: 'pas' )
+            +   Language.find_or_create_by( name: 'pas', pretty_name: 'Pascal', ext: 'pas', common_ext: 'pas' )
-            -   Language.create( name: 'ruby', pretty_name: 'Ruby', ext: 'rb', common_ext: 'rb' )
+            +   Language.find_or_create_by( name: 'ruby', pretty_name: 'Ruby', ext: 'rb', common_ext: 'rb' )
-            -   Language.create( name: 'python', pretty_name: 'Python', ext: 'py', common_ext: 'py' )
+            +   Language.find_or_create_by( name: 'python', pretty_name: 'Python', ext: 'py', common_ext: 'py' )
-            -   Language.create( name: 'java', pretty_name: 'Java', ext: 'java', common_ext: 'java' )
+            +   Language.find_or_create_by( name: 'java', pretty_name: 'Java', ext: 'java', common_ext: 'java' )
               end
               seed_config
               seed_users_and_roles
               seed_more_languages

lib/testdata_importer.rb ¶ +1 -1

                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length
                   return filename.slice(i..len)
                 end
                 # extract an archive file located at +tempfile+ to the +raw_dir+
                 def extract(tempfile)
                   testdata_filename = save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   extract_dir = File.join(GraderScript.raw_dir, @problem.name)
                   if File.exists? extract_dir
                     backup_count = 0
                     begin
                       backup_count += 1
                       backup_dirname = "#{extract_dir}.backup.#{backup_count}"
                     end while File.exists? backup_dirname
                     File.rename(extract_dir, backup_dirname)
                   end
                   Dir.mkdir extract_dir
                   if ext=='.tar.gz' or ext=='.tgz'
                     cmd = "tar -zxvf #{testdata_filename} -C #{extract_dir}"
                   elsif ext=='.tar'
                     cmd = "tar -xvf #{testdata_filename} -C #{extract_dir}"
                   elsif ext=='.zip'
                     cmd = "unzip -o #{testdata_filename} -d #{extract_dir}"
                   else
                     return nil
                   end
                   system(cmd)
                   files = Dir["#{extract_dir}/**/*1*.in"]
                   return nil if files.length==0
                   File.delete(testdata_filename)
                   return File.dirname(files[0])
                 end
                 def save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   testdata_filename = File.join(Dir.tmpdir,"#{@problem.name}#{ext}")
                   return nil if tempfile==""
+            +
                   if tempfile.instance_of?(Tempfile)
                     tempfile.close
                     FileUtils.move(tempfile.path,testdata_filename)
                   else
                     File.open(testdata_filename, "wb") do |f|
                       f.write(tempfile.read)
                     end
                   end
                   return testdata_filename
                 end
                 def import_test_pairs(dirname)
                   test_num = 1
                   while FileTest.exists? "#{dirname}/#{test_num}.in"
                     in_filename = "#{dirname}/#{test_num}.in"
                     sol_filename = "#{dirname}/#{test_num}.sol"
                     break if not FileTest.exists? sol_filename
                     test_pair = TestPair.new(:input => open(in_filename).read,
                                              :solution => open(sol_filename).read,
                                              :problem => @problem)
                     break if not test_pair.save
                     test_num += 1
                   end
                   return test_num > 1
                 end
                 def import_problem_description(dirname)
                   html_files = Dir["#{dirname}/*.html"]
                   markdown_files = Dir["#{dirname}/*.md"] + Dir["#{dirname}/*.markdown"]
                   if (html_files.length != 0) or (markdown_files.length != 0)
                     description = @problem.description || Description.new
                     if html_files.length != 0
                       filename = html_files[0]
                       description.markdowned = false
                     else
                       filename = markdown_files[0]
                       description.markdowned = true
                     end
                     description.body = open(filename).read
                     description.save
                     @problem.description = description
                     @problem.save

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

r758:d23edd5adc06 - Fri, 12 Jul 2019 12:43:27 - 5 files changed: 11 inserted, 30 deleted

Sign in to your account

Commit r758:d23edd5adc06 public

Author

r758:d23edd5adc06 - Fri, 12 Jul 2019 12:43:27 - 5 files changed: 11 inserted, 30 deleted

Commit `r758:d23edd5adc06` public