mumuki-laboratory 7.0.4 → 7.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35d6e7523373cf000fe2e8e35c96946dc5ddbd334567c7b22c7e9820ead7097f
-  data.tar.gz: 734d4681ae46c1390f2aefb86a176142016669fedc748ba8e101a85b80ebd230
+  metadata.gz: f42f46992e32a1f7dda117eb52cbcfbfcd852c73060eff71aa664f8fb112d533
+  data.tar.gz: 34df1712c6432d8ea9a927a1377ab36075908f5477858de62fecbfcc9de57109
 SHA512:
-  metadata.gz: 622309fc919269e770a944125a09ea39f5e54a03d4d7b520bc836a005040c424ef47f1f74726bcc5b70056a98fea6004723f9e9157d4a24417d8423bcc323495
-  data.tar.gz: 21afdd2eeba34d58e3333e3b957336d40be30418032342c99c3be7dc6d1cb84b2971e274601ba72c9cc87ef79f154fe4bc8d391a12084f9b9f75186d1faf44e6
+  metadata.gz: 699fe650796d10f86a46a1ec905b569acd0b40636f4f4645208ddfa21c3f746e987c2f76fba42027bca4fa0f881263c417b1b55946d976c47f94fde14be4235a
+  data.tar.gz: d5cf2c6626e67b973b3bd65504637aa2baba24d94de8267b0a68b5feedb6859532066c03cc2b03564f4c67ee47b9484447dd6179d8474df870a4fbb2460c5f8d

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

@@ -1,3 +1,8 @@
+$multifile-active-tab-background-color: #FFF;
+$multifile-inactive-tab-background-color: #F7F7F7;
+$multifile-active-tab-border-color: #CCCCCC;
+$multifile-inactive-tab-border-color: #ECF0F1;
+
 #console {
   position: relative;
 }
