mumuki-laboratory 5.12.1 → 5.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba4ab23f5ccb5fc65d34543b5957980da3c636b2ac20555562699ea141eb9c6e
-  data.tar.gz: 06e00713fe1a2072daef342207e67299d02921544589a5996547b43daceaade6
+  metadata.gz: fd4028c28b28b7924786fa0459d5406df47c9931e8d52772407960e68af4d3fe
+  data.tar.gz: d18dfab8db95844ce5dc18ac2c563d9e2f7de725ec946cc98081b72710395906
 SHA512:
-  metadata.gz: bee79042cbc5aa3f93fada9b322fd41f335939cf404c8f6989a20f4fac9d78d37c0748da3345ee2d4a33727c5f9925bd8bcb29402210d00cf5618e33d8b98e83
-  data.tar.gz: ba69eda434a00296ce5fff9b457da145fcc66802fe546bb9557ad3b7f734f7935a0e27efbae23a892a7969ea031cee9981f439493df83a1837412aa456ce10b2
+  metadata.gz: 150db78584cac26a99017f2bb417149d278a45bb86ed7151410047c6dd83fb5d4df93d3cec966ac332d8b52812f77a4a1c52b047eb3eeb3e915985d2798cd599
+  data.tar.gz: 5cba88c3a2ca3117c9885398a5d1f35617509f02d8e82b43532f1cb2450ae696cd9995d9c4609eb073c86178e4a3580ff55c901d3911d53606fb75c004fb35fd

data/app/assets/javascripts/application/confirmation.js

