mumuki-laboratory 5.8.1 → 5.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87600d3445c8ae5dbea2faf628e69b2a638fcdd826e8e8aaa051fb2bd3926a18
-  data.tar.gz: 10ba9a35ee5077f52af13797f42029f374d1495218708c8b55255a92ee3b886a
+  metadata.gz: 625ae660ff8299245d10e105830ddcf35e14a1700f36ecad6d338cbd0bee64bd
+  data.tar.gz: 43691be79aa7d382429e9443ed0727c19ded873284baab6c1ad8f8c9232d09b7
 SHA512:
-  metadata.gz: 1e2051b926a10132b983dcc66382d7ee4615c3d88a1e30921bf25ab7283548428e5adc7833641aa413034db29f74fb3c7d64c4caaf69b2ab12441950f2d8e12b
-  data.tar.gz: ef2059b7ebb09484296395183f2bf3b7b866a79ce794a776dd8b8e517db2da9545b4a3b92ca504682b5f38a9e66854cc76f21a9bb8b964748c7129889c841b03
+  metadata.gz: ca3b02948675b7bf146dac98f74ba891ecfb6feb979853b52d7bbce804a34b350278677beac6a782d79b8399a737e9243bfcca8cb0dde1128e7f966811ad1abe
+  data.tar.gz: bcb56b9bbac91d7600e69502432d6d176ffff4783a7c80c809a54606d8faceb56a49e232765fdd29fb18f9c52d6a1425ba73a64cf329210b2b188b0c029fc7f0

data/app/assets/javascripts/application/kids.js

