mumuki-laboratory 7.4.0 → 7.5.2

data/app/views/user_mailer/2nd_reminder.text.erb

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
 
 
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

data/app/views/user_mailer/3rd_reminder.html.erb

@@ -313,7 +313,7 @@
 
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
 
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>

data/app/views/user_mailer/3rd_reminder.text.erb

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
 
 
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

data/app/views/user_mailer/no_submissions_reminder.html.erb

@@ -313,7 +313,7 @@
 
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
 
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>

data/app/views/user_mailer/no_submissions_reminder.text.erb

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
 
 
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

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

@@ -1,7 +1,7 @@
 <%= form_for :user, url: update_user_path, method: :put do |f| %>
   <div class="row mu-tab-body">
     <div class="col-md-4 text-center">
-      <%= image_tag @user.image_url, size: '250x250', class: 'img-circle' %>
+      <%= image_tag @user.profile_picture, size: '250x250', class: 'img-circle' %>
     </div>
     <div class="col-md-8">
       <%= render partial: 'profile_fields', locals: {form: f} %>

data/lib/mumuki/laboratory/controllers.rb

@@ -2,6 +2,7 @@ module Mumuki::Laboratory::Controllers
 end
 
 require_relative './controllers/authorization'
+require_relative './controllers/disabling'
 require_relative './controllers/current_organization'
 require_relative './controllers/dynamic_errors'
 require_relative './controllers/notifications'

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

@@ -1,8 +1,4 @@
 module Mumuki::Laboratory::Controllers::Authorization
-  def from_sessions?
-    params['controller'] == 'login'
-  end
-
   def authorize_if_private!
     return if Organization.current.public? || from_sessions?
     authorize! :student

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

@@ -0,0 +1,5 @@
+module Mumuki::Laboratory::Controllers::Disabling
+  def ensure_user_enabled!
+    current_user.ensure_enabled! unless from_sessions?
+  end
+end

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

@@ -14,6 +14,7 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
     rescue_from Mumuki::Domain::UnauthorizedError, with: :unauthorized
     rescue_from Mumuki::Domain::GoneError, with: :gone
     rescue_from Mumuki::Domain::BlockedForumError, with: :blocked_forum
+    rescue_from Mumuki::Domain::DisabledError, with: :disabled
     rescue_from ActiveRecord::RecordInvalid, with: :bad_record
   end
 
@@ -41,6 +42,10 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
     render_error 'forbidden', 403, locals: { explanation: :forbidden_explanation }, error_message: message
   end
 
+  def disabled
+    render_error 'forbidden', 403, locals: { explanation: :disabled_explanation }
+  end
+
   def blocked_forum
     render_error 'forbidden', 403, locals: { explanation: :blocked_forum_explanation }
   end

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

@@ -10,22 +10,25 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
   def render_results_json(assignment, results = {})
     if assignment.input_kids?
       merge_kids_specific_renders(assignment, results)
-      render_results = 'exercise_solutions/kids_results'
+      layout = 'exercise_solutions/kids_results'
     else
-      render_results = 'exercise_solutions/results'
+      layout = 'exercise_solutions/results'
     end
 
-    render json: results.merge(progress_json).merge(
-        html: render_results_html(render_results, assignment),
-        remaining_attempts_html: remaining_attempts_text(assignment))
+    render json: results
+                  .merge(progress_json)
+                  .merge(
+                    html: render_results(layout, assignment),
+                    remaining_attempts_html: remaining_attempts_text(assignment))
   end
 
   def merge_kids_specific_renders(assignment, results)
     results.merge!(
-        button_html: render_results_button_html(assignment),
-        title_html: render_results_title_html(assignment),
-        expectations_html: render_results_expectations_html(assignment),
-        test_results: assignment.test_results)
+        button_html: render_results_button(assignment),
+        title_html: render_results_title(assignment),
+        expectations: assignment.affable_expectation_results,
+        tips: assignment.affable_tips,
+        test_results: assignment.affable_test_results)
   end
 
   def progress_json