@@ -5,7 +5,10 @@ mumuki.load(function () {
     $.ajax(token.newRequest({
       method: 'POST',
       url: $(this).data('confirmation-url'),
-      xhrFields: {withCredentials: true}
+      xhrFields: {withCredentials: true},
+      success: function(data){
+        mumuki.updateProgressBarAndShowModal(data);
+      }
     }));
 
     return true;

data/app/controllers/exercise_confirmations_controller.rb

@@ -1,8 +1,9 @@
 class ExerciseConfirmationsController < AjaxController
   include Mumuki::Laboratory::Controllers::NestedInExercise
+  include Mumuki::Laboratory::Controllers::ResultsRendering
 
   def create
-    result = @exercise.submit_confirmation! current_user
-    render json: result
+    @exercise.submit_confirmation! current_user
+    render json: progress_json
   end
 end

data/app/helpers/application_helper.rb

@@ -52,3 +52,7 @@ module ApplicationHelper
     }.html_safe
   end
 end
+
+def sanitized(html)
+  Mumukit::ContentType::Sanitizer.sanitize html
+end

data/app/helpers/breadcrumbs_helper.rb

@@ -21,7 +21,7 @@ module BreadcrumbsHelper
   end
 
   def breadcrumb_list_item(last, item)
-    "<li #{breadcrumb_item_class(last)}>#{item}</li>".html_safe
+    "<li #{breadcrumb_item_class(last)}>#{h item}</li>".html_safe
   end
 
   private

data/app/helpers/concerns/with_student_path_navigation.rb

@@ -1,7 +1,8 @@
 module WithStudentPathNavigation
   def next_button(navigable)
     return unless navigable
-    ContinueNavigation.new(self).button(navigable) || RevisitNavigation.new(self).button(navigable)
+    ContinueNavigation.new(self).button(navigable) || RevisitNavigation.new(self).button(navigable) || FinishNavigation.new(self).button(navigable)
+    #TODO Refactor this
   end
 
   def next_lesson_button(guide)

data/app/helpers/concerns/with_student_path_navigation/finish_navigation.rb

@@ -0,0 +1,12 @@
+module WithStudentPathNavigation
+  class FinishNavigation < Navigation
+    def button(navigable)
+      return unless navigable.is_a?(Reading) && !navigable.status_for(current_user).like?(:passed)
+      content_tag 'a', t(:finish), merge_confirmation_classes(navigable, class: clazz)
+    end
+
+    def clazz
+      'btn btn-success btn-block'
+    end
+  end
+end

data/app/helpers/contextualization_result_helper.rb

@@ -1,6 +1,6 @@
 module ContextualizationResultHelper
   def humanized_expectation_result_item(expectation_result)
-    %Q{<li>#{status_icon(expectation_result[:result])} #{expectation_result[:explanation]}</li>}.html_safe
+    %Q{<li>#{status_icon(expectation_result[:result])} #{sanitized expectation_result[:explanation]}</li>}.html_safe
   end
 
   def render_feedback?(contextualization)

data/app/models/application_record.rb

@@ -22,6 +22,13 @@ class ApplicationRecord < ActiveRecord::Base
     end
   end
 
+  def self.serialize_symbolized_hash_array(*keys)
+    keys.each do |field|
+      serialize field
+      define_method(field) { self[field]&.map { |it| it.symbolize_keys } }
+    end
+  end
+
   def save(*)
     super
   rescue => e

data/app/models/concerns/contextualization.rb

@@ -19,10 +19,7 @@ module Contextualization
     serialize :submission_status, Mumuki::Laboratory::Status::Submission
     validates_presence_of :submission_status
 
-    [:expectation_results, :test_results, :query_results].each do |field|
-      serialize field
-      define_method(field) { self[field]&.map { |it| it.symbolize_keys } }
-    end
+    serialize_symbolized_hash_array :expectation_results, :test_results, :query_results
 
     composed_of :submission, mapping: submission_mapping, constructor: :from_attributes
 

data/app/models/concerns/with_reminders.rb

@@ -61,7 +61,9 @@ module WithReminders
 
   module ClassMethods
     def remindable
-      where('accepts_reminders and (last_submission_date < ? or last_submission_date is null)', reminder_frequency.days.ago)
+      where('accepts_reminders  and email is not null
+                                and last_organization_id is not null
+                                and (last_submission_date < ? or last_submission_date is null)', reminder_frequency.days.ago)
     end
 
     # The frequency of reminders, expressed in days

data/app/views/discussions/_message.html.erb

@@ -21,7 +21,7 @@
     </div>
     <div class="discussion-message-bubble-content">
       <div class="discussion-message-content">
-        <%= sanitize message.content_html %>
+        <%= message.content_html %>
       </div>
     </div>
   </div>

data/app/views/layouts/_test_results.html.erb

@@ -10,7 +10,7 @@
             <%= status_icon(test_result[:status]) %>
             <strong class="example-title"><%= test_result[:title] %></strong>
             <% unless contextualization.visible_success_output? %>
-              <a data-toggle="collapse" href="#example-result-<%= index %>"  class="example-see-more">Ver detalles</a>
+              <a data-toggle="collapse" href="#example-result-<%= index %>"  class="example-see-more"><%= t :view_details %></a>
             <% end %>
           </span>
         <% else %>

data/db/migrate/20181101180652_add_unique_index_to_organizations_name.rb

@@ -0,0 +1,5 @@
+class AddUniqueIndexToOrganizationsName < ActiveRecord::Migration[5.1]
+  def change
+    add_index :organizations, :name, unique: true
+  end
+end

data/lib/mumuki/laboratory/controllers/results_rendering.rb

@@ -8,9 +8,7 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
   end
 
   def render_results_json(assignment, results = {})
-    render json: results.merge(
-      guide_finished_by_solution: guide_finished_by_solution?,
-      class_for_progress_list_item: class_for_progress_list_item(@exercise, true),
+    render json: results.merge(progress_json).merge(
       html: render_results_html(assignment),
       title_html: render_results_title_html(assignment),
       button_html: render_results_button_html(assignment),
@@ -18,6 +16,13 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
       remaining_attempts_html: remaining_attempts_text(assignment))
   end
 
+  def progress_json
+    {
+      guide_finished_by_solution: guide_finished_by_solution?,
+      class_for_progress_list_item: class_for_progress_list_item(@exercise, true)
+    }
+  end
+
   def render_results_html(assignment)
     render_to_string partial: results_partial(assignment),
                      locals: {assignment: assignment}

data/lib/mumuki/laboratory/locales/en.yml

@@ -79,6 +79,7 @@ en:
   explain_redirect: You have registered in another organization
   failed: Oops, something went wrong
   feedback: Feedback
+  finish: Finish
   first_name: First Name
   forbidden_explanation: You are not allowed to see this content.
   go_to: 'Go to %{organization}'
@@ -228,6 +229,7 @@ en:
   user: User
   user_data_updated: Your data was updated successfuly
   username: Username
+  view_details: View details
   want_permissions: The next user requires permissions
   we_miss_you: We miss you!
   working: "Working"

data/lib/mumuki/laboratory/locales/es.yml

@@ -87,6 +87,7 @@ es:
   explain_redirect: Notamos que te registraste en otra organización.
   failed: Tu solución no pasó las pruebas
   feedback: Problemas que encontramos
+  finish: Terminar
   first_name: Nombre
   forbidden_explanation: Es decir que no tenés autorización para ver este contenido. <br> ¿Puede que hayas ingresado con una cuenta incorrecta?
   go_to: 'Ir a %{organization}'
@@ -253,6 +254,7 @@ es:
   user_data_updated: Tus datos se actualizaron correctamente
   user: Usuario
   username: Nombre de usuario
+  view_details: Ver detalles
   want_permissions: El siguiente usuario requiere permisos
   we_miss_you: ¡Te extrañamos!
   will_paginate:

data/lib/mumuki/laboratory/locales/pt.yml

@@ -82,6 +82,7 @@ pt:
   explain_redirect: Percebemos que você se registrou em outra organização.
   failed: Sua solução não passou as provas
   feedback: Problemas que encontramos
+  finish: Terminar
   first_name: Nome
   forbidden_explanation: Isso significa que você não tem autorização para ver esse conteúdo. <br> Você poderia ter entrado com uma conta incorreta?
   fullscreen: Tela completa
@@ -236,6 +237,7 @@ pt:
   user: Usuário
   user_data_updated: Os seus dados foram atualizados corretamente
   username: Nome de usuário
+  view_details: Ver detalhes
   want_permissions: O próximo usuário requer permissões
   working: Processamento
   wrong_answer: A resposta não é correta

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.12.1'
+    VERSION = '5.13.0'
   end
 end

data/spec/controllers/confirmations_controller_spec.rb

@@ -15,6 +15,6 @@ describe ExerciseConfirmationsController, organization_workspace: :test do
     before { post :create, params: { exercise_id: reading.id } }
 
     it { expect(response.status).to eq 200 }
-    it { expect(response.body.parse_json).to json_like(status: :passed, result: '') }
+    it { expect(response.body.parse_json).to json_like(guide_finished_by_solution: true, class_for_progress_list_item: 'progress-list-item text-center success active') }
   end
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181014233438) do
+ActiveRecord::Schema.define(version: 20181101180652) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -250,6 +250,7 @@ ActiveRecord::Schema.define(version: 20181014233438) do
     t.text "theme", default: "{}", null: false
     t.text "profile", default: "{}", null: false
     t.index ["book_id"], name: "index_organizations_on_book_id"
+    t.index ["name"], name: "index_organizations_on_name", unique: true
   end
 
   create_table "paths", id: :serial, force: :cascade do |t|

data/spec/helpers/breadcrumbs_helper_spec.rb

@@ -4,7 +4,7 @@ describe BreadcrumbsHelper, organization_workspace: :test do
 
   helper BreadcrumbsHelper
   helper LinksHelper
-
+  helper ERB::Util
 
   context 'user' do
     let(:user) { create(:user) }

data/spec/mailers/user_mailer_spec.rb

@@ -35,6 +35,24 @@ RSpec.describe UserMailer, type: :mailer do
                           last_submission_date: 15.minutes.ago }
       it { expect(User.remindable).to_not include user }
     end
+
+    context 'when user does not have an email' do
+      let(:user) { create :user,
+                          uid: 'user',
+                          accepts_reminders: true,
+                          last_organization: central,
+                          email: nil,
+                          last_submission_date: nil }
+      it { expect(User.remindable).to_not include user }
+    end
+
+    context 'when user does not have a last organization' do
+      let(:user) { create :user,
+                          uid: 'user',
+                          accepts_reminders: true,
+                          last_submission_date: nil }
+      it { expect(User.remindable).to_not include user }
+    end
   end
 
   describe "we_miss_you_reminder" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 5.12.1
+  version: 5.13.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mumukit-auth
   requirement: !ruby/object:Gem::Requirement
@@ -359,6 +359,7 @@ files:
 - app/helpers/choices_helper.rb
 - app/helpers/concerns/with_student_path_navigation.rb
 - app/helpers/concerns/with_student_path_navigation/continue_navigation.rb
+- app/helpers/concerns/with_student_path_navigation/finish_navigation.rb
 - app/helpers/concerns/with_student_path_navigation/navigation.rb
 - app/helpers/concerns/with_student_path_navigation/revisit_navigation.rb
 - app/helpers/contextualization_result_helper.rb
@@ -803,6 +804,7 @@ files:
 - db/migrate/20180802190437_add_approved_to_messages.rb
 - db/migrate/20181004173216_add_free_form_editor_to_exercises.rb
 - db/migrate/20181014233438_remove_non_null_constraint_from_permissions.rb
+- db/migrate/20181101180652_add_unique_index_to_organizations_name.rb
 - db/seeds/users.rb
 - lib/events.rb
 - lib/mumuki/laboratory.rb