mumuki-laboratory 5.2.1 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a65029b99e695f3c041d0841bedd58907130308069bd7d50d6cc7e043f9c8ba
-  data.tar.gz: d2c57ab18ad4f0fff3243b4fe1297c04816b941e2073f999b1775d30889188f9
+  metadata.gz: 2274f31d946435025a018f54c3a83f962a6574d675e1e060712bdc9e78d5c281
+  data.tar.gz: 0a86aa34f9ee2422f41ac9062498f3d925740562a33e3eb5e6bc57239897a8d0
 SHA512:
-  metadata.gz: 7d0770002ff1862da231d98a0c00990a585ab5bcd054ad5c78044955a4d40d10b64e44621d16842812d710d4fe64f45b0d3ede502e63be3353a18e24c42663f3
-  data.tar.gz: f3485084836dbd273b39ae5b80639249f262c1734b0a82d61acd8f4ef3fcd889b065fabeee955bb195b4e8379bf0956fef04a8a28ee6a9d8f17a26e3eecb4743
+  metadata.gz: 4a73e4420c07b9ee520922d3f1ffcfa5425abc7e5f8fa3bf8311a95664b7b3e50f44faf3f7ab9b4730fcd37cde58332eaa0d9f2dbec7f4e485283212c307361d
+  data.tar.gz: 68e1afc05bf48733ec13e5d1451e35beaf8c7d862197b4f7efe0dabd9ec31001c9afb6ef8c153b415f4cad00c400b8de64fbc960509b929afd189eeb07e0b920

data/app/controllers/invitations_controller.rb

@@ -1,4 +1,5 @@
 class InvitationsController < ApplicationController
+  before_action :authenticate!
   before_action :set_invitation!
 
   def show

data/app/helpers/exercise_input_helper.rb

@@ -11,6 +11,10 @@ module ExerciseInputHelper
     render "layouts/exercise_inputs/editors/#{exercise.editor}", form: form, exercise: exercise
   end
 
+  def default_content_tag_id(exercise)
+    exercise.custom? ? 'mu-custom-editor-default-value' : 'default_content'
+  end
+
   def should_render_problem_tabs?(exercise, user)
     !exercise.hidden? && (exercise.queriable? || exercise.extra_visible? || exercise.has_messages_for?(user))
   end

data/app/models/concerns/with_assignments.rb

@@ -19,10 +19,7 @@ module WithAssignments
   end
 
   def interpolate_for(user, field)
-    language
-      .directives_interpolations
-      .interpolate(field, lambda { |content| replace_content_reference(user, content) })
-      .first
+    language.interpolate(field, user.interpolations, lambda { |content| replace_content_reference(user, content) })
   end
 
   def default_content_for(user)

data/app/models/exercise.rb

@@ -126,6 +126,10 @@ class Exercise < ApplicationRecord
     Mumukit::ContentType::Markdown.to_html splitted_description.drop(1).join("\n")
   end
 
+  def custom?
+    false
+  end
+
   private
 
   def evaluation_class

data/app/models/language.rb

@@ -65,6 +65,10 @@ class Language < ApplicationRecord
     new_directive Mumukit::Directives::Sections
   end
 
+  def interpolate(interpolee, *interpolations)
+    interpolations.inject(interpolee) { |content, interpolation| directives_interpolations.interpolate(content, interpolation).first }
+  end
+
   def directives_interpolations
     new_directive Mumukit::Directives::Interpolations
   end

data/app/models/status_rendering_verbosity.rb

@@ -18,12 +18,8 @@ module StatusRenderingVerbosity
   end
 
   module Standard
-    def self.visible_expectation_results(status_like, expectation_results)
-      if status_like.to_mumuki_status.errored?
-        []
-      else
-        expectation_results.select { |it| it[:result].failed? }
-      end
+    def self.visible_expectation_results(_status_like, expectation_results)
+      expectation_results.select { |it| it[:result].failed? }
     end
 
     def self.render_feedback?(feedback)

data/app/models/user.rb

@@ -116,6 +116,20 @@ class User < ApplicationRecord
     where(uid: user[:uid]).first_or_create(user)
   end
 
+  def interpolations
+    {
+      'user_email' => email,
+      'user_first_name' => first_name,
+      'user_last_name' => last_name
+    }
+  end
+
+  def resubmit!(organization = nil)
+    organization = Organization.find_by_name(organization) || main_organization
+    organization.switch!
+    assignments.each { |it| it.notify! rescue nil }
+  end
+
   private
 
   def set_uid!

