mumuki-laboratory 8.0.0 → 8.1.0

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

@@ -16,3 +16,15 @@
   <% end %>
 </div>
 
+<% if @user&.has_role_terms_to_accept? %>
+  <div class="terms-acceptance">
+    <%= form_for :user, url: terms_user_path, method: :post  do |f| %>
+      <span class="terms-acceptance-checkbox">
+        <%= f.check_box :terms_of_service, required: true, onInvalid: "this.setCustomValidity('#{t(:terms_and_conditions_must_be_accepted)}')", onChange: "this.setCustomValidity(validity.valueMissing ? '#{t(:terms_and_conditions_must_be_accepted)}' : '')" %>
+        <%= t(:accept_terms) %>
+      </span>
+      <%= f.submit t(:accept), class: 'btn btn-success terms-acceptance-btn' %>
+    <% end %>
+  </div>
+<% end %>
+

data/config/routes.rb

@@ -52,11 +52,15 @@ Rails.application.routes.draw do
     resources :complements, only: :show
     resources :exams, only: :show
 
-    # All users
-    resource :user, only: [:show, :edit]
-    get '/user/terms' => 'users#terms'
-
     # Current user
+    resource :user, only: [:show, :edit, :update] do
+      get :terms
+      post :terms, to: 'users#accept_profile_terms'
+
+      # Notification subscriptions
+      get :unsubscribe
+    end
+
     resources :messages, only: [:index, :create]
     get '/messages/errors' => 'messages#errors'
 
@@ -69,10 +73,6 @@ Rails.application.routes.draw do
     get '/join/:code' => 'invitations#show', as: :invitation
     post '/join/:code' => 'invitations#join'
 
-    # Notification subscriptions
-    get '/user/unsubscribe' => 'users#unsubscribe'
-    put '/user' => 'users#update', as: :update_user
-
     # Route for reading messages
     post '/messages/read_messages/:exercise_id' => 'messages#read_messages', as: :read_messages
 

data/lib/mumuki/laboratory.rb

@@ -31,12 +31,25 @@ end
 
 module Mumukit::Platform::OrganizationMapping::Path
   class << self
-    patch :organization_name do |request, domain, hyper|
-      name = hyper.(request, domain)
-      if %w(auth login logout).include? name
-        'base'
+    alias_method :__organization_name__, :organization_name
+    def in_actual_organization?(request, domain = nil)
+      actual_organization_name(request, domain).present?
+    end
+
+    def actual_organization_name(request, domain)
+      name = __organization_name__(request, domain)
+      name unless %w(auth login logout).include? name
+    end
+
+    def organization_name(request, domain)
+      actual_organization_name(request, domain) || 'base'
+    end
+
+    patch :inorganic_path_for do |request, hyper|
+      if in_actual_organization?(request)
+        hyper.call
       else
-        name
+        path_for(request)
       end
     end
   end

data/lib/mumuki/laboratory/controllers.rb

@@ -2,12 +2,14 @@ module Mumuki::Laboratory::Controllers
 end
 
 require_relative './controllers/authorization'
+require_relative './controllers/action_redirector'
 require_relative './controllers/disabling'
 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/immersive_navigation'
 require_relative './controllers/nested_in_exercise'
 require_relative './controllers/results_rendering'
 require_relative './controllers/exercise_seed'

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

@@ -0,0 +1,21 @@
+module Mumuki::Laboratory::Controllers::ActionRedirector
+  def save_location_before!(action)
+    session[redirection_variable_for(action)] = origin
+  end
+
+  def redirect_after!(action, fallback_location: root_path)
+    redirection_variable = redirection_variable_for(action)
+    destination = session.delete(redirection_variable).presence
+    redirect_to(destination || fallback_location)
+  end
+
+  private
+
+  def redirection_variable_for(action)
+    "redirect_after_#{action}"
+  end
+
+  def origin
+    Addressable::URI.heuristic_parse(request.path).to_s
+  end
+end

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

@@ -0,0 +1,7 @@
+module Mumuki::Laboratory::Controllers::ImmersiveNavigation
+  extend ActiveSupport::Concern
+
+  def immersive_subject
+    subject.navigable_content_in(current_immersive_context)
+  end
+end

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

@@ -29,6 +29,7 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
         title_html: render_results_title(assignment),
         expectations: assignment.affable_expectation_results,
         tips: assignment.affable_tips,