@@ -35,26 +38,21 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
     }
   end
 
-  def render_results_html(results_partial, assignment)
+  def render_results(results_partial, assignment)
     render_to_string partial: results_partial,
                      locals: {assignment: assignment}
   end
 
-  def render_results_title_html(assignment)
+  def render_results_title(assignment)
     render_to_string partial: 'exercise_solutions/results_title',
                      locals: {contextualization: assignment}
   end
 
-  def render_results_button_html(assignment)
+  def render_results_button(assignment)
     render_to_string partial: 'exercise_solutions/kids_results_button',
                      locals: {assignment: assignment}
   end
 
-  def render_results_expectations_html(assignment)
-    render_to_string partial: 'exercise_solutions/expectations',
-                     locals: {assignment: assignment}
-  end
-
   def guide_finished_by_solution?
     !@guide_previously_done && @exercise.guide_done_for?(current_user)
   end

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

@@ -40,6 +40,7 @@ en:
   created_at_desc: Newest
   comment: Comment
   confirm: Confirm
+  confirm_reset: You are about to restart your exercise. Do you want to proceed?
   confirm_restart: You are about to delete your progress for this guide. Do you want to proceed?
   console: Console
   contact_administrator: 'If you think this is not supposed to happen, please contact the admin: %{link}'
@@ -53,8 +54,9 @@ en:
   created_at: Created at
   date: Date
   description: Description
-  destroy: Destroy
   destroy_message: delete the message
+  destroy: Destroy
+  disabled_explanation: You are trying to visit a permamently disabled or deleted resource
   discussion_updated: Discussion updated
   discussions: Discussions
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
@@ -87,6 +89,7 @@ en:
   finish: Finish
   first_name: First Name
   forbidden_explanation: You are not allowed to see this content.
+  format: Format
   gender: Gender
   go_to: 'Go to %{organization}'
   gone_explanation: This content is no longer available.
@@ -192,6 +195,10 @@ en:
   sign_in_action: sign in
   sign_out: Sign Out
   sign_up_date: User since
+  skipped: You are doing very well, so you've passed this exercise.
+  skipped_congratulations: Well done!
+  skipped_description: You are doing very well, so you've passed this exercise.
+  skipped_solve_anyway: Solve anyway
   solution: Solution
   solved: Solved
   solved_count: '%{count} solved'
@@ -220,7 +227,6 @@ en:
   tell_us_if_our_error: If you think this is our fault, %{issues}
   terms_and_conditions: Terms and conditions
   test_results: Test results
-  test_results: Tests results
   time_ago: "%{time} ago"
   time_left: You have
   title: Title
@@ -230,6 +236,7 @@ en:
   to_solved: Mark as solved
   unauthorized_explanation: You have no permissions for this content. Maybe you logged in with another account.
   undo_upvote: Undo upvote
+  unspecified: I'd rather not say
   unmeet_expectations: "Goals that weren't met"
   unsubscribe: Unsubscribe
   unsubscribed_successfully: You have successfully unsubscribed from reminders.

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

@@ -43,6 +43,7 @@ es:
   created_at_desc: Nuevas
   comment: Comentar
   confirm: Confirmar
+  confirm_reset: Estás por reiniciar tu ejercicio. ¿Querés continuar?
   confirm_restart: Estás por borrar tu progreso en esta guía. ¿Querés continuar?
   console: Consola
   contact_administrator: 'Si pensás que es un error, comunicate con la persona que administra esta organización: %{link}'
@@ -59,9 +60,10 @@ es:
   day: Día
   days: Días
   description: Descripción
-  destroy: Eliminar
   destroy_message: eliminar el mensaje
+  destroy: Eliminar
   details: Detalles
+  disabled_explanation: Estás intentando acceder a un recurso que fue deshabilitado o eliminado de forma permamente
   discussion_updated: Consulta actualizada
   discussions: Consultas
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tenés que seguir practicando.
@@ -93,6 +95,7 @@ es:
   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?