data/app/views/exercises/show.html.erb

@@ -59,7 +59,7 @@
 
 <%= render_exercise_input_layout(@exercise) %>
 
-<%= hidden_field_tag :default_content, @default_content %>
+<%= hidden_field_tag default_content_tag_id(@exercise), @default_content %>
 
 <div style="display: none" id="processing-template">
   <div class="bs-callout bs-callout-info">

data/app/views/layouts/exercise_inputs/editors/_custom.html.erb

@@ -2,5 +2,4 @@
 
 <%= render_custom_editor(@exercise) %>
 <%= form.hidden_field :content, id: "mu-custom-editor-value", value: @current_content %>
-<%= form.hidden_field :default_content, id: "mu-custom-editor-default-value", value: @exercise.default_content %>
 <%= form.hidden_field :content_extra, id: "mu-custom-editor-extra", value: @exercise.extra %>

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.2.1'
+    VERSION = '5.3.0'
   end
 end

data/spec/models/assignment_spec.rb

@@ -61,13 +61,13 @@ describe Assignment, organization_workspace: :test do
   describe '#expectation_results_visible?' do
     let(:haskell) { create(:language, visible_success_output: true) }
     let(:exercise) { create(:exercise) }
-    context 'should show expectation' do
+    context 'should show expectation with failed submissions' do
       let(:failed_submission) { create(:assignment, status: :failed, expectation_results: [{:binding => "foo", :inspection => "HasBinding", :result => :failed}]) }
       it { expect(failed_submission.expectation_results_visible?).to be true }
     end
-    context 'should not show expectation' do
+    context 'should show expectation with errored submissions' do
       let(:errored_submission) { create(:assignment, status: :errored, expectation_results: [{:binding => "foo", :inspection => "HasBinding", :result => :failed}]) }
-      it { expect(errored_submission.expectation_results_visible?).to be false }
+      it { expect(errored_submission.expectation_results_visible?).to be true }
     end
   end
   describe '#run_update!' do
@@ -163,4 +163,12 @@ describe Assignment, organization_workspace: :test do
     it { expect(evaluated_assignment.manual_evaluation_comment).to eq '**Good**' }
   end
 
+  describe '#extra' do
+    let(:user) { create(:user, email: 'some_email', first_name: 'some_first_name', last_name: 'some_last_name') }
+    let(:exercise) { create(:exercise, extra: "/*...user_email...*/\n/*...user_first_name...*/\n/*...user_last_name...*/") }
+    let(:assignment) { exercise.submit_solution!(user, content: '') }
+
+    it { expect(assignment.extra).to eq "some_email\nsome_first_name\nsome_last_name\n" }
+  end
+
 end

data/spec/models/user_spec.rb

@@ -234,4 +234,22 @@ describe User, organization_workspace: :test do
 
     end
   end
+
+  describe '#resubmit!' do
+    let(:student) { create :user }
+    let(:exercises) { FactoryBot.create_list(:exercise, 5) }
+
+    let!(:chapter) {
+      create(:chapter, lessons: [
+        create(:lesson, exercises: exercises)]) }
+
+    before { reindex_current_organization! }
+
+    before { exercises.each { |it| it.submit_solution! student, content: '' } }
+
+    it do
+      student.assignments.each { |it| expect(it).to receive(:notify!).once }
+      student.resubmit! Organization.current.name
+    end
+  end
 end

data/spec/models/verbosity_spec.rb

@@ -9,9 +9,10 @@ describe StatusRenderingVerbosity do
   end
 
   describe StatusRenderingVerbosity::Standard do
-    it { expect(StatusRenderingVerbosity::Standard.visible_expectation_results(:passed_with_warnings, results)).to eq ([
-        {result: :failed, inspection: 'HasBinding', binding: 'bar'}]) }
-    it { expect(StatusRenderingVerbosity::Standard.visible_expectation_results(:errored, results)).to eq [] }
+    let (:failed_expectations) { [{result: :failed, inspection: 'HasBinding', binding: 'bar'}] }
+
+    it { expect(StatusRenderingVerbosity::Standard.visible_expectation_results(:passed_with_warnings, results)).to eq failed_expectations }
+    it { expect(StatusRenderingVerbosity::Standard.visible_expectation_results(:errored, results)).to eq failed_expectations }
   end
 
   describe StatusRenderingVerbosity::Silent do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.3.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -931,7 +931,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Code assement web application for the Mumuki Platform.