+        level_up_html: render_results('exercise_solutions/kids_level_up', assignment),
         test_results: assignment.sanitized_affable_test_results) # these results could include escaped characters so they should be rendered as HTML to display properly
   end
 

data/lib/mumuki/laboratory/events/events.rb

@@ -1,15 +1,6 @@
 Mumukit::Nuntius::EventConsumer.handle do
-
   # Emitted by assigment manual evaluation in classroom
   event 'AssignmentManuallyEvaluated' do |payload|
     Assignment.evaluate_manually! payload.deep_symbolize_keys[:assignment]
   end
-
-  [Book, Topic, Guide].each do |it|
-    event "#{it.name}Changed" do |data|
-      Mumukit::Sync::Syncer.new(
-        Mumukit::Sync::Store::Bibliotheca.new(
-          Mumukit::Platform.bibliotheca_bridge)).locate_and_import! it, data[:slug]
-    end
-  end
 end

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

@@ -95,6 +95,7 @@ en:
   exercise_number: Exercise %{number}
   exercise_success_rate: Exercises success rate
   exit: Exit
+  exp_points: experience points.
   expectations: Expectations
   expected_state: Expected board
   explain_redirect: You have registered in another organization
@@ -145,6 +146,8 @@ en:
   lessons: Lessons
   lesson_number: Lesson %{number}
   let_us_know: please let us know!
+  level: Level
+  level_up: Level up!
   loading: Loading
   load_solution_into_console: Load your solution into the console
   locked_content: 'This content will be unlocked when you finish previous chapters'
@@ -233,6 +236,7 @@ en:
   solved: Solved
   solved_count: '%{count} solved'
   solve_doubts: Solve other's doubts
+  solve_more_exercises_to_level_up: Solve <span>number</span> more exercises to advance to the next level.
   solve_your_doubts: Solve your doubts
   solve_your_doubts_teaser: Do you have any doubts?
   something_went_wrong: Something went wrong!
@@ -289,6 +293,7 @@ en:
   working: "Working"
   wrong_answer: The answer is wrong
   years: years old
+  you_earned: You earned
   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.
   your_new_organization: your new organization

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

@@ -93,6 +93,7 @@ es-CL:
   exercise_success_rate: Tasa de éxito en ejercicios
   exercises: Ejercicios
   exit: Salir
+  exp_points: puntos de experiencia.
   expectations: Objetivos
   expected_state: Tablero esperado
   explain_redirect: Notamos que te registraste en otra organización.
@@ -139,6 +140,8 @@ es-CL:
   lessons: Lecciones
   lesson_number: Lección %{number}
   let_us_know: ¡Por favor avísanos!
+  level: Nivel
+  level_up: ¡Subiste de nivel!
   loading: Cargando
   load_solution_into_console: Cargar la solución en la consola
   locked_content: 'Éste contenido se desbloqueará cuando termines los capítulos anteriores'
@@ -235,6 +238,7 @@ es-CL:
     other: '%{count} resueltas'
   solved_exercises: Ejercicios Resueltos
   solve_doubts: Resuelve consultas
+  solve_more_exercises_to_level_up: Resuelve <span>number</span> ejercicios más para pasar al siguiente nivel.
   solve_your_doubts: Consulta tus dudas
   solve_your_doubts_teaser: ¿Tienes alguna consulta?
   something_went_wrong: ¡Ups!, algo no anduvo bien...
@@ -294,5 +298,6 @@ es-CL:
     page_gap: "&hellip;"
   working: "Procesando"
   wrong_answer: La respuesta no es correcta
+  you_earned: Ganaste
   you_must_sign_in_before_submitting: Tienes 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.

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

@@ -101,6 +101,7 @@ es:
   exercise_success_rate: Tasa de éxito en ejercicios
   exercises: Ejercicios
   exit: Salir
+  exp_points: puntos de experiencia.
   expectations: Objetivos
   expected_state: Tablero esperado
   explain_redirect: Notamos que te registraste en otra organización.
@@ -155,6 +156,8 @@ es:
   lessons: Lecciones
   lesson_number: Lección %{number}
   let_us_know: ¡Por favor avisanos!
+  level: Nivel
+  level_up: ¡Subiste de nivel!
   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'
@@ -255,6 +258,7 @@ es:
     other: '%{count} resueltas'
   solved_exercises: Ejercicios Resueltos
   solve_doubts: Resolvé consultas
