mumuki-laboratory 5.5.0 → 5.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/application/discussions.js +43 -0
- data/app/assets/stylesheets/application/_modules.scss +2 -0
- data/app/assets/stylesheets/application/modules/_checkboxes.scss +21 -8
- data/app/assets/stylesheets/application/modules/_discussion.scss +339 -0
- data/app/assets/stylesheets/application/modules/_pagination.scss +10 -0
- data/app/controllers/application_controller.rb +4 -9
- data/app/controllers/book_discussions_controller.rb +7 -0
- data/app/controllers/chapters_controller.rb +2 -0
- data/app/controllers/discussions_controller.rb +65 -0
- data/app/controllers/discussions_messages_controller.rb +25 -0
- data/app/controllers/exercises_controller.rb +1 -0
- data/app/controllers/guide_container_controller.rb +1 -0
- data/app/controllers/messages_controller.rb +1 -1
- data/app/controllers/users_controller.rb +1 -0
- data/app/helpers/application_helper.rb +7 -0
- data/app/helpers/assignment_result_helper.rb +10 -30
- data/app/helpers/breadcrumbs_helper.rb +7 -3
- data/app/helpers/contextualization_result_helper.rb +31 -0
- data/app/helpers/discussions_helper.rb +163 -0
- data/app/helpers/exercise_input_helper.rb +33 -5
- data/app/helpers/icons_helper.rb +20 -3
- data/app/helpers/messages_helper.rb +4 -0
- data/app/helpers/status_helper.rb +2 -2
- data/app/models/assignment.rb +31 -47
- data/app/models/book.rb +3 -0
- data/app/models/chapter.rb +2 -0
- data/app/models/concerns/contextualization.rb +85 -0
- data/app/models/concerns/submittable/solvable.rb +1 -0
- data/app/models/concerns/with_assignments.rb +1 -1
- data/app/models/concerns/with_discussion_creation.rb +9 -0
- data/app/models/concerns/with_discussion_creation/subscription.rb +33 -0
- data/app/models/concerns/with_discussion_creation/upvote.rb +28 -0
- data/app/models/concerns/with_discussion_status.rb +11 -0
- data/app/models/concerns/with_discussions.rb +23 -0
- data/app/models/concerns/with_randomizations.rb +34 -0
- data/app/models/concerns/with_scoped_queries.rb +47 -0
- data/app/models/concerns/with_scoped_queries/filter.rb +15 -0
- data/app/models/concerns/with_scoped_queries/page.rb +10 -0
- data/app/models/concerns/with_scoped_queries/sort.rb +47 -0
- data/app/models/discussion.rb +128 -0
- data/app/models/exercise.rb +10 -1
- data/app/models/guide.rb +1 -1
- data/app/models/message.rb +24 -3
- data/app/models/organization.rb +4 -0
- data/app/models/submission/confirmation.rb +1 -1
- data/app/models/submission/console_submission.rb +1 -1
- data/app/models/submission/submission.rb +13 -0
- data/app/models/subscription.rb +12 -0
- data/app/models/topic.rb +1 -1
- data/app/models/upvote.rb +4 -0
- data/app/models/user.rb +3 -2
- data/app/views/book_discussions/index.html.erb +23 -0
- data/app/views/chapters/show.html.erb +0 -1
- data/app/views/discussions/_message.html.erb +22 -0
- data/app/views/discussions/_message_container.html.erb +8 -0
- data/app/views/discussions/_new_message.html.erb +19 -0
- data/app/views/discussions/index.html.erb +30 -0
- data/app/views/discussions/show.html.erb +76 -0
- data/app/views/exercise_solutions/_contextualization_results.html.erb +21 -0
- data/app/views/exercise_solutions/_contextualization_results_container.html.erb +4 -0
- data/app/views/exercise_solutions/_expectations.html.erb +9 -3
- data/app/views/exercise_solutions/_kids_results.html.erb +1 -1
- data/app/views/exercise_solutions/_results.html.erb +21 -55
- data/app/views/exercise_solutions/_results_title.html.erb +2 -2
- data/app/views/exercises/_exercise_assignment.html.erb +20 -0
- data/app/views/exercises/_read_only.html.erb +104 -0
- data/app/views/exercises/show.html.erb +4 -20
- data/app/views/layouts/_discussions.html.erb +68 -0
- data/app/views/layouts/_kids.html.erb +9 -6
- data/app/views/layouts/_messages.html.erb +1 -1
- data/app/views/layouts/_result.html.erb +2 -2
- data/app/views/layouts/_test_results.html.erb +6 -6
- data/app/views/layouts/application.html.erb +10 -9
- data/app/views/layouts/exercise_inputs/forms/_form.html.erb +5 -6
- data/app/views/layouts/exercise_inputs/forms/_interactive_form.html.erb +5 -5
- data/app/views/layouts/exercise_inputs/forms/_kids_form.html.erb +9 -17
- data/app/views/layouts/exercise_inputs/forms/_playground_form.html.erb +5 -5
- data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb +11 -11
- data/app/views/layouts/exercise_inputs/forms/_reading_form.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/layouts/_input_bottom.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/layouts/_input_kids.html.erb +7 -7
- data/app/views/layouts/exercise_inputs/layouts/_input_right.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/read_only_editors/_code.html.erb +3 -0
- data/app/views/layouts/exercise_inputs/read_only_editors/_custom.html.erb +6 -0
- data/app/views/layouts/exercise_inputs/read_only_editors/_multiple_choice.html.erb +8 -0
- data/app/views/layouts/exercise_inputs/read_only_editors/_single_choice.html.erb +8 -0
- data/app/views/layouts/modals/_kids_context.html.erb +2 -2
- data/app/views/layouts/modals/_new_discussion.html.erb +27 -0
- data/app/views/users/show.html.erb +23 -3
- data/config/routes.rb +21 -1
- data/db/migrate/20180504173548_create_discussions.rb +12 -0
- data/db/migrate/20180504185845_add_discussion_id_to_message.rb +5 -0
- data/db/migrate/20180605143727_add_submission_to_discussion.rb +16 -0
- data/db/migrate/20180619182555_create_subscriptions.rb +9 -0
- data/db/migrate/20180702153442_create_upvotes.rb +8 -0
- data/db/migrate/20180702175220_add_upvotes_count_to_discussions.rb +5 -0
- data/db/migrate/20180704150839_rename_assignment_status_to_submission_status.rb +5 -0
- data/lib/mumuki/laboratory.rb +2 -0
- data/lib/mumuki/laboratory/controllers.rb +2 -1
- data/lib/mumuki/laboratory/controllers/content.rb +12 -0
- data/lib/mumuki/laboratory/controllers/notifications.rb +31 -0
- data/lib/mumuki/laboratory/controllers/results_rendering.rb +1 -1
- data/lib/mumuki/laboratory/engine.rb +0 -2
- data/lib/mumuki/laboratory/evaluation/manual.rb +1 -1
- data/lib/mumuki/laboratory/locales/en.yml +37 -1
- data/lib/mumuki/laboratory/locales/es.yml +42 -1
- data/lib/mumuki/laboratory/locales/pt.yml +33 -1
- data/lib/mumuki/laboratory/status.rb +51 -44
- data/lib/mumuki/laboratory/status/discussion/closed.rb +15 -0
- data/lib/mumuki/laboratory/status/discussion/discussion.rb +56 -0
- data/lib/mumuki/laboratory/status/discussion/opened.rb +27 -0
- data/lib/mumuki/laboratory/status/discussion/pending_review.rb +15 -0
- data/lib/mumuki/laboratory/status/discussion/solved.rb +19 -0
- data/lib/mumuki/laboratory/status/submission/aborted.rb +11 -0
- data/lib/mumuki/laboratory/status/submission/errored.rb +15 -0
- data/lib/mumuki/laboratory/status/{failed.rb → submission/failed.rb} +2 -2
- data/lib/mumuki/laboratory/status/submission/manual_evaluation_pending.rb +15 -0
- data/lib/mumuki/laboratory/status/{passed.rb → submission/passed.rb} +2 -2
- data/lib/mumuki/laboratory/status/{passed_with_warnings.rb → submission/passed_with_warnings.rb} +2 -2
- data/lib/mumuki/laboratory/status/submission/pending.rb +11 -0
- data/lib/mumuki/laboratory/status/submission/running.rb +11 -0
- data/lib/mumuki/laboratory/status/submission/submission.rb +49 -0
- data/lib/mumuki/laboratory/status/{unknown.rb → submission/unknown.rb} +2 -2
- data/lib/mumuki/laboratory/version.rb +1 -1
- data/spec/controllers/chapters_controller_spec.rb +17 -0
- data/spec/controllers/discussions_controller_spec.rb +19 -0
- data/spec/dummy/config/environments/development.rb +0 -2
- data/spec/dummy/config/environments/test.rb +0 -2
- data/spec/dummy/db/schema.rb +42 -2
- data/spec/evaluation_helper.rb +1 -1
- data/spec/factories/discussion_factory.rb +8 -0
- data/spec/features/dynamic_exam_spec.rb +1 -1
- data/spec/helpers/exercise_input_helper_spec.rb +25 -0
- data/spec/helpers/test_results_rendering_spec.rb +7 -7
- data/spec/models/assignment_spec.rb +17 -2
- data/spec/models/discussion_spec.rb +153 -0
- metadata +108 -27
- data/app/models/concerns/with_status.rb +0 -43
- data/app/models/status_rendering_verbosity.rb +0 -40
- data/lib/mumuki/laboratory/controllers/messages.rb +0 -9
- data/lib/mumuki/laboratory/status/aborted.rb +0 -7
- data/lib/mumuki/laboratory/status/base.rb +0 -47
- data/lib/mumuki/laboratory/status/errored.rb +0 -15
- data/lib/mumuki/laboratory/status/manual_evaluation_pending.rb +0 -15
- data/lib/mumuki/laboratory/status/pending.rb +0 -11
- data/lib/mumuki/laboratory/status/running.rb +0 -11
- data/spec/models/randomizer_spec.rb +0 -18
- data/spec/models/verbosity_spec.rb +0 -24
@@ -1,43 +0,0 @@
|
|
1
|
-
module WithStatus
|
2
|
-
extend ActiveSupport::Concern
|
3
|
-
|
4
|
-
included do
|
5
|
-
serialize :status, Mumuki::Laboratory::Status
|
6
|
-
validates_presence_of :status
|
7
|
-
end
|
8
|
-
|
9
|
-
def passed?
|
10
|
-
status.passed?
|
11
|
-
end
|
12
|
-
|
13
|
-
def aborted?
|
14
|
-
status.aborted?
|
15
|
-
end
|
16
|
-
|
17
|
-
def run_update!
|
18
|
-
running!
|
19
|
-
begin
|
20
|
-
update! yield
|
21
|
-
rescue => e
|
22
|
-
errored! e.message
|
23
|
-
raise e
|
24
|
-
end
|
25
|
-
end
|
26
|
-
|
27
|
-
def passed!
|
28
|
-
update! status: :passed
|
29
|
-
end
|
30
|
-
|
31
|
-
def running!
|
32
|
-
update! status: :running,
|
33
|
-
result: nil,
|
34
|
-
test_results: nil,
|
35
|
-
expectation_results: [],
|
36
|
-
manual_evaluation_comment: nil
|
37
|
-
end
|
38
|
-
|
39
|
-
def errored!(message)
|
40
|
-
update! result: message, status: :errored
|
41
|
-
end
|
42
|
-
|
43
|
-
end
|
@@ -1,40 +0,0 @@
|
|
1
|
-
module StatusRenderingVerbosity
|
2
|
-
class << self
|
3
|
-
delegate :visible_expectation_results, :render_feedback?, to: :current
|
4
|
-
end
|
5
|
-
|
6
|
-
def self.current
|
7
|
-
@current ||= "StatusRenderingVerbosity::#{Rails.configuration.status_rendering_verbosity.capitalize}".constantize
|
8
|
-
end
|
9
|
-
|
10
|
-
module Verbose
|
11
|
-
def self.visible_expectation_results(_status_like, expectation_results)
|
12
|
-
expectation_results
|
13
|
-
end
|
14
|
-
|
15
|
-
def self.render_feedback?(feedback)
|
16
|
-
feedback.present?
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
module Standard
|
21
|
-
def self.visible_expectation_results(_status_like, expectation_results)
|
22
|
-
expectation_results.select { |it| it[:result].failed? }
|
23
|
-
end
|
24
|
-
|
25
|
-
def self.render_feedback?(feedback)
|
26
|
-
feedback.present?
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
module Silent
|
31
|
-
def self.visible_expectation_results(_status_like, _expectation_results)
|
32
|
-
[]
|
33
|
-
end
|
34
|
-
|
35
|
-
def self.render_feedback?(_feedback)
|
36
|
-
false
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
end
|
@@ -1,47 +0,0 @@
|
|
1
|
-
module Mumuki::Laboratory::Status::Base
|
2
|
-
def to_s
|
3
|
-
name.demodulize.underscore
|
4
|
-
end
|
5
|
-
|
6
|
-
def to_i
|
7
|
-
Mumuki::Laboratory::Status::STATUSES.index(self)
|
8
|
-
end
|
9
|
-
|
10
|
-
def to_sym
|
11
|
-
to_s.to_sym
|
12
|
-
end
|
13
|
-
|
14
|
-
def group
|
15
|
-
self
|
16
|
-
end
|
17
|
-
|
18
|
-
def passed?
|
19
|
-
false
|
20
|
-
end
|
21
|
-
|
22
|
-
def failed?
|
23
|
-
false
|
24
|
-
end
|
25
|
-
|
26
|
-
def errored?
|
27
|
-
false
|
28
|
-
end
|
29
|
-
|
30
|
-
# False if and only if this status
|
31
|
-
# is `Mumuki::Laboratory::Status::Passed`
|
32
|
-
def should_retry?
|
33
|
-
true
|
34
|
-
end
|
35
|
-
|
36
|
-
def iconize
|
37
|
-
group.iconize
|
38
|
-
end
|
39
|
-
|
40
|
-
def as_json(_options={})
|
41
|
-
to_s
|
42
|
-
end
|
43
|
-
|
44
|
-
def ==(other)
|
45
|
-
self.equal? other.to_mumuki_status rescue false
|
46
|
-
end
|
47
|
-
end
|
@@ -1,15 +0,0 @@
|
|
1
|
-
module Mumuki::Laboratory::Status::Errored
|
2
|
-
extend Mumuki::Laboratory::Status::Base
|
3
|
-
|
4
|
-
def self.errored?
|
5
|
-
true
|
6
|
-
end
|
7
|
-
|
8
|
-
def self.group
|
9
|
-
Mumuki::Laboratory::Status::Failed
|
10
|
-
end
|
11
|
-
|
12
|
-
def self.iconize
|
13
|
-
{class: :broken, type: 'minus-circle'}
|
14
|
-
end
|
15
|
-
end
|
@@ -1,15 +0,0 @@
|
|
1
|
-
module Mumuki::Laboratory::Status::ManualEvaluationPending
|
2
|
-
extend Mumuki::Laboratory::Status::Base
|
3
|
-
|
4
|
-
def self.passed?
|
5
|
-
true
|
6
|
-
end
|
7
|
-
|
8
|
-
def self.group
|
9
|
-
Mumuki::Laboratory::Status::Passed
|
10
|
-
end
|
11
|
-
|
12
|
-
def self.iconize
|
13
|
-
{class: :info, type: 'clock-o'}
|
14
|
-
end
|
15
|
-
end
|
@@ -1,18 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe Mumukit::Randomizer do
|
4
|
-
let(:randomizer) { Mumukit::Randomizer.parse(randomizations) }
|
5
|
-
|
6
|
-
describe '#with_seed' do
|
7
|
-
before { Mumukit::Randomizer::Randomization::Base.any_instance.stub(:modulo) { |_, value, range| value % range.size + range.first } }
|
8
|
-
let(:randomizer) { Mumukit::Randomizer.parse(some_string: { type: :oneOf, value: %w(some string) }, some_number: { type: :range, value: [1, 3] } ) }
|
9
|
-
|
10
|
-
it { expect(randomizer.with_seed 0).to eq([['some_string', 'some'], ['some_number', 2]]) }
|
11
|
-
it { expect(randomizer.with_seed 1).to eq([['some_string', 'string'], ['some_number', 3]]) }
|
12
|
-
it { expect(randomizer.with_seed 2).to eq([['some_string', 'some'], ['some_number', 1]]) }
|
13
|
-
it { expect(randomizer.with_seed 3).to eq([['some_string', 'string'], ['some_number', 2]]) }
|
14
|
-
it { expect(randomizer.with_seed 4).to eq([['some_string', 'some'], ['some_number', 3]]) }
|
15
|
-
it { expect(randomizer.with_seed 5).to eq([['some_string', 'string'], ['some_number', 1]]) }
|
16
|
-
it { expect(randomizer.with_seed 6).to eq([['some_string', 'some'], ['some_number', 2]]) }
|
17
|
-
end
|
18
|
-
end
|
@@ -1,24 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe StatusRenderingVerbosity do
|
4
|
-
let(:results) { [{result: :passed, inspection: 'HasBinding', binding: 'foo'},
|
5
|
-
{result: :failed, inspection: 'HasBinding', binding: 'bar'}] }
|
6
|
-
|
7
|
-
describe StatusRenderingVerbosity::Verbose do
|
8
|
-
it { expect(StatusRenderingVerbosity::Verbose.visible_expectation_results(:passed_with_warnings, results)).to eq results }
|
9
|
-
end
|
10
|
-
|
11
|
-
describe StatusRenderingVerbosity::Standard do
|
12
|
-
let (:failed_expectations) { [{result: :failed, inspection: 'HasBinding', binding: 'bar'}] }
|
13
|
-
|
14
|
-
it { expect(StatusRenderingVerbosity::Standard.visible_expectation_results(:passed_with_warnings, results)).to eq failed_expectations }
|
15
|
-
it { expect(StatusRenderingVerbosity::Standard.visible_expectation_results(:errored, results)).to eq failed_expectations }
|
16
|
-
end
|
17
|
-
|
18
|
-
describe StatusRenderingVerbosity::Silent do
|
19
|
-
it { expect(StatusRenderingVerbosity::Silent.visible_expectation_results(:passed_with_warnings, results)).to be_empty }
|
20
|
-
it { expect(StatusRenderingVerbosity::Silent.render_feedback?(Object.new)).to be false }
|
21
|
-
|
22
|
-
end
|
23
|
-
|
24
|
-
end
|