mumuki-laboratory 7.5.2 → 7.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79986a0a901198e3180b64363b42fe60ec3624770f91d5344ed24924c0ea35e4
-  data.tar.gz: f4697b90f0db3248d2fb9fbf05f1a96cdb8b778b0025f77f9a425180271e7c79
+  metadata.gz: 56fcb30522c5c040911bbfc58f2f6e522aa5983f09b09d76cad1e60c8bd2efdd
+  data.tar.gz: aeec9a44afdf74ea1d21e9f6b4bb548f12c22f7db55fa6470b478372ba7efcb5
 SHA512:
-  metadata.gz: ca14a8ab6f454820fa4712bd876e3c3d4598febfe95789b078ab6ea67ad2ba80974f9c71e8f62cf500690bb60986e48e87c4437f7f806cb161c92de14c8261dd
-  data.tar.gz: b34ea27ac01bbde88b65a5f38410b5b3b743dd4847b60e7e5c8d26c061740f7ac2bd4e0dac38ca1748dfdad698e861362fedde047d6ee03d97e5810d50830ecc
+  metadata.gz: a98ee53e368aefbfc98cb99f8f4164c4e43d0e3c0be8e06c04cf39f48d4b78edf4ef5afaec4bdf94bd341121e0616c38f1ca9419eed8ae530fd395c5a75fd2b6
+  data.tar.gz: 8c17f74141875921e42b6e8972d37c9c3e53d81646223e83a647c6d5e1f2a14acde33da7ff00b4f80c88a3ffe411378daacbf8580fd44f75efde2a510f971297

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

@@ -6,6 +6,7 @@ $da-font-path: asset-path('assets');
 @import "codemirror/codemirror.min";
 @import "codemirror/show-hint.min";
 @import "application/vendor";
+@import "application/locked";
 @import "application/tooltip";
 @import "application/hovers";
 @import "application/mixins";

data/app/assets/stylesheets/mumuki_laboratory/application/_layout.scss

@@ -107,10 +107,6 @@ h1 {
   margin-bottom: 20px;
 }
 
