mumuki-laboratory 8.6.0 → 8.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a4fb878a7767d1fe4b760252213ae327d8e5ae82bab805065eddb85b3baa36
-  data.tar.gz: e45d454449b183f1f4c200152a25f2df58ef385c1c07949e3fda7be94e6de57c
+  metadata.gz: 824e346e9d3113f3b3d48c8ed7e23c846e26a54fb5ed7e4c4bb5a9307323b4d7
+  data.tar.gz: e28b9bdf65007abda370a36b760adeaf7989ab9e4c94c52ebaa09bcd3f14fb79
 SHA512:
-  metadata.gz: 9113399868c37c29fc38521c88b1f4acd2477b6094469c97be54983eb46753245e79ea7d4a56cb641ade8746b05323ecdeef276321aeb70e19ceca123d232566
-  data.tar.gz: 1f101adea0a26968fe86fc9f7d5084e4cd821ab9b17ca528762bb55573a0be5eeb98e2eba0e5affa83da30168f046c6ea1b7e7cd6654beed0eeb599ea0aaaa73
+  metadata.gz: 46a32c31bb80eca3fa50fc45c37875a36894cf3fbc2192f339c138763afeac44a811ab336650460a7e7f150323601d92cab90c91e967668916462d21026eb72a
+  data.tar.gz: c9ecc5bd9523a72129d3914317fa29c596038b99f3733de72fc71c27b5c1be3295d9f79ddff39d3cf39c8cfb22bd873581442c4c9121680cdd68901990a11b54

data/app/assets/javascripts/mumuki_laboratory/application/upload.js