@@ -80,12 +85,15 @@ body.fullscreen {
   justify-content: space-between;
   align-items: center;
   margin-bottom: -6px;
+  margin-left: 30px;
 
   .nav-tabs {
     display: flex;
     justify-content: space-between;
     align-items: center;
     width: 100%;
+    margin-bottom: 0;
+    z-index: 1;
 
     li {
       position: relative;
@@ -108,15 +116,18 @@ body.fullscreen {
       }
       &.active {
         a {
-          background-color: #f7f7f7;
+          background-color: $multifile-active-tab-background-color;
+          border: 1px solid $multifile-active-tab-border-color;
+          border-bottom: none;
         }
       }
       &:not(.active) > a {
-        background-color: #fff;
-        border: 1px solid #ecf0f1;
+        background-color: $multifile-inactive-tab-background-color;
+        border: 1px solid $multifile-inactive-tab-border-color;
+        border-bottom: 1px solid $multifile-active-tab-border-color;
         cursor: pointer;
         &:hover {
-          background-color: #ecf0f1;
+          background-color: $multifile-inactive-tab-border-color;
         }
       }
     }

data/app/controllers/concerns/with_authorization.rb

@@ -9,6 +9,10 @@ module WithAuthorization
     authorize! :admin
   end
 
+  def authorize_owner!
+    authorize! :owner
+  end
+
   def authorization_slug
     protection_slug || '_/_'
   end

data/app/helpers/breadcrumbs_helper.rb

@@ -1,27 +1,31 @@
 module BreadcrumbsHelper
-
   def breadcrumbs(e, extra=nil)
     breadcrumbs0(e.navigable_name, e, extra, 'last')
   end
 
+  def header_breadcrumbs(link_for_organization: true)
+    "#{home_breadcrumb} #{organization_breadcrumb(has_link: link_for_organization)}".html_safe
+  end
+
   def home_breadcrumb
-    "<li class='mu-breadcrumb-list-item brand '>#{breadcrumb_home_link}</li>".html_safe
+    home = "<i class='da da-mumuki' aria-label=#{t(:home)}></i>".html_safe
+    breadcrumb_item_for_linkable home, mu_home_path, 'brand'
   end
 
-  def breadcrumb_home_link
-    if Organization.current.breadcrumb_image_url.present?
-      link_to image_tag(Organization.current.breadcrumb_image_url, class: "da mu-breadcrumb-img"), root_path
-    else
-      link_to "<i class='da da-mumuki' aria-label=#{t(:home)}></i>".html_safe, root_path
-    end
+  def mu_home_path
+    root_path
+  end
+
+  def breadcrumb_item_class(clazz)
+    "class='mu-breadcrumb-list-item #{clazz}'"
   end
 
-  def breadcrumb_item_class(last)
-    "class='mu-breadcrumb-list-item #{last}'"
+  def breadcrumb_list_item(item, clazz='')
+    "<li #{breadcrumb_item_class(clazz)}>#{h item}</li>".html_safe
   end
 
-  def breadcrumb_list_item(last, item)
-    "<li #{breadcrumb_item_class(last)}>#{h item}</li>".html_safe
+  def breadcrumb_item_for_linkable(e, link_path, clazz='')
+    breadcrumb_list_item link_to(e, link_path), clazz
   end
 
   private
@@ -31,12 +35,12 @@ module BreadcrumbsHelper
   end
 
   def breadcrumbs0(base, e, extra, last)
-    return "#{breadcrumbs_for_linkable(e)} #{breadcrumb_list_item(last, extra)}".html_safe if extra
+    return "#{breadcrumbs_for_linkable(e)} #{breadcrumb_list_item(extra, last)}".html_safe if extra
 
     if e.navigation_end?
-      "#{home_breadcrumb} #{breadcrumb_list_item(last, base)}".html_safe
+      "#{header_breadcrumbs} #{breadcrumb_list_item(base, last)}".html_safe
     else
-      "#{breadcrumbs_for_linkable(e.navigable_parent)} #{breadcrumb_list_item(last, base)}".html_safe
+      "#{breadcrumbs_for_linkable(e.navigable_parent)} #{breadcrumb_list_item(base, last)}".html_safe
     end
   end
 end

data/app/helpers/organization_breadcrumbs_helper.rb

@@ -0,0 +1,24 @@
+module OrganizationBreadcrumbsHelper
+  def organization_breadcrumb(has_link: true)
+    clazz = 'last' unless has_link
+    breadcrumb_item_for_linkable(organization_breadcrumb_item_content, root_path, clazz)
+  end
+
+  private
+
+  def organization_breadcrumb_item_content(organization=Organization.current)
+    if organization.breadcrumb_image_url.present?
+      breadcrumb_image_for organization
+    else
+      breadcrumb_text_for organization
+    end
+  end
+
+  def breadcrumb_image_for(organization)
+    image_tag organization.breadcrumb_image_url, class: "da mu-breadcrumb-img"
+  end
+
+  def breadcrumb_text_for(organization)
+    organization.name
+  end
+end

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

@@ -1,3 +1,7 @@
+<%= content_for :breadcrumbs do %>
+  <%= header_breadcrumbs(link_for_organization: false) %>
+<% end %>
+
 <div class="col-md-offset-2 col-md-8">
   <div class="book-header <%= current_user? ? '' : 'logged' %>">
     <h1>ム mumuki<%= Organization.current.title_suffix %></h1>

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.0.4'
+    VERSION = '7.0.5'
   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: 20190702182407) do
+ActiveRecord::Schema.define(version: 20190724190355) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -237,6 +237,7 @@ ActiveRecord::Schema.define(version: 20190702182407) do
     t.boolean "multifile", default: false
     t.boolean "layout_shows_loading_content"
     t.boolean "editor_shows_loading_content"
+    t.boolean "settings", default: false
     t.index ["name"], name: "index_languages_on_name", unique: true
   end
 

data/spec/helpers/breadcrumbs_helper_spec.rb

@@ -3,9 +3,14 @@ require 'spec_helper'
 describe BreadcrumbsHelper, organization_workspace: :test do
 
   helper BreadcrumbsHelper
+  helper OrganizationBreadcrumbsHelper
   helper LinksHelper
   helper ERB::Util
 
+  let(:home_breadcrumb_with_link) { "<li class='mu-breadcrumb-list-item brand'><a href=\"#{root_path}\">" }
+  let(:organization_breadcrumb_with_link) { "<li class='mu-breadcrumb-list-item '><a href=\"#{root_path}\">" }
+  let(:organization_breadcrumb_without_link) { "<li class='mu-breadcrumb-list-item last'><a href=\"#{root_path}\">" }
+
   context 'user' do
     let(:user) { create(:user, first_name: "Alfonsina", last_name: "Storni") }
     let(:breadcrumb) { breadcrumbs(user) }
@@ -16,7 +21,7 @@ describe BreadcrumbsHelper, organization_workspace: :test do
   context 'exercise' do
     let(:breadcrumb) { breadcrumbs(exercise) }
 
-    context 'exercise in complement' do
+    context 'in complement' do
       let!(:complement) { create(:complement, name: 'my guide', exercises: [
           create(:exercise, name: 'my exercise')
       ]) }
@@ -24,29 +29,75 @@ describe BreadcrumbsHelper, organization_workspace: :test do
 
       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 'breadcrumb goes mumuki / test organization / guide / exercise' do
+        expect(breadcrumb).to include('da da-mumuki')
+        expect(breadcrumb).to include('test')
+        expect(breadcrumb).to include('my guide')
+        expect(breadcrumb).to include('my exercise')
+        expect(breadcrumb).to be_html_safe
+      end
 
-      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>" }
+      it 'mumuki, organization and guide have links but exercise does not' do
+        expect(breadcrumb).to include home_breadcrumb_with_link
+        expect(breadcrumb).to include organization_breadcrumb_with_link
+        expect(breadcrumb).to include "<a href=\"/complements/#{complement.id}-my-guide\">my guide</a>"
+        expect(breadcrumb).to include "<li class='mu-breadcrumb-list-item last'>1. my exercise</li>"
+      end
     end
 
-    context 'exercise in chapter' do
+    context '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 'breadcrumb goes mumuki / test organization / chapter / lesson / exercise' do
+        expect(breadcrumb).to include('da da-mumuki')
+        expect(breadcrumb).to include('test')
+        expect(breadcrumb).to include('my chapter')
+        expect(breadcrumb).to include('my lesson')
+        expect(breadcrumb).to include('my exercise')
+        expect(breadcrumb).to be_html_safe
+      end
+
+      it 'mumuki, organization, chapter and lesson have links but exercise does not' do
+        expect(breadcrumb).to include home_breadcrumb_with_link
+        expect(breadcrumb).to include organization_breadcrumb_with_link
+        expect(breadcrumb).to include "<a href=\"/chapters/#{chapter.id}-my-chapter\">my chapter</a>"
+        expect(breadcrumb).to include "<a href=\"/lessons/#{lesson.id}-my-chapter-my-lesson\">1. my lesson</a>"
+        expect(breadcrumb).to include "<li class='mu-breadcrumb-list-item last'>1. my exercise</li>"
+      end
+    end
+  end
+
+  context 'book' do
+    let(:breadcrumb) { header_breadcrumbs(link_for_organization: false) }
+
+    describe 'in organization with text breadcrumb' do
+      it 'breadcrumb goes mumuki / test organization' do
+        expect(breadcrumb).to include('da da-mumuki')
+        expect(breadcrumb).to include('test')
+      end
+
+      it 'mumuki has link but organization does not' do
+        expect(breadcrumb).to include home_breadcrumb_with_link
+        expect(breadcrumb).to include organization_breadcrumb_without_link
+      end
+    end
+
+    describe 'in organization with image breadcrumb' do
+      before { Organization.current.profile = Mumuki::Domain::Organization::Profile.new({breadcrumb_image_url: "organization.jpg"}) }
+
+      it 'breadcrumb goes mumuki / organization logo' do
+        expect(breadcrumb).to include('da da-mumuki')
+        expect(breadcrumb).to_not include('test')
+      end
 
-      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>" }
+      it 'mumuki has link but organization logo does not' do
+        expect(breadcrumb).to include home_breadcrumb_with_link
+        expect(breadcrumb).to include organization_breadcrumb_without_link
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 7.0.5
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -321,6 +321,7 @@ files:
 - app/helpers/messages_helper.rb
 - app/helpers/multiple_file_editor_helper.rb
 - app/helpers/open_graph_helper.rb
+- app/helpers/organization_breadcrumbs_helper.rb
 - app/helpers/organization_list_helper.rb
 - app/helpers/page_title_helper.rb
 - app/helpers/progress_bar_helper.rb