+  solve_more_exercises_to_level_up: Resolvé <span>number</span> ejercicios más para pasar al siguiente nivel.
   solve_your_doubts: Consultá tus dudas
   solve_your_doubts_teaser: ¿Tenés alguna consulta?
   something_went_wrong: ¡Ups!, algo no anduvo bien...
@@ -317,6 +321,7 @@ es:
   working: "Procesando"
   wrong_answer: La respuesta no es correcta
   years: años
+  you_earned: Ganaste
   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.
   your_new_organization: tu nueva organización

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

@@ -97,6 +97,7 @@ pt:
   exercise_success_rate: Taxa de sucesso em exercícios
   exercises: Exercícios
   exit: Sair
+  exp_points: pontos de experiência.
   expectations: Objetivos
   expected_state: Tabuleiro esperado
   explain_redirect: Percebemos que você se registrou em outra organização.
@@ -149,6 +150,8 @@ pt:
   lessons: Lições
   lesson_number: Lição %{number}
   let_us_know: Por favor, avise-nos!
+  level: Nível
+  level_up: Você sobe de nível!
   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'
@@ -242,6 +245,7 @@ pt:
   solved_count: '%{count} resolvido'
   solved_exercises: Exercícios resolvidos
   solve_doubts: Resolvi dúvidas
+  solve_more_exercises_to_level_up: Resolva mais <span>number</span> exercícios para avançar para o próximo nível.
   solve_your_doubts: Consulte suas dúvidas
   solve_your_doubts_teaser: Você tem alguma dúvida?
   something_went_wrong: Oops!, Algo não estava certo ...
@@ -292,5 +296,6 @@ pt:
   working: Processamento
   wrong_answer: A resposta não é correta
   years: anos
+  you_earned: Você ganhou
   you_must_sign_in_before_submitting: Você deve fazer o login antes de começar a enviar suas soluções
   your_new_organization: sua nova organização

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '8.0.0'
+    VERSION = '8.1.0'
   end
 end

data/spec/capybara_helper.rb

@@ -87,7 +87,11 @@ def exclude_selenium_failing_tests!
       :json_eq_error,
       :navigation_error,
       :organization_not_nil,
-      :xpath_no_matches
+      :xpath_no_matches,
+
+      # Fails because Rails redirection doesn't include Capybara port.
+      # It can be fixed by using path mapping instead of subdomain.
+      :subdomain_redirection_without_port
     )
   end
 end

data/spec/controllers/exercise_solutions_controller_spec.rb

@@ -89,7 +89,7 @@ describe ExerciseSolutionsController, organization_workspace: :test do
 
       it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
                                             except: [:html, :remaining_attempts_html, :title_html, :button_html,
-                                                     :expectations, :test_results, :tips, :current_exp]) }
+                                                     :expectations, :test_results, :tips, :current_exp, :level_up_html]) }
 
       it 'includes kids specific renders' do
         body = JSON.parse(response.body)

data/spec/features/immersive_redirection_spec.rb