+  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.
@@ -211,6 +214,10 @@ es:
   sign_in_action: iniciar sesión
   sign_out: Cerrar Sesión
   sign_up_date: Usuario desde
+  skipped: Venís aprendiendo muy bien, por lo que aprobaste este ejercicio.
+  skipped_congratulations: ¡Bien hecho!
+  skipped_description: Venís aprendiendo muy bien, por lo que aprobaste este ejercicio.
+  skipped_solve_anyway: Resolver de todos modos
   solution: Solución
   solved: Resuelta
   solved_count:
@@ -253,6 +260,7 @@ es:
   unauthorized_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que no iniciaste sesión.
   uncategorized: No categorizado
   undo_upvote: No es útil
+  unspecified: Prefiero no decirlo
   unmeet_expectations: Objetivos que no se cumplieron
   unsubscribe: Dejar de recibir notificaciones
   unsubscribed_successfully: Te desuscribiste exitosamente de los recordatorios.

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

@@ -38,6 +38,7 @@ pt:
   closed_count: '%{count} fechado'
   comment: Comentar
   confirm: Confirme
+  confirm_reset: Você está prestes a reiniciar seu exercício. Você quer continuar?
   confirm_restart: Você está prestes a apagar o seu progresso neste guia. Você quer continuar?
   console: Consola
   contact_administrator: Se você acha que é um erro, entre em contato com a pessoa que gerencia essa organização %{link}
@@ -56,9 +57,10 @@ pt:
   day: Dia
   days: Dias
   description: Descrição
-  destroy: Excluir
   destroy_message: excluir a mensagem
+  destroy: Excluir
   details: Detalhes
+  disabled_explanation: Você está tentando acessar um recurso que foi desativado ou removido permanentemente
   discussion_updated: Consulta actualizada
   discussions: Consultas
   download: Faça o download do que você fez
@@ -89,6 +91,7 @@ pt:
   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?
+  format: Formato
   fullscreen: Tela completa
   gender: Gênero
   get_messages: Ver mensagens
@@ -204,6 +207,10 @@ pt:
   sign_in_action: iniciar sessão
   sign_out: Fechar Sessão
   sign_up_date: Usuário de
+  skipped: Você está aprendendo muito bem e passou neste exercício.
+  skipped_congratulations: Bem feito!
+  skipped_description: Você está aprendendo muito bem e passou neste exercício.
+  skipped_solve_anyway: Resolver mesmo assim
   solution: Solução
   solved: Resolvido
   solved_count: '%{count} resolvido'
@@ -241,6 +248,7 @@ pt:
   to_solved: Marcar como resolvida
   unauthorized_explanation: Opa! Isso é o que é conhecido como %{error}, ou seja, você não fez logon.
   uncategorized: Não classificado
+  unspecified: Eu preferiria não dizer
   unmeet_expectations: Objetivos que não foram atendidos
   unsubscribe: Cancelar subscrição
   upload_solution: Carregar solução

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.4.0'
+    VERSION = '7.5.2'
   end
 end

data/spec/controllers/exercise_solutions_controller_spec.rb

@@ -16,23 +16,37 @@ describe ExerciseSolutionsController, organization_workspace: :test do
     post :create, params: { exercise_id: problem.id, solution: { content: 'asd' } }
   end
 
+
   describe 'when simple content is sent' do
-    before { post_problem(problem) }
+    context 'for a non-kids exercise' do
+      before { post_problem(problem) }
+      let(:assignment) { Assignment.last }
 
-    it { expect(response.status).to eq 200 }
-    it { expect(Assignment.last.solution).to eq('asd')}
+      context 'without client-side interpolations' do
+        it { expect(response.status).to eq 200 }
+        it { expect(assignment.solution).to eq('asd')}
 
