mumuki-laboratory 7.7.6 → 7.8.0

data/app/mailers/user_mailer.rb

@@ -1,24 +1,37 @@
 class UserMailer < ApplicationMailer
+  def welcome_email(user, organization)
+    with_locale(user, organization) do
+      organization_name = organization.display_name || t(:your_new_organization)
+      build_email t(:welcome, name: organization_name), { inline: organization.welcome_email_template }
+    end
+  end
 
   def we_miss_you_reminder(user, cycles)
-    send_reminder! user, :we_miss_you, "#{cycles.ordinalize}_reminder"
+    with_locale(user) do
+      build_email t(:we_miss_you), "#{cycles.ordinalize}_reminder"
+    end
   end
 
   def no_submissions_reminder(user)
-    send_reminder! user, :start_using_mumuki, "no_submissions_reminder"
+    with_locale(user) do
+      build_email t(:start_using_mumuki), 'no_submissions_reminder'
+    end
   end
 
-  private
-
-  def send_reminder!(user, subject, template_name)
+  def with_locale(user, organization = nil, &block)
     @user = user
     @unsubscribe_code = User.unsubscription_verifier.generate(user.id)
-    @organization = user.last_organization
+    @organization = organization || user.last_organization
 
-    I18n.with_locale(@organization.locale) do
-      mail to: user.email,
-           subject: t(subject),
-           template_name: template_name
-    end
+    I18n.with_locale(@organization.locale, &block)
+  end
+
+  private
+
+  def build_email(subject, template)
+    mail to: @user.email,
+         subject: subject,
+         content_type: 'text/html',
+         body: render(template)
   end
 end

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

@@ -36,7 +36,7 @@
     <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 %>%>
+        <div class="text-box" <%= 'aria-label=""' unless enabled %>>
           <%= it.description_teaser_html %>
         </div>
       </div>

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

@@ -45,6 +45,8 @@
 <%= render_exercise_input_layout(@exercise) %>
 
 <%= hidden_field_tag default_content_tag_id(@exercise), @default_content %>
+<%= hidden_field_tag "mu-exercise-id", @exercise.id %>
+<%= hidden_field_tag "mu-exercise-layout", @exercise.layout %>
 
 <div style="display: none" id="processing-template">
   <div class="bs-callout bs-callout-info">

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

@@ -11,8 +11,7 @@
   <%= open_graph_tags subject %>
   <%= assets_include_tags %>
   <%= csrf_meta_tags %>
-  <%= locale_tags %>
-  <%= version_tags %>
+  <%= globals_tags %>
 
   <%= login_form.header_html %>
 </head>

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

@@ -1 +1 @@
-<% content.completion_percentage_for(current_user) %>
+<% content.completion_percentage_for(current_user) if current_user? %>

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

@@ -1,6 +1,12 @@
 <div class="progress-list-flex">
   <% guide.exercises.each do |e| %>
-    <a <%= turbolinks_enable_for e %> href="<%= exercise_path(e)%>" aria-label="<%= e.navigable_name %>" title="<%= e.navigable_name %>" class="<%= class_for_progress_list_item(e, e == actual)%>">
+    <a
+      <%= turbolinks_enable_for e %>
+      href="<%= exercise_path(e)%>"
+      aria-label="<%= e.navigable_name %>"
+      title="<%= e.navigable_name %>"
+      data-mu-exercise-id="<%= e.id %>"
+      class="<%= class_for_progress_list_item(e, e == actual)%>">
     </a>
   <% end %>
 </div>

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

@@ -17,7 +17,7 @@
         <% end %>
       </div>
       <div class="mu-navbar-avatar">
-        <% if current_user? %>
+        <% if current_logged_user? %>
           <div class="dropdown">
             <span>
               <a class="notifications-box <%= has_notifications? ? '' : 'notifications-box-empty' %>" href=<%= "#{user_notifications_path}" %>>

data/lib/mumuki/laboratory/controllers.rb

@@ -7,6 +7,7 @@ require_relative './controllers/current_organization'
 require_relative './controllers/dynamic_errors'
 require_relative './controllers/notifications'
 require_relative './controllers/embedded_mode'
+require_relative './controllers/incognito_mode'
 require_relative './controllers/nested_in_exercise'
 require_relative './controllers/results_rendering'
 require_relative './controllers/exercise_seed'

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

@@ -0,0 +1,28 @@
+module Mumuki::Laboratory::Controllers::IncognitoMode
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :current_incognito_user?,
+                  :current_logged_user?
+  end
+
+  def current_user?
+    super || incognito_mode_enabled?
+  end
+
+  def current_user
+    @current_user ||= incognito_mode_enabled? ? (super rescue Mumuki::Domain::Incognito) : super
+  end
+
+  def current_incognito_user?
+    current_user? && current_user.incognito?
+  end
+
+  def current_logged_user?
+    current_user? && !current_user.incognito?
+  end
+
+  def incognito_mode_enabled?
+    !from_sessions? && Organization.current.incognito_mode_enabled?
+  end
+end

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