@@ -0,0 +1,181 @@
+require 'spec_helper'
+
+feature 'Immersive redirection Flow', organization_workspace: :test, subdomain_redirection_without_port: true do
+  def create_guide(name)
+    create(:guide, name: name)
+  end
+
+  def create_immersive_organization(name, guides)
+    create(:organization,
+           name: name,
+           immersive: true,
+           book:
+               create(:book,
+                      chapters: [
+                          create(:chapter, lessons: guides.map { |it| create(:lesson, guide: it) })
+                      ]))
+  end
+
+  let(:organization) { Organization.current }
+  let(:book) { organization.book }
+
+  let(:guide_one) { create_guide 'guide one' }
+  let(:guide_two) { create_guide 'guide two' }
+  let(:guide_three) { create_guide 'guide three' }
+
+  let(:lesson_one) { create(:lesson, guide: guide_one) }
+  let(:lesson_two) { create(:lesson, guide: guide_two) }
+  let(:lesson_three) { create(:lesson, guide: guide_three) }
+
+  before { book.update! chapters: [create(:chapter, lessons: [lesson_one, lesson_two, lesson_three])] }
+  before { set_current_user! user }
+
+  shared_examples 'immersive redirection' do |organization_name|
+    scenario 'should redirect to immersive organization' do
+      expect(page).to have_text organization_name
+      expect(page).not_to have_text "Go to #{organization_name}"
+    end
+  end
+
+  shared_examples 'navigate to content' do |guide_name|
+    scenario 'should navigate to content' do
+      expect(page).to have_text guide_name
+      expect(page).to have_text 'Exercises'
+    end
+  end
+
+  shared_examples 'navigate to main page' do
+    scenario 'should navigate to main page' do
+      expect(page).to have_text 'Start Practicing!'
+    end
+  end
+
+  shared_examples 'navigate to discussions main page' do
+    scenario 'should navigate to discussions main page' do
+      expect(page).to have_text 'Discussions'
+    end
+  end
+
+  shared_examples 'navigate to user profile' do
+    scenario 'should navigate to user profile' do
+      expect(page).to have_text user.full_name
+    end
+  end
+
+  context 'with one immersive organization' do
+    let(:user) { create(:user, permissions: {student: 'immersive-orga/*'}) }
+    let!(:immersive_orga) { create_immersive_organization('immersive-orga', [guide_one]) }
+
+    feature 'when navigating to an available content' do
+      before { visit lesson_path(lesson_one) }
+      it_behaves_like 'immersive redirection', 'immersive-orga'
+      it_behaves_like 'navigate to content', 'guide one'
+    end
+
+    feature 'when navigating to an unavailable content' do
+      before { visit lesson_path(lesson_two) }
+      it_behaves_like 'immersive redirection', 'immersive-orga'
+      it_behaves_like 'navigate to main page'
+    end
+
+    context 'when navigating to a discussion' do
+      feature 'and forum enabled' do
+        before { immersive_orga.update(forum_enabled: true) }
+        before { visit discussions_path }
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to discussions main page'
+      end
+
+      feature 'and forum not enabled' do
+        before { visit discussions_path }
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to main page'
+      end
+    end
+
+    feature 'when navigating to another route' do
+      before { visit user_path }
+      it_behaves_like 'immersive redirection', 'immersive-orga'
+      it_behaves_like 'navigate to user profile'
+    end
+  end
+
+  context 'with many immersive organizations' do
+    let(:user) { create(:user, permissions: {student: 'immersive-orga/*:private/*'}) }
+
+    let!(:private_orga) { create_immersive_organization('private', [guide_one, guide_two]) }
+    let!(:immersive_orga) { create_immersive_organization('immersive-orga', [guide_one]) }
+
+    shared_examples 'organization chooser' do
+      scenario 'should display organization chooser' do
+        expect(page).to have_text 'You have registered in another organization'
+      end
+    end
+
+    def choose_organization(name)
+      within '.modal' do
+        click_on "Go to #{name}"
+      end
+    end
+
+    feature 'when content is present in one of them' do
+      before { visit lesson_path(lesson_two) }
+      it_behaves_like 'immersive redirection', 'private'
+      it_behaves_like 'navigate to content', 'guide two'
+    end
+
+    feature 'when content is present in two of them' do
+      before { visit lesson_path(lesson_one) }
+      it_behaves_like 'organization chooser'
+
+      context 'after choosing an organization' do
+        before { choose_organization 'private' }
+        it_behaves_like 'immersive redirection', 'private'
+        it_behaves_like 'navigate to content', 'guide one'
+      end
+    end
+
+    describe 'when content is not present on any of them' do
+      before { visit lesson_path(lesson_three) }
+      it_behaves_like 'organization chooser'
+
+      context 'after choosing an organization' do
+        before { choose_organization 'immersive-orga' }
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to main page'
+      end
+    end
+
+    feature 'when navigating to another route' do
+      before { visit user_path }
+      it_behaves_like 'organization chooser'
+
+      context 'after choosing an organization' do
+        before { choose_organization 'immersive-orga' }
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to user profile'
+      end
+    end
+
+    context 'when navigating to a discussion' do
+      before { immersive_orga.update(forum_enabled: true) }
+      before { visit discussions_path }
+
+      it_behaves_like 'organization chooser'
+
+      feature 'and forum enabled' do
+        before { choose_organization 'immersive-orga' }
+
+        it_behaves_like 'immersive redirection', 'immersive-orga'
+        it_behaves_like 'navigate to discussions main page'
+      end
+
+      feature 'and forum not enabled' do
+        before { choose_organization 'private' }
+
+        it_behaves_like 'immersive redirection', 'private'
+        it_behaves_like 'navigate to main page'
+      end
+    end
+  end
+end