-    context 'for a non-kids exercise' do
-      it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
-                                            except: [:class_for_progress_list_item, :html, :remaining_attempts_html]) }
+        it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
+                                              except: [:class_for_progress_list_item, :html, :remaining_attempts_html]) }
 
-      it 'does not include kids specific renders' do
-        body = JSON.parse(response.body)
 
-        expect(body.key?('button_html')).to be false
-        expect(body.key?('title_html')).to be false
-        expect(body.key?('expectations_html')).to be false
-        expect(body.key?('test_results')).to be false
+        it 'does not include kids specific renders' do
+          body = JSON.parse(response.body)
+
+          expect(body.key?('button_html')).to be false
+          expect(body.key?('title_html')).to be false
+          expect(body.key?('expectations_html')).to be false
+          expect(body.key?('test_results')).to be false
+        end
+      end
+
+      context 'with client-side interpolations' do
+        let(:problem) { create(:problem, extra: interpolation) }
+        let(:interpolation) { %q{function longitud(unString) /*<elipsis-for-student@*/ {
+          return unString.length;
+        } /*@elipsis-for-student>*/} }
+
+        it { expect(assignment.extra.strip).to eq interpolation.strip }
       end
     end
 
@@ -41,15 +55,16 @@ describe ExerciseSolutionsController, organization_workspace: :test do
 
       it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
                                             except: [:class_for_progress_list_item, :html, :remaining_attempts_html,
-                                                     :title_html, :button_html, :expectations_html, :test_results]) }
+                                                     :title_html, :button_html, :expectations, :test_results, :tips]) }
 
       it 'includes kids specific renders' do
         body = JSON.parse(response.body)
 
         expect(body.key?('button_html')).to be true
         expect(body.key?('title_html')).to be true
-        expect(body.key?('expectations_html')).to be true
+        expect(body.key?('expectations')).to be true
         expect(body.key?('test_results')).to be true
+        expect(body.key?('tips')).to be true
       end
     end
   end

data/spec/controllers/users_api_controller_spec.rb

@@ -35,6 +35,7 @@ describe Api::UsersController, type: :controller, organization_workspace: :base
     it { expect(User.count).to eq 2 }
     it { expect(User.last.student? 'test/_').to be true }
     it { expect(User.last.uid).to eq 'foo@bar.com' }
+    it { expect(User.last.verified_first_name).to eq 'foo' }
   end
 
 

data/spec/controllers/users_controller_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe UsersController, type: :controller, organization_workspace: :test do
+  let(:user) { create(:user) }
+
+  let(:user_json) do
+    {
+      first_name: 'foo',
+      last_name: 'bar',
+      email: 'foo@bar.com'
+    }
+  end
+
+  context 'put' do
+    before { set_current_user! user }
+    before { put :update, body: { user: user_json }.to_json, as: :json }
+
+    it { expect(User.last.first_name).to eq 'foo' }
+    it { expect(User.last.verified_first_name).to be_nil }
+  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: 20200312181842) do
+ActiveRecord::Schema.define(version: 20200527180729) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -51,6 +51,11 @@ ActiveRecord::Schema.define(version: 20200312181842) do
     t.index ["submitter_id"], name: "index_assignments_on_submitter_id"
   end
 
+  create_table "avatars", force: :cascade do |t|
+    t.string "image_url"
+    t.string "description"
+  end
+
   create_table "books", id: :serial, force: :cascade do |t|
     t.string "name"
     t.datetime "created_at"
@@ -367,6 +372,9 @@ ActiveRecord::Schema.define(version: 20200312181842) do
     t.integer "gender"
     t.string "verified_first_name"
     t.string "verified_last_name"
+    t.bigint "avatar_id"
+    t.datetime "disabled_at"
+    t.index ["disabled_at"], name: "index_users_on_disabled_at"
     t.index ["last_organization_id"], name: "index_users_on_last_organization_id"
     t.index ["uid"], name: "index_users_on_uid", unique: true
   end