@@ -93,7 +93,9 @@ en:
   first_name: First Name
   forbidden_explanation: You are not allowed to see this content.
   format: Format
+  fullscreen: "Fullscreen"
   gender: Gender
+  get_messages: "View messages"
   go_to: 'Go to %{organization}'
   gone_explanation: This content is no longer available.
   guide: Guide
@@ -162,6 +164,7 @@ en:
   not_in_any_organizations: It seems you aren't in any organizations yet!
   notify_problem_with_exercise: Report a bug
   office: Office
+  only_landscape_support: Please, rotate your tablet or cellphone to continue practicing
   opened: Open
   opened_count: '%{count} opened'
   other: Other
@@ -230,6 +233,7 @@ en:
   submissions_for: Submissions for %{exercise}
   subscribe: Subscribe
   tag: Tags
+  task: Task
   teacher_info: Information for teachers
   tell_us_how: Please tell us how this happened!
   tell_us_if_our_error: If you think this is our fault, %{issues}
@@ -260,11 +264,9 @@ en:
   view_details: View details
   want_permissions: The next user requires permissions
   we_miss_you: We miss you!
+  welcome: Welcome to %{name}!
   working: "Working"
   wrong_answer: The answer is wrong
   you_must_sign_in_before_submitting: You must sign in before submitting your solutions
   you_never_submitted_solutions: It seems that you've never submitted solutions since you created your account.
-  fullscreen: "Fullscreen"
-  get_messages: "View messages"
-  task: Task
-  only_landscape_support: Please, rotate your tablet or cellphone to continue practicing
+  your_new_organization: your new organization

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

@@ -99,7 +99,9 @@ es:
   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?
   format: Dar formato
+  fullscreen: "Pantalla completa"
   gender: Género
+  get_messages: "Ver mensajes"
   go_to: 'Ir a %{organization}'
   gone_explanation: Este contenido ya no está disponible.
   guide: Lección
@@ -176,6 +178,7 @@ es:
   not_in_any_organizations: ¡Parece que no estás en ninguna organización todavía!
   notify_problem_with_exercise: Reportá un bug
   office: Secretaría
+  only_landscape_support: Por favor, rotá tu tablet o celular para realizar ejercicios
   opened: Abierta
   opened_count:
     one: '1 abierta'
@@ -253,6 +256,7 @@ es:
   submissions_count: Soluciones
   submissions_for: Soluciones para %{exercise}
   tag: Etiquetas
+  task: Consigna
   teacher_info: Información para docentes
   tell_us_how: ¡Contanos cómo te pasó esto!
   tell_us_if_our_error: Si pensás que es un error nuestro, %{issues}
@@ -284,6 +288,7 @@ es:
   view_details: Ver detalles
   want_permissions: El siguiente usuario requiere permisos
   we_miss_you: ¡Te extrañamos!
+  welcome: Te damos la bienvenida a %{name}!
   will_paginate:
     previous_label: "&#8592; Anterior"
     next_label: "Siguiente &#8594;"
@@ -292,7 +297,4 @@ es:
   wrong_answer: La respuesta no es correcta
   you_must_sign_in_before_submitting: Tenés que iniciar sesión antes de empezar a enviar tus soluciones
   you_never_submitted_solutions: Parece que nunca enviaste soluciones desde que creaste tu cuenta.
-  fullscreen: "Pantalla completa"
-  get_messages: "Ver mensajes"
-  task: Consigna
-  only_landscape_support: Por favor, rotá tu tablet o celular para realizar ejercicios
+  your_new_organization: tu nueva organización

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

@@ -171,6 +171,7 @@ pt:
   not_in_any_organizations: Parece que você ainda não está em nenhuma organização!
   notify_problem_with_exercise: Relatar um erro
   office: Secretariado
+  only_landscape_support: Por favor, gire seu tablet ou celular para realizar exercícios
   opened: Aberto
   opened_count: '%{count} aberto'
   organizations: Organizações
@@ -240,6 +241,7 @@ pt:
   submissions_for: Soluções para %{exercise}
   subscribe: se inscrever
   tag: Etiquetas
+  task: Tarefa
   teacher_info: Informação para professores
   tell_us_how: Conte-nos como isso aconteceu com você!
   tell_us_if_our_error: Se você acha que é nosso erro, %{issues}
@@ -265,8 +267,8 @@ pt:
   username: Nome de usuário
   view_details: Ver detalhes
   want_permissions: O próximo usuário requer permissões
+  welcome: Convidamos você a {name}!
   working: Processamento
   wrong_answer: A resposta não é correta
   you_must_sign_in_before_submitting: Você deve fazer o login antes de começar a enviar suas soluções