-.chapter {
-  margin: 35px 0;
-}
-
 pre {
   font-size: 14px;
   line-height: 1.4;

data/app/assets/stylesheets/mumuki_laboratory/application/_locked.scss

@@ -0,0 +1,29 @@
+.chapter-container {
+  position: relative;
+}
+
+.chapter {
+  position: relative;
+
+  margin: 35px 0;
+  padding-bottom: 15px;
+
+  &.mu-locked {
+    opacity: 20%;
+
+    user-select: none;
+    pointer-events: none;
+  }
+}
+
+.mu-lock {
+  position: absolute;
+
+  width: 100%;
+  height: 100%;
+
+  transform: translateY(20%);
+
+  top: 0px;
+  left: 0px;
+}

data/app/controllers/application_controller.rb

@@ -14,15 +14,22 @@ class ApplicationController < ActionController::Base
 
   before_action :set_current_organization!
   before_action :set_locale!
+
   before_action :ensure_user_enabled!, if: :current_user?
+  before_action :validate_active_organization!
+
   before_action :redirect_to_main_organization!, if: :should_redirect_to_main_organization?
+
   before_action :authorize_if_private!
+  before_action :validate_active_organization!
   before_action :validate_user_profile!, if: :current_user?
+
   before_action :visit_organization!, if: :current_user?
 
   after_action :leave_organization!
 
-  helper_method :login_button,
+  helper_method :current_workspace,
+                :login_button,
                 :notifications_count,
                 :user_notifications_path,
                 :has_notifications?,
@@ -51,8 +58,14 @@ class ApplicationController < ActionController::Base
     accessible_subject.validate_accessible_for! current_user
   end
 
+  def validate_active_organization!
+    return if current_user&.teacher_here?
+    Organization.current.validate_active!
+  end
+
+
   # required by Mumukit::Login
-  def login_button(options={})
+  def login_button(options = {})
     login_form.button_html I18n.t(:sign_in), options[:class]
   end
 
@@ -62,6 +75,10 @@ class ApplicationController < ActionController::Base
     raise Mumuki::Domain::NotFoundError unless content.usage_in_organization.try { |usage| redirect_to usage }
   end
 
+  def current_workspace
+    Mumuki::Domain::Workspace.new(current_user, Organization.current)
+  end
+
   private
 
   def from_sessions?

data/app/controllers/invitations_controller.rb

@@ -7,6 +7,7 @@ class InvitationsController < ApplicationController
 
   skip_before_action :validate_user_profile!
   skip_before_action :authorize_if_private!
+  skip_before_action :validate_active_organization!
 
   def show
     redirect_to_organization! if current_user.student_of? @invitation.course

data/app/controllers/login_controller.rb

@@ -3,6 +3,7 @@ class LoginController < ApplicationController
 
   skip_before_action :verify_authenticity_token, if: lambda { Rails.env.development? }
   skip_before_action :validate_user_profile!
+  skip_before_action :validate_active_organization!
 
   private
 

data/app/helpers/links_helper.rb

@@ -14,7 +14,7 @@ module LinksHelper
   end
 
   def link_to_status_codes(code)
-    "<a href='https://es.wikipedia.org/wiki/Anexo:C%C3%B3digos_de_estado_HTTP'> #{I18n.t("error_#{code}")} </a>"
+    "<a href='https://es.wikipedia.org/wiki/Anexo:C%C3%B3digos_de_estado_HTTP' target='_blank'> #{I18n.t("error_#{code}")} </a>"
   end
 
   def url_for_application(app_name)

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

@@ -32,13 +32,21 @@
 
   <h2><%= t(:chapters) %></h2>
 
-  <% @book.chapters.each do |it| %>
-    <div class="chapter">
-      <h3><%= it.number %>. <%= link_to_path_element it, mode: :plain %></h3>
-
-      <div class="text-box">
-        <%= it.description_teaser_html %>
+  <% @book.chapter_visibilities_in(current_workspace).each do |it, enabled| %>
+    <div class="chapter-container">
+      <div class="chapter <%= enabled ? '' : 'mu-locked' %>">
+        <h3><%= it.number %>. <%= link_to_path_element it, mode: :plain %></h3>
+        <div class="text-box" <%= 'aria-label=""' unless enabled %>%>
+          <%= it.description_teaser_html %>
+        </div>
       </div>
+
+      <% unless enabled  %>
+        <div class="text-center mu-lock">
+          <i class="fa fa-lock fa-5x"></i>
+          <p><%= t :locked_content %></p>
+        </div>
+      <% end %>
     </div>
   <% end %>
   <% if current_user? && @exams.present? %>

data/app/views/errors/gone.html.erb

@@ -4,7 +4,10 @@
     </div>
     <div class="body">
       <p>
-        <%= t(:gone_explanation, error: link_to_status_codes(410)).html_safe %>
+        <%= t(:error_description, error: link_to_status_codes(410)).html_safe %>
+      </p>
+      <p>
+        <%= Organization.current.explain_error(410, explanation).html_safe %>
       </p>
       <p>
         <a class="btn btn-success" href="/"> <%= t(:back_to_mumuki) %> </a>

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

@@ -17,7 +17,7 @@
     <div class="description"><%= exercise.description_task %></div>
     <div class="hint" style="display: none"><%= exercise.hint_html %></div>
   </div>
-  <div class="mu-kids-character-speech-bubble-failed <%= @assignment&.status %>" style="display: none"></div>
+  <div class="mu-kids-character-speech-bubble-failed <%= current_user? && @assignment.status %>" style="display: none"></div>
 </div>
 <div id="mu-kids-discussion-link-html" class="hidden">
   <%= kids_read_discussions_link(exercise) %>

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

@@ -26,8 +26,8 @@
       <% end %>
     </div>
 
-    <div class="mu-overlapped">
-      <a class="editor-resize multiple-files" title="<%= t(:fullscreen) %> (F11)">
+    <div class="mu-overlapped multiple-files">
+      <a class="editor-resize" title="<%= t(:fullscreen) %> (F11)">
         <span class="fa-stack fa-lg">
           <i class="fa fa-square-o fa-stack-2x"></i>
           <i class="fa fa-expand fa-stack-1x"></i>

data/app/views/layouts/modals/_kids_results.html.erb

@@ -9,7 +9,7 @@
             <div class="col-md-12">
               <div class="row">
                 <div class="col-md-12 submission-results">
-                  <% if @assignment.solved? %>
+                  <% if current_user? && @assignment.solved? %>
                     <%= render partial: 'exercise_solutions/kids_results',
                                  locals: {assignment: @assignment, guide_finished_by_solution: false} %>
                   <% end %>

data/config/initializers/session_store.rb

@@ -1 +1 @@
-Rails.application.config.session_store :cookie_store, key: '_mumuki_laboratory_session', same_site: Mumukit::Login::Mucookie.cookie_same_site
+Rails.application.config.session_store Mumukit::Login::Mucookie::Store, key: '_mumuki_laboratory_session', same_site: :lax

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

@@ -16,6 +16,8 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
     rescue_from Mumuki::Domain::BlockedForumError, with: :blocked_forum
     rescue_from Mumuki::Domain::DisabledError, with: :disabled
     rescue_from ActiveRecord::RecordInvalid, with: :bad_record
+    rescue_from Mumuki::Domain::UnpreparedOrganizationError, with: :unprepared_organization
+    rescue_from Mumuki::Domain::DisabledOrganizationError, with: :disabled_organization
   end
 
   def bad_record(exception)
@@ -51,7 +53,15 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
   end
 
   def gone
-    render_error 'gone', 410
+    render_error 'gone', 410, locals: { explanation: :gone_explanation }
+  end
+
+  def unprepared_organization
+    render_error 'forbidden', 403, locals: { explanation: :unprepared_organization_explanation }
+  end
+
+  def disabled_organization
+    render_error 'gone', 410, locals: { explanation: :disabled_organization_explanation }
   end
 
   def render_error(template, status, options={})

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

@@ -57,6 +57,7 @@ en:
   destroy_message: delete the message
   destroy: Destroy
   disabled_explanation: You are trying to visit a permamently disabled or deleted resource
+  disabled_organization_explanation: This path has already finished.
   discussion_updated: Discussion updated
   discussions: Discussions
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
@@ -121,6 +122,7 @@ en:
   let_us_know: please let us know!
   loading: Loading
   load_solution_into_console: Load your solution into the console
+  locked_content: 'This content will be unlocked when you finish previous chapters'
   male: Male
   manual_evaluation_pending: Thanks for submitting your solution! It will be revised by the course teachers soon
   message_count:
@@ -238,6 +240,7 @@ en:
   undo_upvote: Undo upvote
   unspecified: I'd rather not say
   unmeet_expectations: "Goals that weren't met"
+  unprepared_organization_explanation: This path hasn't started yet.
   unsubscribe: Unsubscribe
   unsubscribed_successfully: You have successfully unsubscribed from reminders.
   upload_solution: Upload Solution

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

@@ -64,6 +64,7 @@ es:
   destroy: Eliminar
   details: Detalles
   disabled_explanation: Estás intentando acceder a un recurso que fue deshabilitado o eliminado de forma permamente
+  disabled_organization_explanation: ¡Este recorrido ha finalizado!
   discussion_updated: Consulta actualizada
   discussions: Consultas
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tenés que seguir practicando.
@@ -98,7 +99,7 @@ es:
   format: Dar formato
   gender: Género
   go_to: 'Ir a %{organization}'
-  gone_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que ya no podés ver este contenido.
+  gone_explanation: Este contenido ya no está disponible.
   guide: Lección
   guide_created: Guía creada exitosamente
   guide_finished: ¡Terminaste %{guide}!
@@ -131,6 +132,7 @@ es:
   let_us_know: ¡Por favor avisanos!
   loading: Cargando
   load_solution_into_console: Cargar la solución en la consola
+  locked_content: 'Este contenido se desbloqueará cuando termines los capítulos anteriores'
   male: Hombre
   manual_evaluation_pending: ¡Gracias por enviar tu solución! Tus docentes la corregirán pronto
   message_count:
@@ -262,6 +264,7 @@ es:
   undo_upvote: No es útil
   unspecified: Prefiero no decirlo
   unmeet_expectations: Objetivos que no se cumplieron
+  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"

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

@@ -61,6 +61,7 @@ pt:
   destroy: Excluir
   details: Detalhes
   disabled_explanation: Você está tentando acessar um recurso que foi desativado ou removido permanentemente
+  disabled_organization_explanation: Este curso terminou!
   discussion_updated: Consulta actualizada
   discussions: Consultas
   download: Faça o download do que você fez
@@ -96,7 +97,7 @@ pt:
   gender: Gênero
   get_messages: Ver mensagens
   go_to: Vá para %{organization}
-  gone_explanation: Opa! Isto é o que é conhecido como %{error}, ou seja, você não pode mais ver esse conteúdo.
+  gone_explanation: Parece que você não pode mais acessar esse conteúdo.
   guide: Lição
   guide_created: Guia criado com sucesso
   guide_finished: Você terminou %{guide}!
@@ -127,6 +128,7 @@ pt:
   let_us_know: Por favor, avise-nos!
   loading: Carregando
   load_solution_into_console: Carregue a solução no console
+  locked_content: 'Este conteúdo será desbloqueado quando você terminar os capítulos anteriores'
   male: Masculino
   manual_evaluation_pending: Obrigado por enviar sua solução! Seus professores irão corrigi-lo em breve
   message_count:
@@ -250,6 +252,7 @@ pt:
   uncategorized: Não classificado
   unspecified: Eu preferiria não dizer
   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

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.5.2'
+    VERSION = '7.6.0'
   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: 20200527180729) do
