Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade "annotate" gem and add missing annotations. #226

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,7 @@ end
group :development do
gem 'web-console', '>= 3.5.0'
gem 'binding_of_caller', '>= 0.7.3.pre1'
# TODO(pwnall): Remove the git ref when 2.7.2 gets released.
gem 'annotate', '>= 2.7.1',
git: 'https://github.com/ctran/annotate_models.git',
ref: '983d36f6a028daa289f31c0fe3fa83df36825d25'
gem 'annotate', '>= 2.7.2'
# TODO(pwnall): Remove version limitation when the rake issue gets fixed.
# https://github.com/stympy/faker/issues/780
gem 'faker', ['>= 1.6.6', '< 1.7']
Expand Down
16 changes: 5 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
GIT
remote: https://github.com/ctran/annotate_models.git
revision: 983d36f6a028daa289f31c0fe3fa83df36825d25
ref: 983d36f6a028daa289f31c0fe3fa83df36825d25
specs:
annotate (2.7.1)
activerecord (>= 3.2, < 6.0)
rake (>= 10.4, < 12.1)

GIT
remote: https://github.com/jruby/activerecord-jdbc-adapter.git
revision: 468c57adc765a513b8ae400b2b171e318e159bd2
Expand Down Expand Up @@ -57,6 +48,9 @@ GEM
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
afm (0.2.2)
annotate (2.7.2)
activerecord (>= 3.2, < 6.0)
rake (>= 10.4, < 13.0)
arel (8.0.0)
asciidoctor (1.5.6.1)
authpwn_rails (0.23.0)
Expand Down Expand Up @@ -334,7 +328,7 @@ PLATFORMS

DEPENDENCIES
activerecord-jdbcpostgresql-adapter!
annotate (>= 2.7.1)!
annotate (>= 2.7.2)
authpwn_rails (>= 0.22.0)
autoprefixer-rails (>= 7.1.2.3)
bigdecimal (>= 1.3.1)
Expand Down Expand Up @@ -400,4 +394,4 @@ RUBY VERSION
ruby 2.4.0p0

BUNDLED WITH
1.14.6
1.15.4
21 changes: 12 additions & 9 deletions test/fixtures/analyzers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@
#
# Table name: analyzers
#
# id :integer not null, primary key
# deliverable_id :integer not null
# type :string(32) not null
# auto_grading :boolean not null
# exec_limits :text
# db_file_id :integer
# message_name :string(64)
# created_at :datetime not null
# updated_at :datetime not null
# id :integer not null, primary key
# deliverable_id :integer not null
# type :string(32) not null
# auto_grading :boolean not null
# exec_limits :text
# file_blob_id :string(48)
# file_size :integer
# file_mime_type :string(64)
# file_original_name :string(256)
# message_name :string(64)
# created_at :datetime not null
# updated_at :datetime not null
#

proc_ps1_writeup:
Expand Down
17 changes: 10 additions & 7 deletions test/fixtures/assignment_files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
#
# Table name: assignment_files
#
# id :integer not null, primary key
# description :string(64) not null
# assignment_id :integer not null
# db_file_id :integer not null
# released_at :datetime
# created_at :datetime not null
# updated_at :datetime not null
# id :integer not null, primary key
# description :string(64) not null
# assignment_id :integer not null
# file_blob_id :string(48) not null
# file_size :integer not null
# file_mime_type :string(64) not null
# file_original_name :string(256) not null
# released_at :datetime
# created_at :datetime not null
# updated_at :datetime not null
#

ps1_solutions:
Expand Down
8 changes: 8 additions & 0 deletions test/fixtures/file_blobs.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# == Schema Information
#
# Table name: file_blobs
#
# id :string(48) not null, primary key
# data :binary not null
#

small_pdf:
id: <%= file_blob_id 'files/submission/small.pdf' %>
data: <%= file_blob_data 'files/submission/small.pdf' %>
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/grade_comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# course_id :integer not null
# metric_id :integer not null
# grader_id :integer not null
# subject_type :string(16)
# subject_type :string(16) not null
# subject_id :integer not null
# text :text not null
# created_at :datetime not null
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/grades.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# course_id :integer not null
# metric_id :integer not null
# grader_id :integer not null
# subject_type :string(64)
# subject_type :string(64) not null
# subject_id :integer not null
# score :decimal(8, 2) not null
# created_at :datetime not null
Expand Down
17 changes: 9 additions & 8 deletions test/fixtures/profile_photos.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@

# == Schema Information
#
# Table name: profile_photos
#
# id :integer not null, primary key
# profile_id :integer not null
# created_at :datetime not null
# updated_at :datetime not null
# pic_file_name :string
# pic_content_type :string
# pic_file_size :integer
# pic_updated_at :datetime
# id :integer not null, primary key
# profile_id :integer not null
# image_blob_id :string(48) not null
# image_size :integer not null
# image_mime_type :string(64) not null
# image_original_name :string(256) not null
# created_at :datetime not null
# updated_at :datetime not null
#
21 changes: 12 additions & 9 deletions test/fixtures/submissions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@
#
# Table name: submissions
#
# id :integer not null, primary key
# deliverable_id :integer not null
# db_file_id :integer not null
# subject_type :string not null
# subject_id :integer not null
# uploader_id :integer not null
# upload_ip :string(48) not null
# created_at :datetime not null
# updated_at :datetime not null
# id :integer not null, primary key
# deliverable_id :integer not null
# file_blob_id :string(48) not null
# file_size :integer not null
# file_mime_type :string(64) not null
# file_original_name :string(256) not null
# subject_type :string not null
# subject_id :integer not null
# uploader_id :integer not null
# upload_ip :string(48) not null
# created_at :datetime not null
# updated_at :datetime not null
#

# NOTE: Do not create a submissions for the following:
Expand Down