@@ -1,17 +1,72 @@
+mumuki.upload = (() => {
+  class FileUploader {
+    constructor(file) {
+      this.file = file;
+    }
+
+    uploadFileIfValid() {
+      if (!this.file) return;
+
+      let maxFileSize = $('#mu-upload-input').attr("mu-upload-file-limit");
+      if (this.file.size > maxFileSize) {
+        return mumuki.upload.ui.showFileExceedsMaxSize();
+      }
+
+      mumuki.upload.ui.allowSubmissionFor(this.file.name);
+
+      const reader = new FileReader();
+      reader.onload = function (e) {
+        const contents = e.target.result;
+        $('#solution_content').html(contents);
+      };
+      reader.readAsText(this.file);
+
+      return reader;
+    }
+  }
+
+  class UI {
+    constructor() {
+      this.$uploadFileLimitExceeded = $('#mu-upload-file-limit-exceeded');
+      this.$uploadLabel = $('#mu-upload-label span');
+      this.$uploadLabelText = this.$uploadLabel.text();
+      this.$uploadIcon = $('#mu-upload-icon');
+      this.$btnSubmit = $('.btn-submit');
+    }
+
+    showFileExceedsMaxSize() {
+      this.$uploadFileLimitExceeded.removeClass('hidden');
+      this.$uploadLabel.text(this.$uploadLabelText);
+      this.$uploadIcon.addClass('fa-upload').removeClass('fa-file-alt');
+      this.$btnSubmit.addClass('disabled');
+    }
+
+    allowSubmissionFor(filename) {
+      this.$uploadFileLimitExceeded.addClass('hidden');
+      this.$uploadLabel.text(filename);
+      this.$uploadIcon.removeClass('fa-upload').addClass('fa-file-alt');
+      this.$btnSubmit.removeClass('disabled');
+    }
+  }
+
+  function _setUI() {
+    mumuki.upload.ui = new UI();
+  }
+
+  return {
+    FileUploader,
+    UI,
+
+    _setUI,
+
+    /** @type {UI} */
+    ui: null
+  };
+})();
+
 mumuki.load(() => {
-  $('#upload-input').change(function (evt) {
-    var file = evt.target.files[0];
-    if (!file) return;
-
-    var reader = new FileReader();
-    reader.onload = function (e) {
-      var contents = e.target.result;
-      $('#solution_content').html(contents);
-      $(evt.target).val("");
-      $('form.new_solution').submit();
-    };
-    reader.readAsText(file);
-    return false;
+  $('#mu-upload-input').change(function (evt) {
+    if (!mumuki.upload.ui) mumuki.upload._setUI();
+    return new mumuki.upload.FileUploader(evt.target.files[0]).uploadFileIfValid();
   });
 });
-

data/app/assets/stylesheets/mumuki_laboratory/application/modules/_content_show.scss

@@ -1,3 +1,3 @@
-.chapter-description p {
+.chapter-description {
   display: inline-block;
 }

data/app/helpers/exercise_input_helper.rb

@@ -53,12 +53,11 @@ module ExerciseInputHelper
     waiting_text = t(options.waiting_t) if options.waiting_t.present?
     %Q{
       <div class="btn-submit-container">
-        <#{options.tag} for="#{options.for}"
-                       class="btn btn-success btn-block btn-submit #{options.classes}"
+        <button class="btn btn-success btn-block btn-submit #{options.classes}"
                        data-waiting="#{waiting_text}">
-          #{fa_icon options.fa_icon}
+          #{fa_icon 'play'}
           #{text} #{remaining_attempts_text(assignment)}
-       </#{options.tag}>
+       </button>
       </div>
     }.html_safe
   end
@@ -92,26 +91,18 @@ module ExerciseInputHelper
 
   def submit_button_options(exercise)
     if exercise.upload?
-      struct for: 'upload-input',
-             tag: :label,
+      struct classes: 'disabled',
              waiting_t: :uploading_solution,
-             fa_icon: :upload,
-             t: :upload_solution
+             t: :create_submission
     elsif exercise.hidden?
-      struct tag: :button,
-             classes: 'submission_control',
+      struct classes: 'submission_control',
              waiting_t: :working,
-             fa_icon: :play,
              t: :continue_exercise
     elsif exercise.input_kids?
-      struct tag: :button,
-             classes: 'submission_control',
-             fa_icon: :play
+      struct classes: 'submission_control'
     else
-      struct tag: :button,
-             classes: 'submission_control',
+      struct classes: 'submission_control',
              waiting_t: :sending_solution,
-             fa_icon: :play,
              t: :create_submission
     end
   end

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

@@ -1,4 +1,13 @@
 <div class="form-group">
-  <textarea id="solution_content" type="text" name="solution[content]" style="display: none"></textarea>
-  <input id="upload-input" type="file" class="upload submission-control" size="5120" accept=".<%= @exercise.language.extension %>" />
+  <% @max_file_size = 256000 %>
+
+  <textarea id="solution_content" type="text" name="solution[content]" class="hidden"></textarea>
+  <input id="mu-upload-input" type="file" class="upload submission-control hidden" mu-upload-file-limit=<%= @max_file_size %> accept=".<%= @exercise.language.extension %>" />
+  <div>
+    <label id="mu-upload-label" for="mu-upload-input" class="btn btn-success">
+      <%= fa_icon(:upload, text: t(:select_file), id: "mu-upload-icon") %>
+    </label>
+    <div id="mu-upload-file-limit-exceeded" class="hidden">
+      <%= fa_icon("exclamation-triangle", text: t(:file_exceeds_max_size, size_kb: (@max_file_size / 1000))) %></div>
+  </div>
 </div>

data/app/views/users/terms.html.erb

@@ -1,5 +1,5 @@
 <%= content_for :breadcrumbs do %>
-  <% if current_user? %>
+  <% if current_logged_user? %>
     <%= breadcrumbs @user %>
   <% else %>
     <%= header_breadcrumbs %>

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

@@ -111,6 +111,7 @@ en:
   failed: Oops, something went wrong
   feedback: Feedback
   female: Female
+  file_exceeds_max_size: "File size should not exceed %{size_kb}kb. Please select another file."
   finish: Finish
   first_name: First Name
   forbidden_explanation: Please verify you have logged in with the right account
@@ -233,6 +234,7 @@ en:
   running: running
   save: Save
   see_context: Watch exercise introduction animation
+  select_file: Select file
   sending_solution: Sending solution
   show: Show
   sign_in: Sign in
@@ -289,13 +291,12 @@ en:
   unprepared_organization_explanation: This path hasn't started yet.
   unsubscribe: Unsubscribe
   unsubscribed_successfully: You have successfully unsubscribed from reminders.
-  upload_solution: Upload Solution
   uploading_solution: "Uploading solution"
   upvote: Upvote
   upvotes_count_desc: Most voted
   upvotes_count_asc: Least voted
   user: User
-  user_data_updated: Your data was updated successfuly
+  user_data_updated: Your data was updated successfully
   username: Username
   view_details: View details
   want_permissions: The next user requires permissions

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

@@ -109,6 +109,7 @@ es-CL:
   failed: Tu solución no pasó las pruebas
   feedback: Problemas que encontramos
   female: Mujer
+  file_exceeds_max_size: "El tamaño de archivo no debe exceder %{size_kb}kb. Por favor selecciona otro archivo."
   finish: Terminar
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
@@ -167,7 +168,7 @@ es-CL:
   messages_error: Los mensajes anteriores no están disponibles en este momento. ¡Vuelve a intentar más tarde!
   minute: minuto
   minutes: minutos
-  moderation: Moderación
+  moderation: Mentoría
   moderator: Mentor
   more_messages: Ver mensajes anteriores
   my_doubts: Mis consultas
@@ -236,6 +237,7 @@ es-CL:
   running: procesando
   save: Guardar
   see_context: Mira la animación del principio
+  select_file: Seleccionar archivo
   send: Enviar
   sending_solution: Enviando solución
   show: Mostrar
@@ -297,7 +299,6 @@ es-CL:
   unprepared_organization_explanation: ¡Este recorrido aún no ha comenzado!
   unsubscribe: Dejar de recibir notificaciones
   unsubscribed_successfully: Te desuscribiste exitosamente de los recordatorios.
-  upload_solution: "Subir solución"
   uploading_solution: "Subiendo solución"
   upvote: Es útil
   upvotes_count_desc: Más útiles

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

@@ -117,6 +117,7 @@ es:
   failed: Tu solución no pasó las pruebas
   feedback: Problemas que encontramos
   female: Mujer
+  file_exceeds_max_size: "El tamaño de archivo no debe exceder %{size_kb}kb. Por favor seleccioná otro archivo."
   finish: Terminar
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
@@ -251,6 +252,7 @@ es:
   running: procesando
   save: Guardar
   see_context: Mirá la animación del principio
+  select_file: Seleccionar archivo
   send: Enviar
   sending_solution: Enviando solución
   show: Mostrar
@@ -313,7 +315,6 @@ es:
   unprepared_organization_explanation: Este recorrido aún no ha comenzado
   unsubscribe: Dejar de recibir notificaciones
   unsubscribed_successfully: Te desuscribiste exitosamente de los recordatorios.
-  upload_solution: "Subir solución"
   uploading_solution: "Subiendo solución"
   upvote: Es útil
   upvotes_count_desc: Más útiles

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

@@ -113,6 +113,7 @@ pt:
   failed: Sua solução não passou as provas
   feedback: Problemas que encontramos
   female: Feminino
+  file_exceeds_max_size: "O tamanho do arquivo não deve exceder %{size_kb}kb. Selecione outro arquivo."
   finish: Terminar
   first_name: Nome
   forbidden_explanation: Você poderia ter entrado com uma conta incorreta?
@@ -240,6 +241,7 @@ pt:
   running: processamento
   save: Salvar
   see_context: Veja a animação desde o início
+  select_file: Selecione o arquivo
   send: Enviar
   sending_solution: Solução de envio
   show: Mostrar
@@ -296,7 +298,6 @@ pt:
   unmeet_expectations: Objetivos que não foram atendidos
   unprepared_organization_explanation: Este curso ainda não começou
   unsubscribe: Cancelar subscrição
-  upload_solution: Carregar solução
   uploading_solution: Uploading solution
   user: Usuário
   user_data_updated: Os seus dados foram atualizados corretamente

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '8.6.0'
+    VERSION = '8.6.1'
   end
 end

data/spec/features/profile_flow_spec.rb

@@ -95,9 +95,8 @@ feature 'Profile Flow', organization_workspace: :test do
           visit "/user/edit"
           fill_in('user_first_name', with: 'first_name')
 
-          # Match :first is used because there are two buttons: mobile and desktop.
           click_on(button_options)
-          expect(page).to have_text('Your data was updated successfuly')
+          expect(page).to have_text('Your data was updated successfully')
           expect(page).to have_text('Profile')
         end
       end

data/spec/features/terms_flow_spec.rb

@@ -153,5 +153,35 @@ feature 'Terms Flow', organization_workspace: :test do
     end
   end
 
+  context 'with incognito mode' do
+    before { test_organization.update! incognito_mode_enabled: true }
+
+    describe 'visit user terms path' do
+      let(:terms_path) { '/user/terms' }
+      let(:expected_terms) { general_terms_scopes }
+
+      it_behaves_like 'has expected terms'
+    end
+
+    scenario 'visit any other path' do
+      visit '/'
+
+      expect(page).to have_text('Start Practicing')
+    end
+
+    context 'visit forum' do
+      let(:terms_path) { '/discussions/terms' }
+
+      context 'with enabled forum' do
+        before { test_organization.update! forum_enabled: true }
+
+        scenario 'visit forum' do
+          visit '/discussions/terms'
+          expect(page).to have_text('You may have mistyped the address or the page may have moved')
+        end
+      end
+    end
+  end
+
 end
 

data/spec/javascripts/upload-spec.js

@@ -0,0 +1,80 @@
+describe('upload', () => {
+  const fileSizeLimit = 20;
+
+  fixture.set(`
+    <textarea id="solution_content" type="text" name="solution[content]" class="hidden"></textarea>
+    <input id="mu-upload-input" type="file" class="upload submission-control hidden" mu-upload-file-limit=${fileSizeLimit} accept=".txt" />
+    <label id="mu-upload-label" for="mu-upload-input" class="btn btn-success"></label>
+    <button class="btn btn-success btn-block btn-submit disabled"></button>
+    <div id="mu-upload-file-limit-exceeded" class="hidden"></div>
+  `);
+
+  beforeEach(() => {
+    mumuki.upload._setUI();
+  });
+
+  function reader(file, done) {
+    let fileReader = new mumuki.upload.FileUploader(file).uploadFileIfValid();
+    if (fileReader) {
+      fileReader.addEventListener('load', () => done());
+      fileReader.addEventListener('error', done);
+      return fileReader;
+    } else {
+      done();
+    }
+  }
+
+  describe('no file is uploaded', () => {
+    beforeEach((done) => {
+      reader(null, done);
+    });
+
+    it('loads no solution', function () {
+      expect($('#solution_content').html()).toEqual('');
+    });
+
+    it('does not allow submitting', function () {
+      expect($('.btn-submit').hasClass('disabled')).toBe(true);
+    });
+
+    it('does not exceed max file size', function () {
+      expect($('#mu-upload-file-limit-exceeded').hasClass('hidden')).toBe(true);
+    });
+  });
+
+  describe('small file is uploaded', () => {
+    beforeEach((done) => {
+      reader(new File(["short solution"], "short.txt"), done);
+    });
+
+    it('loads solution', function () {
+      expect($('#solution_content').html()).toEqual('short solution');
+    });
+
+    it('allows submitting', function () {
+      expect($('.btn-submit').hasClass('disabled')).toBe(false);
+    });
+
+    it('does not exceed max file size', function () {
+      expect($('#mu-upload-file-limit-exceeded').hasClass('hidden')).toBe(true);
+    });
+  });
+
+  describe('large file is uploaded', () => {
+    beforeEach((done) => {
+      reader(new File(["solution that is too long to be allowed"], "long.txt"), done);
+    });
+
+    it('loads no solution', function () {
+      expect($('#solution_content').html()).toEqual('');
+    });
+
+    it('does not allow submitting', function () {
+      expect($('.btn-submit').hasClass('disabled')).toBe(true);
+    });
+
+    it('exceeds max file size', function () {
+      expect($('#mu-upload-file-limit-exceeded').hasClass('hidden')).toBe(false);
+    });
+  });
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 8.6.0
+  version: 8.6.1
 platform: ruby
 authors:
 - Franco Bulgarelli
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -810,6 +810,7 @@ files:
 - spec/javascripts/sync-mode-spec.js
 - spec/javascripts/timeout-spec.js
 - spec/javascripts/timer-spec.js
+- spec/javascripts/upload-spec.js
 - spec/login_helper.rb
 - spec/mailers/previews/user_mailer_preview.rb
 - spec/mailers/user_mailer_spec.rb
@@ -859,7 +860,7 @@ homepage: https://mumuki.io
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -874,9 +875,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Code assement web application for the Mumuki Platform.
 test_files:
@@ -987,6 +988,7 @@ test_files:
 - spec/javascripts/editors-spec.js
 - spec/javascripts/exercise-spec.js
 - spec/javascripts/elipsis-spec.js
+- spec/javascripts/upload-spec.js
 - spec/javascripts/spec-helper.js
 - spec/javascripts/submissions-store-spec.js
 - spec/javascripts/gamification-spec.js