+ActiveRecord::Schema.define(version: 20200608132959) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -298,6 +298,7 @@ ActiveRecord::Schema.define(version: 20200527180729) do
     t.text "settings", default: "{}", null: false
     t.text "theme", default: "{}", null: false
     t.text "profile", default: "{}", null: false
+    t.integer "progressive_display_lookahead"
     t.index ["book_id"], name: "index_organizations_on_book_id"
     t.index ["name"], name: "index_organizations_on_name", unique: true
   end

data/spec/features/disabled_organization_flow_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+feature 'disable user flow', organization_workspace: :test do
+  let!(:current_organization) { Organization.current }
+  let(:user) { create(:user) }
+
+  let!(:chapter) {
+    create(:chapter, lessons: [
+        create(:lesson, guide: create(:guide))]) }
+
+  let(:book) { current_organization.book }
+
+  before { reindex_current_organization! }
+
+  before { set_current_user! user }
+
+  scenario 'enabled organization' do
+    visit '/'
+
+    expect(page).to have_text('ム mumuki')
+    expect(page).to have_text(current_organization.book.name)
+    expect(user.reload.last_organization).to eq current_organization
+  end
+
+  context 'unprepared organization' do
+
+    before { current_organization.update! in_preparation_until: 2.minutes.since }
+
+    scenario 'visit /' do
+      visit '/'
+
+      expect(page).to_not have_text('ム mumuki')
+      expect(page).to_not have_text(current_organization.book.name)
+      expect(page).to have_text(I18n.t(:unprepared_organization_explanation))
+    end
+
+    scenario 'visit /user' do
+      visit '/test/user'
+
+      expect(page).to_not have_text('ム mumuki')
+      expect(page).to_not have_text(current_organization.book.name)
+      expect(page).to have_text(I18n.t(:unprepared_organization_explanation))
+    end
+
+  end
+
+  context 'disabled organization' do
+
+    before { current_organization.update! disabled_from: 2.minutes.ago }
+
+    scenario 'visit /' do
+      visit '/'
+
+      expect(page).to_not have_text('ム mumuki')
+      expect(page).to_not have_text(current_organization.book.name)
+      expect(page).to have_text(I18n.t(:disabled_organization_explanation))
+    end
+
+    scenario 'visit /user' do
+      visit '/test/user'
+
+      expect(page).to_not have_text('ム mumuki')
+      expect(page).to_not have_text(current_organization.book.name)
+      expect(page).to have_text(I18n.t(:disabled_organization_explanation))
+    end
+
+    end
+end
+