-  task: Tarefa
-  only_landscape_support: Por favor, gire seu tablet ou celular para realizar exercícios
+  your_new_organization: sua nova organização

data/lib/mumuki/laboratory/version.rb

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

data/spec/features/chapter_spec.rb

@@ -50,4 +50,21 @@ feature 'Chapters flow', organization_workspace: :test do
       expect(page).to have_text('endofunctors')
     end
   end
+
+  context 'incognito user' do
+    before { Organization.current.update! incognito_mode_enabled: true }
+    scenario 'show chapter, no appendix' do
+      visit "/chapters/#{chapter.id}"
+
+      expect(page).to have_text('Functional Programming')
+      expect(page).to have_text('The Basic Values')
+
+      expect(page).to have_text('Monads and Functors')
+      expect(page).to have_text('The Maybe Functor')
+
+      expect(page).to_not have_text('Appendix')
+
+      expect(page).to have_text('Sign in')
+    end
+  end
 end

data/spec/features/exercise_flow_spec.rb

@@ -13,8 +13,8 @@ feature 'Exercise Flow', organization_workspace: :test do
   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(:playground_1) { build(:playground, name: 'Succ5', description: 'Description of Succ4', layout: :input_bottom) }
+  let(:playground_2) { build(:playground, name: 'Succ6', description: 'Description of Succ4', layout: :input_bottom, 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_primary, hint: 'lele', language: gobstones) }
@@ -129,6 +129,12 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('Solution')
       expect(page).to have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page).to have_selector('#mu-exercise-id', )
+      expect(page).to have_selector('#mu-exercise-layout')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(problem_1.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')
     end
 
     scenario 'visit exercise by id, hidden layout, no hint, not queriable language' do
@@ -142,6 +148,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to_not have_text('Solution')
       expect(page).to_not have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(problem_2.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')
     end
 
     scenario 'visit exercise by id, hidden layout, no hint, queriable language' do
@@ -152,6 +161,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to_not have_text('Solution')
       expect(page).to_not have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(problem_6.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')
     end
 
 
@@ -163,6 +175,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('Solution')
       expect(page).to have_text('need a hint?')
       expect(page).to have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(problem_3.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')
     end
 
     scenario 'visit exercise by id, upload layout, not queriable language' do
@@ -174,6 +189,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_selector('.upload')
       expect(problem_5.language.extension).to eq('gbs')
       expect(page.find("//div[@class = 'form-group']/input")['accept']).to eq(".gbs")
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(problem_5.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_right')
     end
 
     scenario 'visit exercise by id, input_bottom layout, extra, no hint' do
@@ -185,6 +203,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('Solution')
       expect(page).to_not have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(problem_4.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_bottom')
     end
 
     scenario 'visit playground by id, no extra, no hint' do
@@ -195,6 +216,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to_not have_text('Solution')
       expect(page).to_not have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(playground_1.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_bottom')
     end
 
     scenario 'visit playground by id, with extra, no hint' do
@@ -206,6 +230,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to_not have_text('need a hint?')
       expect(page).to have_text('x = 4')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(playground_2.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_bottom')
     end
 
     scenario 'visit inner reading by id' do
@@ -218,6 +245,9 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to_not have_text('Solution')
       expect(page).to_not have_text('need a hint?')
       expect(page).to_not have_selector('.upload')
+
+      expect(page.find("#mu-exercise-id")['value']).to eq(reading.id.to_s)
+      expect(page.find("#mu-exercise-layout")['value']).to eq('input_bottom')
     end
 
     scenario 'visit solved choices exercise' do
@@ -246,4 +276,19 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_xpath("//a[@title='Edit']")
     end
   end
+
+  context 'incognito user' do
+    before { Organization.current.update! incognito_mode_enabled: true }
+
+    scenario 'visit exercise transparently' do
+      visit "/exercises/#{problem_1.transparent_id}"
+
+      expect(page).to have_text('Succ1')
+      expect(page).to have_text('Console')
+      expect(page).to have_text('need a hint?')
+      expect(page).to have_text('Description of Succ1')
+
+      expect(page).to have_text('Sign in')
+    end
+  end
 end

data/spec/features/home_public_flow_spec.rb

@@ -91,4 +91,20 @@ feature 'public org', organization_workspace: :test do
       expect(user.reload.last_organization).to eq current_organization
     end
   end
+
+  context 'incognito user' do
+    before { current_organization.update! incognito_mode_enabled: true }
+    scenario 'from inside' do
+      Capybara.current_session.driver.header 'Referer', 'http://google.com'
+
+      visit '/'
+
+      expect(page).to have_text('ム mumuki')
+      expect(page).to have_text('First Steps')
+      expect(page).to have_selector('.chapter', text: 'Functional Programming')
+      expect(page).to have_text(current_organization.book.name)
+
+      expect(page).to have_text('Sign in')
+    end
+  end
 end