@@ -1,58 +1,47 @@
 mumuki.load(function () {
+  var $bubble = $('.mu-kids-character-speech-bubble').children('.mu-kids-character-speech-bubble-normal');
+  if(!$bubble.length) return;
 
-  mumuki.resize(function () {
-    var margin = 15;
-    var fullMargin = margin * 2;
-
-    var gbsBoard = $('.mu-kids-state');
-
-    var dimension = gbsBoard.height() * 1.25 - fullMargin;
-    gbsBoard.width(dimension);
-
-    var $muKidsExercise = $('.mu-kids-exercise');
-    var $muKidsExerciseDescription = $('.mu-kids-exercise-description');
-
-    $muKidsExerciseDescription.width($muKidsExercise.width() - gbsBoard.width() - margin);
-
-    gbsBoard.each(function (i) {
-      gsBoardScale($(gbsBoard[i]));
-    });
-
-    var $muKidsBlocks = $('.mu-kids-blocks');
-    var $blockArea = $muKidsBlocks.find('#blocklyDiv');
-    var $blockSvg = $muKidsBlocks.find('.blocklySvg');
-
-    $blockArea.width($muKidsBlocks.width());
-    $blockArea.height($muKidsBlocks.height());
-
-    $blockSvg.width($muKidsBlocks.width());
-    $blockSvg.height($muKidsBlocks.height());
-
-    function gsBoardScale($element) {
-      var $table = $element.find('gs-board > table');
-      $table.css('transform', 'scale(1)');
-      var scaleX = ($element.width() - fullMargin * 2) / $table.width();
-      var scaleY = ($element.height() - fullMargin * 2) / $table.height();
-      $table.css('transform', 'scale(' + Math.min(scaleX, scaleY) + ')');
-    }
-
-  });
-
-  var $speechParagraphs;
+  var availableTabs = ['.description', '.hint'];
+  var $speechParagraphs, paragraphHeight, scrollHeight;
   var currentParagraphIndex = 0;
+  var paragraphCount = 1;
+  var paragraphsLines = 2;
   var $prevSpeech = $('.mu-kids-character-speech-bubble-normal > .mu-kids-prev-speech').hide();
   var $nextSpeech = $('.mu-kids-character-speech-bubble-normal > .mu-kids-next-speech');
   var $speechTabs = $('.mu-kids-character-speech-bubble-tabs > li:not(.separator)');
   var $defaultSpeechTabName = 'description';
-  var $bubble = $('.mu-kids-character-speech-bubble').children('.mu-kids-character-speech-bubble-normal');
-  var $texts = $bubble.children('.description, .hint');
+  var $texts = $bubble.children(availableTabs.join(", "));
+
+  function floatFromPx(value) {
+    return parseFloat(value.substring(0, value.length - 2));
+  }
+
+  function resizeSpeechParagraphs(paragraphIndex) {
+    var previousParagraphCount = paragraphCount;
+    scrollHeight = $bubble[0].scrollHeight;
+    paragraphHeight = floatFromPx($speechParagraphs.css('line-height')) * paragraphsLines;
+    paragraphCount = Math.ceil(scrollHeight / paragraphHeight);
+    var newParagraphIndex = Math.floor((paragraphCount / previousParagraphCount) * currentParagraphIndex);
+    showParagraph(paragraphIndex || newParagraphIndex);
+  }
+
+  availableTabs.forEach(function (tabSelector) {
+    tabParagraphs(tabSelector).contents().unwrap().wrapAll('<p>');
+  });
+
+  function tabParagraphs(selector) {
+    return $('.mu-kids-character-speech-bubble > .mu-kids-character-speech-bubble-normal > div' + selector + ' > p');
+  }
 
   updateSpeechParagraphs();
   function updateSpeechParagraphs() {
-    $speechParagraphs = $('.mu-kids-character-speech-bubble > .mu-kids-character-speech-bubble-normal > div.' + getSelectedTabName() + ' > p');
-    showParagraph(0);
+    $speechParagraphs = tabParagraphs('.' + getSelectedTabName());
+    resizeSpeechParagraphs(0);
   }
 
+  resizeSpeechParagraphs();
+
   $speechTabs.each(function (i) {
     var $tab = $($speechTabs[i]);
     $tab.click(function () {
@@ -60,48 +49,75 @@ mumuki.load(function () {
       $tab.addClass('active');
       $texts.hide();
       $bubble.children('.' + $tab.data('target')).show();
-      $bubble.scroll(0);
-      hideCurrentParagraph();
       updateSpeechParagraphs();
     })
   });
 
   $nextSpeech.click(function () {
-    hideCurrentParagraph();
-    showNextParagraph();
+    showParagraph(currentParagraphIndex + 1);
   });
+
   $prevSpeech.click(function () {
-    hideCurrentParagraph();
-    showPrevParagraph();
+    showParagraph(currentParagraphIndex - 1);
   });
 
   function getSelectedTabName() {
     return $speechTabs.filter(".active").data('target') || $defaultSpeechTabName;
   }
 
-  function hideCurrentParagraph() {
-    $($speechParagraphs[currentParagraphIndex]).hide();
+  function showParagraph(index) {
+    $bubble[0].scrollTop = index * paragraphHeight;
+    currentParagraphIndex = index;
+    checkArrowsSpeechVisibility();
   }
 
-  function showPrevParagraph() {
-    showParagraph(currentParagraphIndex - 1);
+  function checkArrowsSpeechVisibility() {
+    setVisibility($prevSpeech, currentParagraphIndex !== 0);
+    setVisibility($nextSpeech, currentParagraphIndex !== paragraphCount - 1);
   }
 
-  function showNextParagraph() {
-    showParagraph(currentParagraphIndex + 1);
+  function setVisibility(element, isVisible) {
+    isVisible ? element.show() : element.hide();
   }
 
-  function showParagraph(index) {
-    $($speechParagraphs[index]).show();
-    setVisibility($prevSpeech, index !== 0);
-    setVisibility($nextSpeech, index !== $speechParagraphs.length - 1);
+  mumuki.resize(function () {
+    var margin = 15;
+    var fullMargin = margin * 2;
 
-    currentParagraphIndex = index;
-  }
+    var gbsBoard = $('.mu-kids-state');
 
-  function setVisibility(element, isVisible) {
-    if (isVisible) element.show(); else element.hide();
-  }
+    var dimension = gbsBoard.height() * 1.25 - fullMargin;
+    gbsBoard.width(dimension);
+
+    var $muKidsExercise = $('.mu-kids-exercise');
+    var $muKidsExerciseDescription = $('.mu-kids-exercise-description');
+
+    $muKidsExerciseDescription.width($muKidsExercise.width() - gbsBoard.width() - margin);
+
+    gbsBoard.each(function (i) {
+      gsBoardScale($(gbsBoard[i]));
+    });
+
+    var $muKidsBlocks = $('.mu-kids-blocks');
+    var $blockArea = $muKidsBlocks.find('#blocklyDiv');
+    var $blockSvg = $muKidsBlocks.find('.blocklySvg');
+
+    $blockArea.width($muKidsBlocks.width());
+    $blockArea.height($muKidsBlocks.height());
+
+    $blockSvg.width($muKidsBlocks.width());
+    $blockSvg.height($muKidsBlocks.height());
+
+    function gsBoardScale($element) {
+      var $table = $element.find('gs-board > table');
+      $table.css('transform', 'scale(1)');
+      var scaleX = ($element.width() - fullMargin * 2) / $table.width();
+      var scaleY = ($element.height() - fullMargin * 2) / $table.height();
+      $table.css('transform', 'scale(' + Math.min(scaleX, scaleY) + ')');
+    }
+
+    resizeSpeechParagraphs();
+  });
 
   mumuki.kids = {
 

data/app/helpers/breadcrumbs_helper.rb

@@ -1,7 +1,7 @@
 module BreadcrumbsHelper
 
   def breadcrumbs(e, extra=nil)
-    breadcrumbs0(e, extra, 'last')
+    breadcrumbs0(e.navigable_name, e, extra, 'last')
   end
 
   def home_breadcrumb
@@ -17,9 +17,7 @@ module BreadcrumbsHelper
   end
 
   def breadcrumb_item_class(last)
-    <<HTML
-    class='mu-breadcrumb-list-item #{last}'
-HTML
+    "class='mu-breadcrumb-list-item #{last}'"
   end
 
   def breadcrumb_list_item(last, item)
@@ -28,14 +26,17 @@ HTML
 
   private
 
-  def breadcrumbs0(e, extra=nil, last='')
-    return "#{breadcrumbs0(e)} #{breadcrumb_list_item(last, extra)}".html_safe if extra
+  def breadcrumbs_for_linkable(e, extra=nil, last='')
+    breadcrumbs0(link_to_path_element(e), e, extra, last)
+  end
+
+  def breadcrumbs0(base, e, extra, last)
+    return "#{breadcrumbs_for_linkable(e)} #{breadcrumb_list_item(last, extra)}".html_safe if extra
 
-    base = link_to_path_element e
     if e.navigation_end?
       "#{home_breadcrumb} #{breadcrumb_list_item(last, base)}".html_safe
     else
-      "#{breadcrumbs0(e.navigable_parent)} #{breadcrumb_list_item(last, base)}".html_safe
+      "#{breadcrumbs_for_linkable(e.navigable_parent)} #{breadcrumb_list_item(last, base)}".html_safe
     end
   end
 end

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

@@ -1,5 +1,5 @@
 <%= content_for :breadcrumbs do %>
-  <%= breadcrumbs @chapter, link_to(t(:appendix), chapter_appendix_path(@chapter)) %>
+  <%= breadcrumbs @chapter, t(:appendix) %>
 <% end %>
 
 <h1><%= t :appendix %></h1>

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

@@ -1,5 +1,5 @@
 <%= content_for :breadcrumbs do %>
-  <%= breadcrumbs0 @debatable, link_to(t(:discussions), item_discussions_path(@debatable))%>
+  <%= breadcrumbs_for_linkable @debatable, link_to(t(:discussions), item_discussions_path(@debatable))%>
   <%= breadcrumb_list_item('last', @discussion.friendly.truncate_words(4)) %>
 <% end %>
 

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.8.1'
+    VERSION = '5.8.3'
   end
 end

data/spec/helpers/breadcrumbs_helper_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe BreadcrumbsHelper, organization_workspace: :test do
+
+  helper BreadcrumbsHelper
+  helper LinksHelper
+
+
+  context 'user' do
+    let(:user) { create(:user) }
+    let(:breadcrumb) { breadcrumbs(user) }
+
+    it { expect(breadcrumb).to include "<li class='mu-breadcrumb-list-item last'>#{user.name}</li>" }
+  end
+
+  context 'exercise' do
+    let(:breadcrumb) { breadcrumbs(exercise) }
+
+    context 'exercise in complement' do
+      let!(:complement) { create(:complement, name: 'my guide', exercises: [
+          create(:exercise, name: 'my exercise')
+      ]) }
+      let(:exercise) { complement.exercises.first }
+
+      before { reindex_current_organization! }
+
+      it { expect(breadcrumb).to include('my exercise') }
+      it { expect(breadcrumb).to include('my guide') }
+      it { expect(breadcrumb).to be_html_safe }
+
+      it { expect(breadcrumb).to include "<a href=\"/complements/#{complement.id}-my-guide\">my guide</a>" }
+      it { expect(breadcrumb).to include "<li class='mu-breadcrumb-list-item last'>1. my exercise</li>" }
+    end
+
+    context 'exercise in chapter' do
+      let!(:chapter) { create(:chapter, name: 'my chapter', lessons: [lesson]) }
+      let(:lesson) { create(:lesson, name: 'my lesson', exercises: [exercise]) }
+      let(:exercise) { create(:exercise, name: 'my exercise') }
+
+      before { reindex_current_organization! }
+
+      it { expect(breadcrumb).to include('my exercise') }
+      it { expect(breadcrumb).to include('my lesson') }
+      it { expect(breadcrumb).to include('my chapter') }
+      it { expect(breadcrumb).to be_html_safe }
+
+      it { expect(breadcrumb).to include "<a href=\"/chapters/#{chapter.id}-my-chapter\">my chapter</a>" }
+      it { expect(breadcrumb).to include "<a href=\"/lessons/#{lesson.id}-my-chapter-my-lesson\">1. my lesson</a>" }
+      it { expect(breadcrumb).to include "<li class='mu-breadcrumb-list-item last'>1. my exercise</li>" }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 5.8.1
+  version: 5.8.3
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -962,11 +962,11 @@ files:
 - spec/features/progressive_tips_spec.rb
 - spec/features/standard_flow_spec.rb
 - spec/helpers/application_helper_spec.rb
+- spec/helpers/breadcrumbs_helper_spec.rb
 - spec/helpers/email_helper_spec.rb
 - spec/helpers/exercise_input_helper_spec.rb
 - spec/helpers/icons_helper_spec.rb
 - spec/helpers/test_results_rendering_spec.rb
-- spec/helpers/with_breadcrumbs_spec.rb
 - spec/helpers/with_choices_spec.rb
 - spec/helpers/with_navigation_spec.rb
 - spec/mailers/previews/user_mailer_preview.rb
@@ -1147,11 +1147,11 @@ test_files:
 - spec/features/progressive_tips_spec.rb
 - spec/features/standard_flow_spec.rb
 - spec/helpers/application_helper_spec.rb
+- spec/helpers/breadcrumbs_helper_spec.rb
 - spec/helpers/email_helper_spec.rb
 - spec/helpers/exercise_input_helper_spec.rb
 - spec/helpers/icons_helper_spec.rb
 - spec/helpers/test_results_rendering_spec.rb
-- spec/helpers/with_breadcrumbs_spec.rb
 - spec/helpers/with_choices_spec.rb
 - spec/helpers/with_navigation_spec.rb
 - spec/mailers/previews/user_mailer_preview.rb

data/spec/helpers/with_breadcrumbs_spec.rb

@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-describe BreadcrumbsHelper, organization_workspace: :test do
-
-  helper BreadcrumbsHelper
-  helper LinksHelper
-
-  let(:breadcrumb) { breadcrumbs(exercise) }
-
-  context 'exercise in complement' do
-    let!(:complement) { create(:complement, name: 'my guide', exercises: [
-        create(:exercise, name: 'my exercise')
-    ]) }
-    let(:exercise) { complement.exercises.first }
-
-    before { reindex_current_organization! }
-
-    it { expect(breadcrumb).to include('my exercise') }
-    it { expect(breadcrumb).to include('my guide') }
-    it { expect(breadcrumb).to be_html_safe }
-  end
-
-  context 'exercise in chapter' do
-    let!(:chapter) { create(:chapter, name: 'my chapter', lessons: [
-        create(:lesson, name: 'my lesson', exercises: [
-            create(:exercise, name: 'my exercise')
-        ])
-    ]) }
-    let(:exercise) { chapter.first_lesson.exercises.first }
-
-    before { reindex_current_organization! }
-
-    it { expect(breadcrumb).to include('my exercise') }
-    it { expect(breadcrumb).to include('my lesson') }
-    it { expect(breadcrumb).to include('my chapter') }
-    it { expect(breadcrumb).to be_html_safe }
-  end
-end