data/spec/features/exercise_flow_spec.rb

@@ -6,23 +6,23 @@ feature 'Exercise Flow', organization_workspace: :test do
   let(:haskell) { create(:haskell) }
   let(:gobstones) { create(:gobstones) }
 
-  let!(:problem_1) { build(:problem, name: 'Succ1', description: 'Description of Succ1', layout: :input_right, hint: 'lala') }
-  let!(:problem_2) { build(:problem, name: 'Succ2', description: 'Description of Succ2', layout: :input_right, editor: :hidden, language: gobstones) }
-  let!(:problem_3) { build(:problem, name: 'Succ3', description: 'Description of Succ3', layout: :input_right, editor: :upload, hint: 'lele') }
-  let!(:problem_4) { build(:problem, name: 'Succ4', description: 'Description of Succ4', layout: :input_bottom, extra: 'x = 2') }
-  let!(:problem_5) { build(:problem, name: 'Succ5', description: 'Description of Succ5', layout: :input_right, editor: :upload, hint: 'lele', language: gobstones) }
-  let!(:problem_6) { build(:problem, name: 'Succ6', description: 'Description of Succ6', layout: :input_right, editor: :hidden, language: haskell) }
-  let!(:problem_7) { build(:problem, name: 'Succ7', description: 'Description of Succ7', editor: :single_choice, choices: [{value: 'some choice', checked: true}]) }
-  let!(:playground_1) { build(:playground, name: 'Succ5', description: 'Description of Succ4', layout: :input_right) }
-  let!(:playground_2) { build(:playground, name: 'Succ6', description: 'Description of Succ4', layout: :input_right, extra: 'x = 4') }
+  let(:problem_1) { build(:problem, name: 'Succ1', description: 'Description of Succ1', layout: :input_right, hint: 'lala') }
+  let(:problem_2) { build(:problem, name: 'Succ2', description: 'Description of Succ2', layout: :input_right, editor: :hidden, language: gobstones) }
+  let(:problem_3) { build(:problem, name: 'Succ3', description: 'Description of Succ3', layout: :input_right, editor: :upload, hint: 'lele') }
+  let(:problem_4) { build(:problem, name: 'Succ4', description: 'Description of Succ4', layout: :input_bottom, extra: 'x = 2') }
+  let(:problem_5) { build(:problem, name: 'Succ5', description: 'Description of Succ5', layout: :input_right, editor: :upload, hint: 'lele', language: gobstones) }
+  let(:problem_6) { build(:problem, name: 'Succ6', description: 'Description of Succ6', layout: :input_right, editor: :hidden, language: haskell) }
+  let(:problem_7) { build(:problem, name: 'Succ7', description: 'Description of Succ7', editor: :single_choice, choices: [{value: 'some choice', checked: true}]) }
+  let(:playground_1) { build(:playground, name: 'Succ5', description: 'Description of Succ4', layout: :input_right) }
+  let(:playground_2) { build(:playground, name: 'Succ6', description: 'Description of Succ4', layout: :input_right, extra: 'x = 4') }
   let!(:reading) { build(:reading, name: 'Reading about Succ', description: 'Lets understand succ history') }
   let!(:exercise_not_in_path) { create :exercise }
-
+  let(:kids_problem) { build(:problem, name: 'Kids prob', description: 'Description of kids prob', layout: :input_kids, hint: 'lele', language: gobstones) }
 
   let!(:chapter) {
     create(:chapter, name: 'Functional Programming', lessons: [
       create(:lesson, name: 'getting-started', description: 'An awesome guide', language: haskell, exercises: [
-        problem_1, problem_2, problem_3, problem_4, reading, problem_5, problem_6, problem_7, playground_1, playground_2
+        problem_1, problem_2, problem_3, problem_4, reading, problem_5, problem_6, problem_7, playground_1, playground_2, kids_problem
       ])
     ]) }
 
@@ -61,6 +61,15 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('Description of Succ1')
     end
 
+    scenario 'visit kids exercise transparently' do
+      visit "/exercises/#{kids_problem.transparent_id}"
+
+      expect(page).to have_text('Kids prob')
+      expect(page).to_not have_text('Console')
+      expect(page).to_not have_text('Solution')
+      expect(page).to have_text('Description of kids prob')
+    end
+
     scenario 'visit exercise by id, upload layout' do
       visit "/exercises/#{problem_3.id}"