mumuki-laboratory 5.6.3 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 304a4ed4733a6f648ce0437780519c8c3f3fe874cf3b96ce96d2eea351a5b250
-  data.tar.gz: 295c271a9fff7056a7309fdcd9f07f7206abbc5cc8a8df44fb2cb9f9e0cc273d
+  metadata.gz: eebf90572caa6242083ad55e7af966691ffadd00c9ea6cf4b9ccd5ce3ef89f22
+  data.tar.gz: a7a348cc2799dbbf19ab01be6f9b4edace17979ce784f124ef695db12a6ba1c2
 SHA512:
-  metadata.gz: be00363a9eb23b5797bc81ff39da5e11edb8a8d38bd0558b12b54ac03ac879c1b933f9cf990c03e427387039f16e569df9aaf3b619b28310149672a1f2d7cc19
-  data.tar.gz: 07bef8f427e030ddbf4c636d757836dddc95184e0856be511043f2d281c0d4ddecb60e6367cb3eec2112e4b44eb1650b1c2ce70b18c4e3296499c1d18f8a2571
+  metadata.gz: a02f3ef36c6f80aa9b88b508b579e4d9479c4c43d04c8c120928394ca59a222192a31a7d8ec816d4ac6ccc18fd6e13d36913e819b959b10bbf26875ea95e9ebc
+  data.tar.gz: bc5ae60058112ffac03761ee34567349a3b34348f3a2f90c334b607fa97bd84e1e82af08886c828f607ac010d1be50eec4f0504fa83bc9ca77ce4506d5aded95

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

@@ -23,7 +23,7 @@ var mumuki = mumuki || {};
     var token = new mumuki.CsrfToken();
     var request = token.newRequest({
       type: 'POST',
-      url: window.location.origin + window.location.pathname + '/solutions',
+      url: window.location.origin + window.location.pathname + '/solutions' + window.location.search,
       data: solution
     });
 

data/app/assets/javascripts/application/codemirror-builder.js

@@ -13,18 +13,28 @@ var mumuki = mumuki || {};
     $('.btn-submit').click();
   }
 
+  function submitMessage() {
+    $('.discussion-new-message-button').click();
+  }
+
+  var codeMirrorDefaults = {
+    autofocus: false,
+    tabSize: 2,
+    cursorHeight: 1,
+    matchBrackets: true,
+    lineWiseCopyCut: true,
+    autoCloseBrackets: true,
+    showCursorWhenSelecting: true,
+    lineWrapping: true
+  };
+
   CodeMirrorBuilder.prototype = {
+    createEditor: function (customOptions) {
+      return CodeMirror.fromTextArea(this.textarea, Object.assign({}, codeMirrorDefaults, customOptions));
+    },
     setupEditor: function () {
-      this.editor = CodeMirror.fromTextArea(this.textarea, {
-        autofocus: false,
-        tabSize: 2,
+      this.editor = this.createEditor({
         lineNumbers: true,
-        lineWrapping: true,
-        cursorHeight: 1,
-        matchBrackets: true,
-        lineWiseCopyCut: true,
-        autoCloseBrackets: true,
-        showCursorWhenSelecting: true,
         extraKeys: {
           'Ctrl-Space': 'autocomplete',
           'Cmd-Enter': submit,
@@ -38,12 +48,25 @@ var mumuki = mumuki || {};
         }
       });
     },
+    setupSimpleEditor: function () {
+      this.editor = this.createEditor({
+        mode: 'text',
+        extraKeys: {
+          'Cmd-Enter': submitMessage,
+          'Ctrl-Enter': submitMessage,
+          'Tab': function (cm) {
+            mumuki.editor.indentWithSpaces(cm)
+          }
+        }
+      });
+    },
     setupLanguage: function () {
       var language = this.$textarea.data('editor-language');
       if (language === 'dynamic') {
         mumuki.page.dynamicEditors.push(this.editor);
       } else {
-        mumuki.editor.setOption('mode', language);
+        this.editor.setOption('mode', language);
+        this.editor.refresh();
       }
     },
     setupOptions: function (minLines) {

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

@@ -14,6 +14,18 @@ mumuki.load(function () {
   var $subscriptionSpans = $('.discussion-subscription > span');
   var $upvoteSpans = $('.discussion-upvote > span');
 
+  function createNewMessageEditor() {
+    var $textarea = $("#new-discussion-message");
+    var textarea = $textarea[0];
+    if(!textarea) return;
+    var builder = new mumuki.editor.CodeMirrorBuilder(textarea);
+    builder.setupSimpleEditor();
+    builder.setupOptions($textarea.data('lines'));
+    builder.build();
+  }
+
+  createNewMessageEditor();
+
   var Forum = {
     toggleButton: function (spans) {
       spans.toggleClass('hidden');

data/app/assets/stylesheets/application/modules/_discussion.scss

@@ -242,12 +242,31 @@ $moderator-star-color: #dd9900;
 
 .discussion-message-content {
   padding: 15px;
+  p {
+    margin: 0px;
+    white-space: pre-wrap;
+  }
 }
 
 .discussion-new-message-content {
   resize: none;
+  min-height: 150px;
   border-radius: 0;
   border-color: transparent;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  .CodeMirror {
+    border: unset;
+    color: $brand-primary;
+    font-family: $font-family-sans-serif;
+    padding: 15px;
+  }
+  .CodeMirror-wrap,
+  .CodeMirror-scroll {
+    height: auto !important;
+    min-height: 100px !important;
+  }
   &:focus {
     border-color: white;
   }

data/app/controllers/application_controller.rb

@@ -7,6 +7,7 @@ class ApplicationController < ActionController::Base
   include Mumuki::Laboratory::Controllers::Authorization
   include Mumuki::Laboratory::Controllers::Notifications
   include Mumuki::Laboratory::Controllers::DynamicErrors
+  include Mumuki::Laboratory::Controllers::EmbeddedMode
 
   before_action :set_current_organization!
   before_action :set_locale!

data/app/controllers/exercises_controller.rb

@@ -10,6 +10,7 @@ class ExercisesController < ApplicationController
 
   def show
     @solution = @exercise.new_solution if current_user?
+    enable_embedded_rendering
   end
 
   def show_by_slug

data/app/helpers/application_helper.rb

@@ -15,6 +15,10 @@ module ApplicationHelper
     end
   end
 
+  def profile_picture
+    image_tag(@current_user.image_url, height: 40, class: 'img-circle', onError: "this.onerror = null; this.src = '#{image_url('user_shape.png')}'")
+  end
+
   def paginate(object, options={})
     "<div class=\"text-center\">#{super(object, {theme: 'twitter-bootstrap-3'}.merge(options))}</div>".html_safe
   end

data/app/helpers/discussions_helper.rb

@@ -120,8 +120,7 @@ module DiscussionsHelper
     %Q{
       #{status_fa_icon(status)}
       <span>
-        #{discussions_count}
-        #{t status}
+        #{t("#{status}_count", count: discussions_count)}
       </span>
     }.html_safe
   end

data/app/helpers/progress_helper.rb

@@ -1,18 +1,19 @@
 module ProgressHelper
   def lesson_practice_key_for(stats)
-    if stats.try(:started?)
-      :continue_lesson
-    else
-      :start_lesson
-    end
+    key_or_default stats, :started?, :continue_lesson, :start_lesson
   end
 
-  #FIXME refactorme: similar methods
   def book_practice_key_for(student)
-    if student.try(:last_exercise)
-      :continue_practicing
+    key_or_default student, :last_exercise, :continue_practicing, :start_practicing
+  end
+
+  private
+
+  def key_or_default(object, property, key, default_key)
+    if object.try(property)
+      key
     else
-      :start_practicing
+      default_key
     end
   end
 end

data/app/models/assignment.rb

@@ -60,6 +60,10 @@ class Assignment < ApplicationRecord
     end
   end
 
+  def test
+    exercise.test_for submitter
+  end
+
   def extra
     exercise.extra_for submitter
   end
@@ -90,11 +94,15 @@ class Assignment < ApplicationRecord
     update! result: message, submission_status: :errored
   end
 
-  %w(query try tests).each do |key|
+  %w(query try).each do |key|
     name = "run_#{key}!"
     define_method(name) { |params| exercise.send name, params.merge(extra: extra) }
   end
 
+  def run_tests!(params)
+    exercise.run_tests! params.merge(extra: extra, test: test)
+  end
+
   def as_platform_json
     navigable_parent = exercise.navigable_parent
     as_json(except: [:exercise_id, :submission_id, :id, :submitter_id, :solution, :created_at, :updated_at, :submission_status],

data/app/models/concerns/submittable/solvable.rb

@@ -6,11 +6,7 @@ module Solvable
   end
 
   def run_tests!(params)
-    language.run_tests!(
-      params.merge(
-        test: test,
-        locale: locale,
-        expectations: expectations))
+    language.run_tests!(params.merge(locale: locale, expectations: expectations))
   end
 end
 

data/app/models/concerns/with_assignments.rb

@@ -15,7 +15,7 @@ module WithAssignments
       .directives_sections
       .split_sections(assignment_for(user)&.solution || default_content_for(user))
       .except('content')
-      .map { |name, content| struct name: name, content: content }
+      .map { |name, content| Mumuki::Laboratory::File.new name, content }
   end
 
   def interpolate_for(user, field)
@@ -30,6 +30,10 @@ module WithAssignments
     interpolate_for user, extra
   end
 
+  def test_for(user)
+    test && interpolate_for(user, test)
+  end
+
   def replace_content_reference(user, interpolee)
     case interpolee
       when /previousContent|previousSolution/

data/app/models/discussion.rb

@@ -13,6 +13,8 @@ class Discussion < ApplicationRecord
   before_save :capitalize_title
   validates_presence_of :title
 
+  markdown_on :description
+
   sortable :created_at, :upvotes_count, default: :created_at_desc
   filterable :status, :language
   pageable
@@ -43,7 +45,7 @@ class Discussion < ApplicationRecord
   end
 
   def commentable_by?(user)
-    opened? && user.present?
+    user&.moderator? || (opened? && user.present?)
   end
 
   def subscribable?
@@ -110,7 +112,7 @@ class Discussion < ApplicationRecord
   end
 
   def has_messages?
-    messages.exists?
+    messages.exists? || description.present?
   end
 
   def responses_count

data/app/models/submission/submission.rb

@@ -29,6 +29,7 @@ class Submission
   def evaluate!(assignment)
     try_evaluate! assignment
   rescue => e
+    Rails.logger.error "Evaluation failed: #{e} \n#{e.backtrace.join("\n")}"
     {status: :errored, result: e.message}
   end
 

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

@@ -0,0 +1,17 @@
+<%= render layout: 'discussions/message_container', locals: {user: discussion.initiator} do %>
+  <div class="discussion-message-bubble">
+    <div class="discussion-message-bubble-header">
+      <div class="discussion-message-bubble-title">
+        <%= discussion.initiator.name %>
+        <span class="message-date">
+          <%= t(:time_since, time: time_ago_in_words(discussion.created_at)) %>
+        </span>
+      </div>
+    </div>
+    <div class="discussion-message-bubble-content">
+      <div class="discussion-message-content">
+        <%= discussion.description_html %>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -18,7 +18,7 @@
     </div>
     <div class="discussion-message-bubble-content">
       <div class="discussion-message-content">
-        <%= message.content %>
+        <%= message.content_html %>
       </div>
     </div>
   </div>

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

@@ -9,7 +9,9 @@
       <div class="discussion-message-bubble-content">
         <div class="container-fluid">
           <div class="row">
-            <div><%= f.text_area :content, class: 'form-control discussion-new-message-content', placeholder: t(:message), required: true %></div>
+            <div class="discussion-new-message-content">
+              <%= f.editor :content, '', { id: 'new-discussion-message', class: 'form-control', placeholder: t(:message) } %>
+            </div>
           </div>
         </div>
       </div>

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

@@ -56,6 +56,9 @@
 
   <% if @discussion.has_messages? %>
     <div class="discussion-messages">
+      <% if @discussion.description.present? %>
+        <%= render partial: 'discussions/description_message', locals: {discussion: @discussion} %>
+      <% end %>
       <% @discussion.messages.each do |message| %>
         <%= render partial: 'discussions/message', locals: {user: message.sender_user, message: message} %>
       <% end %>

data/app/views/exercise_solutions/_results_button.html.erb

@@ -1,7 +1,9 @@
-<div class="row">
-  <div class="col-md-12">
-    <div class="actions">
-      <%= next_exercise_button(@exercise) %>
+<% if standalone_mode? %>
+  <div class="row">
+    <div class="col-md-12">
+      <div class="actions">
+        <%= next_exercise_button(@exercise) %>
+      </div>
     </div>
   </div>
-</div>
+<% end %>

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

@@ -1,7 +1,7 @@
 <%= render_runner_assets @exercise.language, :layout %>
 
 <%= content_for :breadcrumbs do %>
-    <%= breadcrumbs @exercise %>
+  <%= breadcrumbs @exercise %>
 <% end %>
 
 <%= render partial: 'layouts/authoring', locals: {guide: @guide} %>
@@ -28,7 +28,7 @@
 <% end %>
 
 <div>
-  <% if @stats %>
+  <% if @stats && standalone_mode? %>
       <%= render partial: 'layouts/progress_bar', locals: {actual: @exercise, guide: @exercise.guide, stats: @stats} %>
   <% end %>
 </div>

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

@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="<%= Organization.current.locale %>">
+<head>
+  <title><%= page_title subject %></title>
+  <% unless input_kids? %>
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <% end %>
+
+  <link rel="icon" type="image/x-icon" href="<%= Organization.current.favicon_url %>" data-turbolinks-track="reload">
+  <link rel="stylesheet" type="text/css" href="<%= theme_stylesheet_url %>" data-turbolinks-track="reload">
+
+  <meta property="og:site_name" content="<%= Organization.current.site_name %>" />
+  <meta property="og:title" content="<%= page_title subject %>"/>
+  <meta property="og:description" content="<%= Organization.current.central? ? t(:mumuki_short_description) : Organization.current.description %>"/>
+  <meta property="og:type" content="website"/>
+  <meta property="og:image" content="<%= Organization.current.open_graph_image_url %>"/>
+  <meta property="og:url" content="<%= request.original_url %>"/>
+
+  <meta name="turbolinks-cache-control" content="no-cache">
+
+  <meta name="description" content="<%= t :mumuki_short_description %>"/>
+  <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+  <%= csrf_meta_tags %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+  <script type="text/javascript" src="<%= extension_javascript_url %>" defer data-turbolinks-track="reload"></script>
+  <script type="text/javascript">
+    window.mumukiLocale = <%= raw Organization.current.locale_json %>;
+    mumuki.locale = '<%= Organization.current.locale %>';
+    moment.locale('<%= Organization.current.locale %>');
+  </script>
+  <%= login_form.header_html %>
+</head>
+<body>
+<% if should_choose_organization? %>
+    <%= render partial: 'layouts/organization_chooser' %>
+<% end %>
+
+<%= yield :navbar %>
+
+<div class="<%= exercise_container_type %><%= @kids ? '-fluid' : '' %>" id="wrap">
+  <div id="toast-container" class="toast-bottom-left">
+    <% if notice %>
+      <div class="alert toast toast-success" role="alert">
+        <%= notice.html_safe %>
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+      </div>
+    <% elsif alert %>
+      <div class="alert toast toast-error" role="alert">
+        <%= alert.html_safe %>
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+      </div>
+    <% end %>
+  </div>
+
+  <%= yield %>
+</div>
+
+<%= yield :no_container %>
+
+<%= yield :footer %>
+
+</body>
+</html>

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

@@ -1,59 +1,23 @@
-<!DOCTYPE html>
-<html lang="<%= Organization.current.locale %>">
-<head>
-  <title><%= page_title subject %></title>
-  <% unless input_kids? %>
-      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <% end %>
-
-  <link rel="icon" type="image/x-icon" href="<%= Organization.current.favicon_url %>" data-turbolinks-track="reload">
-  <link rel="stylesheet" type="text/css" href="<%= theme_stylesheet_url %>" data-turbolinks-track="reload">
-
-  <meta property="og:site_name" content="<%= Organization.current.site_name %>" />
-  <meta property="og:title" content="<%= page_title subject %>"/>
-  <meta property="og:description" content="<%= Organization.current.central? ? t(:mumuki_short_description) : Organization.current.description %>"/>
-  <meta property="og:type" content="website"/>
-  <meta property="og:image" content="<%= Organization.current.open_graph_image_url %>"/>
-  <meta property="og:url" content="<%= request.original_url %>"/>
-
-  <meta name="turbolinks-cache-control" content="no-cache">
-
-  <meta name="description" content="<%= t :mumuki_short_description %>"/>
-  <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-  <%= csrf_meta_tags %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
-  <script type="text/javascript" src="<%= extension_javascript_url %>" defer data-turbolinks-track="reload"></script>
-  <script type="text/javascript">
-    window.mumukiLocale = <%= raw Organization.current.locale_json %>;
-    mumuki.locale = '<%= Organization.current.locale %>';
-    moment.locale('<%= Organization.current.locale %>');
-  </script>
-  <%= login_form.header_html %>
-</head>
-<body>
-<% if should_choose_organization? %>
-    <%= render partial: 'layouts/organization_chooser' %>
-<% end %>
-
-<div class="<%= exercise_container_type %>">
-  <nav class="mu-navbar">
-    <div class="mu-navbar-breadcrumb hidden-xs">
-      <ul class="mu-breadcrumb-list">
-        <%= yield :breadcrumbs %>
-      </ul>
-    </div>
-    <div class="dropdown hamburguer-breadcrumb hidden-sm hidden-md hidden-lg">
-      <% if content_for? :breadcrumbs %>
-          <span class="hamburguer" id="profileDropdown" data-toggle="dropdown">
-            <i class="fa fa-bars"></i>
-          </span>
+<%= content_for :navbar do %>
+  <div class="<%= exercise_container_type %>">
+    <nav class="mu-navbar">
+      <div class="mu-navbar-breadcrumb hidden-xs">
+        <ul class="mu-breadcrumb-list">
+          <%= yield :breadcrumbs %>
+        </ul>
+      </div>
+      <div class="dropdown hamburguer-breadcrumb hidden-sm hidden-md hidden-lg">
+        <% if content_for? :breadcrumbs %>
+        <span class="hamburguer" id="profileDropdown" data-toggle="dropdown">
+          <i class="fa fa-bars"></i>
+        </span>
           <ul class="dropdown-menu dropdown-menu-left" aria-labelledby="profileDropdown">
             <%= yield :breadcrumbs %>
           </ul>
-      <% end %>
-    </div>
-    <div class="mu-navbar-avatar">
-      <% if current_user? %>
+        <% end %>
+      </div>
+      <div class="mu-navbar-avatar">
+        <% if current_user? %>
           <div class="dropdown">
             <span>
               <a class="notifications-box <%= has_notifications? ? '' : 'notifications-box-empty' %>" href=<%= "#{user_notifications_path}" %>>
@@ -64,7 +28,7 @@
           </div>
           <div class="dropdown">
             <span id="profileDropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
-              <%= image_tag(current_user.image_url, height: 40, class: 'img-circle') %>
+              <%= profile_picture %>
             </span>
             <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
               <li>
@@ -77,64 +41,45 @@
               <li><%= link_to(t(:sign_out), logout_path(origin: url_for), role: 'menuitem') %></li>
             </ul>
           </div>
-      <% else %>
+        <% else %>
           <%= login_button %>
-      <% end %>
-    </div>
-  </nav>
-</div>
-
-<div class="<%= exercise_container_type %><%= @kids ? '-fluid' : '' %>" id="wrap">
-  <div id="toast-container" class="toast-bottom-left">
-    <% if notice %>
-        <div class="alert toast toast-success" role="alert">
-          <%= notice.html_safe %>
-          <button type="button" class="close" data-dismiss="alert">&times;</button>
-        </div>
-    <% elsif alert %>
-        <div class="alert toast toast-error" role="alert">
-          <%= alert.html_safe %>
-          <button type="button" class="close" data-dismiss="alert">&times;</button>
-        </div>
-    <% end %>
+        <% end %>
+      </div>
+    </nav>
   </div>
+<% end %>
 
-  <%= yield %>
-
-</div>
-
-<%= yield :no_container %>
-
-<footer class="footer">
-  <div class="<%= exercise_container_type %>">
-    <hr>
+<% content_for :footer do %>
+  <footer class="footer">
+    <div class="<%= exercise_container_type %>">
+      <hr>
 
-    <div class="row">
-      <div class="col-md-12">
-        <%= yield :authoring %>
+      <div class="row">
+        <div class="col-md-12">
+          <%= yield :authoring %>
+        </div>
       </div>
-    </div>
 
-    <div id="footer-copyright" class="row">
-      <div class="col-md-4 text-left">
-        <p>&copy; Copyright 2015-<%= DateTime.now.year %>
-          <a href="http://mumuki.org/" class="mu-org-link"><span class="da da-mumuki-circle"></span> Mumuki Project</a>
-        </p>
-      </div>
+      <div id="footer-copyright" class="row">
+        <div class="col-md-4 text-left">
+          <p>&copy; Copyright 2015-<%= DateTime.now.year %>
+            <a href="http://mumuki.org/" class="mu-org-link"><span class="da da-mumuki-circle"></span> Mumuki Project</a>
+          </p>
+        </div>
 
-      <div class="col-md-4 text-center">
-        <%= login_form.footer_html %>
-      </div>
+        <div class="col-md-4 text-center">
+          <%= login_form.footer_html %>
+        </div>
 
-      <div id="footer-social" class="col-md-4 text-right" lang="en">
-        <a class="fa fa-facebook social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiProject" target="_blank"></a>
-        <a class="fa fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/MumukiProject" target="_blank"></a>
-        <a class="fa fa-github social-icon" aria-label="Github" href="https://github.com/mumuki" target="_blank"></a>
-        <a class="fa fa-linkedin social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/mumuki-project" target="_blank"></a>
+        <div id="footer-social" class="col-md-4 text-right" lang="en">
+          <a class="fa fa-facebook social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiProject" target="_blank"></a>
+          <a class="fa fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/MumukiProject" target="_blank"></a>
+          <a class="fa fa-github social-icon" aria-label="Github" href="https://github.com/mumuki" target="_blank"></a>
+          <a class="fa fa-linkedin social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/mumuki-project" target="_blank"></a>
+        </div>
       </div>
-
     </div>
-  </div>
-</footer>
-</body>
-</html>
+  </footer>
+<% end %>
+
+<%= render partial: 'layouts/main' %>

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

@@ -0,0 +1 @@
+<%= render partial: 'layouts/main' %>

data/app/views/layouts/exercise_inputs/editors/_multiple_files.html.erb

@@ -13,7 +13,7 @@
     <div class="tab-content">
       <% @files.each_with_index do |file, index| %>
           <div role="tabpanel" class="tab-pane mu-input-panel <%= 'fade in active' if index == 0 %>" id="editor-file-<%= index %>">
-            <%= form.editor "content[#{file.name}]", 'dynamic',
+            <%= form.editor "content[#{file.name}]", file.highlight_mode,
                             placeholder: t(:editor_placeholder),
                             class: 'form-control editor',
                             value: file.content,

data/lib/mumuki/laboratory.rb

@@ -28,3 +28,4 @@ require_relative './laboratory/exceptions'
 require_relative './laboratory/status'
 require_relative './laboratory/evaluation'
 require_relative './laboratory/controllers'
+require_relative './laboratory/file'

data/lib/mumuki/laboratory/controllers.rb

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

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

@@ -0,0 +1,45 @@
+# This mixin provides support for implementing the
+# embedded mode - as opposed to the standalone mode -in which
+# the mumuki pages
+#
+#  * are displayed used a simplified layout, called `embedded.html.erb`
+#  * are served using `X-Frame-Options` that allow them to be used within
+#    an iframe
+#
+# Not all organizations can be emedded - only those that have the `embeddable?`
+# setting set.
+#
+# This mixin provides two sets of methods:
+#
+# * `embedded_mode?` / `standalone_mode?`, which are helpers aimed to be used by views
+#    and change very specific rendering details in one or the other mode
+# *  `enable_embedded_rendering`, which is designed to be called from main-views controller-methods that
+#     actually support embedded mode.
+module Mumuki::Laboratory::Controllers::EmbeddedMode
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :embedded_mode?,
+                  :standalone_mode?
+  end
+
+  def embedded_mode?
+    @embedded_mode ||= params[:embed] == 'true' && Organization.current.embeddable?
+  end
+
+  def standalone_mode?
+    !embedded_mode?
+  end
+
+  def enable_embedded_rendering
+    return unless embedded_mode?
+    allow_parent_iframe!
+    render layout: 'embedded'
+  end
+
+  private
+
+  def allow_parent_iframe!
+    response.set_header 'X-Frame-Options', 'ALLOWALL'
+  end
+end

data/lib/mumuki/laboratory/extensions/string.rb

@@ -22,4 +22,8 @@ class String
   def normalize_whitespaces
     gsub(/([^[:ascii:]])/) { $1.blank? ? ' ' : $1 }
   end
+
+  def get_file_extension
+    File.extname(self).delete '.'
+  end
 end

data/lib/mumuki/laboratory/file.rb

@@ -0,0 +1,18 @@
+module Mumuki::Laboratory
+  class File
+    attr_reader :name, :content
+
+    def initialize(name, content)
+      @name = name
+      @content = content
+    end
+
+    def highlight_mode
+      Language.find_by(extension: extension)&.highlight_mode || extension
+    end
+
+    def extension
+      name.get_file_extension
+    end
+  end
+end

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

@@ -27,6 +27,7 @@ en:
   classroom: Classroom
   clear_console: Clear console
   closed: Closed
+  closed_count: '%{count} closed'
   created_at_asc: Oldest
   created_at_desc: Newest
   comment: Comment
@@ -138,6 +139,7 @@ en:
   notify_problem_with_exercise: Report a bug
   office: Office
   opened: Open
+  opened_count: '%{count} opened'
   output: Output
   overview: Overview
   passed: Everything is in order! Your solution passed all our tests!
@@ -145,7 +147,8 @@ en:
   pending: pending
   pending_messages: You have unread messages
   pending_messages_explanation: You can't send new solutions until you read pending messages
-  Pending_review: Pending review
+  pending_review: Pending review
+  pending_review_count: '%{count} for review'
   permissions: Permissions
   please_fill_profile_data: Please complete your profile data to continue!
   please_validate: 'Please validate your data before continue:'
@@ -172,6 +175,7 @@ en:
   sign_up_date: User since
   solution: Solution
   solved: Solved
+  solved_count: '%{count} solved'
   solve_doubts: Solve other's doubts
   solve_your_doubts: Solve your doubts
   solve_your_doubts_teaser: Do you have any doubts?

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

@@ -28,6 +28,9 @@ es:
   classroom: Aula
   clear_console: Reiniciar consola
   closed: Cerrada
+  closed_count:
+    one: 1 cerrada
+    other: '%{count} cerradas'
   created_at_asc: Antiguas
   created_at_desc: Nuevas
   comment: Comentar
@@ -151,6 +154,9 @@ es:
   notify_problem_with_exercise: Reportá un bug
   office: Secretaría
   opened: Abierta
+  opened_count:
+    one: '1 abierta'
+    other: '%{count} abiertas'
   organizations: Organizaciones
   output: Salida
   overview: Vista general
@@ -158,6 +164,7 @@ es:
   passed_with_warnings: Tu solución funcionó, pero hay cosas que mejorar
   pending: pendiente
   pending_review: En revisión
+  pending_review_count: '%{count} en revisión'
   pending_messages: Tenés mensajes sin leer
   pending_messages_explanation: "¡Tu docente te dejó un mensaje! Revisalo antes de seguir enviando soluciones."
   permissions: Permisos
@@ -188,6 +195,9 @@ es:
   sign_up_date: Usuario desde
   solution: Solución
   solved: Resuelta
+  solved_count:
+    one: 1 resuelta
+    other: '%{count} resueltas'
   solved_exercises: Ejercicios Resueltos
   solve_doubts: Resolvé consultas
   solve_your_doubts: Consultá tus dudas

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

@@ -27,6 +27,7 @@ pt:
   classroom: Sala de aula
   clear_console: Reiniciar o console
   closed: Fechado
+  closed_count: '%{count} fechado'
   comment: Comentar
   confirm: Confirme
   confirm_restart: Você está prestes a apagar o seu progresso neste guia. Você quer continuar?
@@ -148,6 +149,7 @@ pt:
   notify_problem_with_exercise: Relatar um erro
   office: Secretariado
   opened: Aberto
+  opened_count: '%{count} aberto'
   organizations: Organizações
   output: Sair
   overview: Visão global
@@ -157,6 +159,7 @@ pt:
   pending_messages: Você tem mensagens não lidas
   pending_messages_explanation: Seu professor deixou uma mensagem para você! Verifique antes de continuar a enviar soluções.
   pending_review: Sendo revisto
+  pending_review_count: '%{count} sendo revisto'
   permissions: Permissões
   please_fill_profile_data: Preencha suas informações pessoais para continuar!
   please_validate: Você está prestes a entrar no curso. Para oferecer uma experiência melhor, valide que seus dados abaixo sejam reais e corretos.
@@ -185,6 +188,7 @@ pt:
   sign_up_date: Usuário de
   solution: Solução
   solved: Resolvido
+  solved_count: '%{count} resolvido'
   solved_exercises: Exercícios resolvidos
   solve_doubts: Resolvi dúvidas
   solve_your_doubts: Consulte suas dúvidas

data/lib/mumuki/laboratory/status/discussion/opened.rb

@@ -13,8 +13,12 @@ module Mumuki::Laboratory::Status::Discussion::Opened
     end
   end
 
-  def self.reachable_statuses_for_moderator(_)
-    [Mumuki::Laboratory::Status::Discussion::Closed, Mumuki::Laboratory::Status::Discussion::Solved]
+  def self.reachable_statuses_for_moderator(discussion)
+    if discussion.has_responses?
+      [Mumuki::Laboratory::Status::Discussion::Closed, Mumuki::Laboratory::Status::Discussion::Solved]
+    else
+      [Mumuki::Laboratory::Status::Discussion::Closed]
+    end
   end
 
   def self.iconize

data/lib/mumuki/laboratory/status/discussion/pending_review.rb

@@ -6,7 +6,7 @@ module Mumuki::Laboratory::Status::Discussion::PendingReview
   end
 
   def self.reachable_statuses_for_moderator(*)
-    [Mumuki::Laboratory::Status::Discussion::Closed, Mumuki::Laboratory::Status::Discussion::Solved]
+    [Mumuki::Laboratory::Status::Discussion::Opened, Mumuki::Laboratory::Status::Discussion::Closed, Mumuki::Laboratory::Status::Discussion::Solved]
   end
 
   def self.iconize

data/lib/mumuki/laboratory/status/discussion/solved.rb

@@ -6,7 +6,7 @@ module Mumuki::Laboratory::Status::Discussion::Solved
   end
 
   def self.reachable_statuses_for_moderator(*)
-    [Mumuki::Laboratory::Status::Discussion::Closed]
+    [Mumuki::Laboratory::Status::Discussion::Opened, Mumuki::Laboratory::Status::Discussion::Closed]
   end
 
   def self.iconize

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.6.3'
+    VERSION = '5.7.0'
   end
 end

data/spec/controllers/exercise_solutions_controller_spec.rb

@@ -20,10 +20,19 @@ describe ExerciseSolutionsController, organization_workspace: :test do
   end
 
   context 'when multifile content is sent' do
-    before { post :create, params: { exercise_id: problem.id, solution: { content: { a_file: 'a content' } } } }
+    before { create(:language, extension: 'js', highlight_mode: 'javascript') }
+    before { post :create, params: { exercise_id: problem.id, solution: { content: {
+      'a_file.css' => 'a css content',
+      'a_file.js' => 'a js content'
+    } } } }
+    let(:files) { problem.files_for(user) }
 
     it { expect(response.status).to eq 200 }
-    it { expect(Assignment.last.solution).to eq("/*<a_file#*/a content/*#a_file>*/\n/*<content#*//*...a_file...*//*#content>*/") }
-    it { expect(problem.files_for(user)).to eq [struct(name: 'a_file', content: 'a content')] }
+    it { expect(Assignment.last.solution).to eq("/*<a_file.css#*/a css content/*#a_file.css>*/\n/*<a_file.js#*/a js content/*#a_file.js>*/\n/*<content#*//*...a_file.css...*/\n/*...a_file.js...*//*#content>*/") }
+    it { expect(files.count).to eq 2 }
+    it { expect(files[0]).to have_attributes(name: 'a_file.css', content: 'a css content') }
+    it { expect(files[0].highlight_mode).to eq 'css' }
+    it { expect(files[1]).to have_attributes(name: 'a_file.js', content: 'a js content') }
+    it { expect(files[1].highlight_mode).to eq 'javascript' }
   end
 end

data/spec/features/exercise_flow_spec.rb

@@ -91,6 +91,27 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('Description of Succ1')
     end
 
+    describe 'embedded mode' do
+      scenario 'visit exercise by id, standalone mode' do
+        visit "/exercises/#{problem_1.id}"
+        expect(page).to have_text('Functional Programming 1')
+        expect(page).to have_text('Profile')
+      end
+      scenario 'visit exercise by id, embedded mode in non embeddable organization' do
+        visit "/exercises/#{problem_1.id}?embed=true"
+        expect(page).to have_text('Functional Programming 1')
+        expect(page).to have_text('Profile')
+      end
+      scenario 'visit exercise by id, embedded mode in embeddable organization' do
+        Organization.current.tap { |it| it.embeddable = true }.save!
+
+        visit "/exercises/#{problem_1.id}?embed=true"
+        expect(page).to_not have_text('Functional Programming 1')
+        expect(page).to_not have_text('Profile')
+      end
+    end
+
+
     scenario 'visit exercise by id, editor right layout' do
       visit "/exercises/#{problem_1.id}"
 

data/spec/models/discussion_spec.rb

@@ -18,8 +18,10 @@ describe Discussion, organization_workspace: :test do
     it { expect(initiator.subscribed_to? discussion).to be true }
     it { expect(discussion.status).to eq :opened }
     it { expect(discussion.reachable_statuses_for initiator).to eq [:closed] }
-    it { expect(discussion.reachable_statuses_for moderator).to eq [:closed, :solved] }
+    it { expect(discussion.reachable_statuses_for moderator).to eq [:closed] }
     it { expect(discussion.reachable_statuses_for student).to eq [] }
+    it { expect(discussion.commentable_by? student).to be true }
+    it { expect(discussion.commentable_by? moderator).to be true }
 
     describe 'initiator sends a message' do
       before { discussion.submit_message!({content: 'I forgot to say this'}, initiator)  }
@@ -28,7 +30,7 @@ describe Discussion, organization_workspace: :test do
       it { expect(discussion.messages.first.content).to eq 'I forgot to say this' }
       it { expect(initiator.unread_discussions).to eq [] }
       it { expect(discussion.reachable_statuses_for initiator).to eq [:closed] }
-      it { expect(discussion.reachable_statuses_for moderator).to eq [:closed, :solved] }
+      it { expect(discussion.reachable_statuses_for moderator).to eq [:closed] }
       it { expect(discussion.reachable_statuses_for student).to eq [] }
 
       describe 'and closes the discussion' do
@@ -38,6 +40,8 @@ describe Discussion, organization_workspace: :test do
         it { expect(discussion.reachable_statuses_for initiator).to eq [] }
         it { expect(discussion.reachable_statuses_for moderator).to eq [:opened, :solved] }
         it { expect(discussion.reachable_statuses_for student).to eq [] }
+        it { expect(discussion.commentable_by? student).to be false }
+        it { expect(discussion.commentable_by? moderator).to be true }
       end
     end
 
@@ -56,8 +60,10 @@ describe Discussion, organization_workspace: :test do
 
         it { expect(discussion.status).to eq :pending_review }
         it { expect(discussion.reachable_statuses_for initiator).to eq [] }
-        it { expect(discussion.reachable_statuses_for moderator).to eq [:closed, :solved] }
+        it { expect(discussion.reachable_statuses_for moderator).to eq [:opened, :closed, :solved] }
         it { expect(discussion.reachable_statuses_for student).to eq [] }
+        it { expect(discussion.commentable_by? student).to be false }
+        it { expect(discussion.commentable_by? moderator).to be true }
       end
 
       describe 'initiator tries to solve it' do
@@ -69,8 +75,10 @@ describe Discussion, organization_workspace: :test do
 
         it { expect(discussion.status).to eq :solved }
         it { expect(discussion.reachable_statuses_for initiator).to eq [] }
-        it { expect(discussion.reachable_statuses_for moderator).to eq [:closed] }
+        it { expect(discussion.reachable_statuses_for moderator).to eq [:opened, :closed] }
         it { expect(discussion.reachable_statuses_for student).to eq [] }
+        it { expect(discussion.commentable_by? student).to be false }
+        it { expect(discussion.commentable_by? moderator).to be true }
       end
     end
   end

data/spec/models/exercise_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Exercise, organization_workspace: :test do
   let(:exercise) { create(:exercise) }
-  let(:user) { create(:user) }
+  let(:user) { create(:user, first_name: 'Orlo') }
 
   describe '#slug' do
     let(:guide) { create(:guide, slug: 'foo/bar') }
@@ -274,6 +274,20 @@ describe Exercise, organization_workspace: :test do
           end
         end
       end
+      context 'when interpolation is in test' do
+        context 'using user_first_name'  do
+          let(:exercise) { create(:exercise, test: "<div>Hola #{interpolation}</div>") }
+          let(:interpolation) { '/*...user_first_name...*/' }
+
+          it { expect(exercise.test_for(user)).to eq "<div>Hola Orlo</div>" }
+        end
+
+        context 'and test is nil'  do
+          let(:exercise) { create(:exercise, test: nil, expectations: [{}]) }
+
+          it { expect(exercise.test_for(user)).to eq nil }
+        end
+      end
       context 'when interpolation is in extra' do
         describe 'right previous content' do
           let(:exercise) { create(:exercise, extra: interpolation) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 5.6.3
+  version: 5.7.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement
@@ -460,6 +460,7 @@ files:
 - app/views/book_discussions/index.html.erb
 - app/views/chapters/show.html.erb
 - app/views/complements/show.html.erb
+- app/views/discussions/_description_message.html.erb
 - app/views/discussions/_message.html.erb
 - app/views/discussions/_message_container.html.erb
 - app/views/discussions/_new_message.html.erb
@@ -488,6 +489,7 @@ files:
 - app/views/layouts/_error.html.erb
 - app/views/layouts/_guide.html.erb
 - app/views/layouts/_kids.html.erb
+- app/views/layouts/_main.html.erb
 - app/views/layouts/_messages.html.erb
 - app/views/layouts/_organization_chooser.html.erb
 - app/views/layouts/_organizations_listing.html.erb
@@ -500,6 +502,7 @@ files:
 - app/views/layouts/_test_results.html.erb
 - app/views/layouts/_timer.html.erb
 - app/views/layouts/application.html.erb
+- app/views/layouts/embedded.html.erb
 - app/views/layouts/exercise_inputs/editors/_code.html.erb
 - app/views/layouts/exercise_inputs/editors/_custom.html.erb
 - app/views/layouts/exercise_inputs/editors/_hidden.html.erb
@@ -796,6 +799,7 @@ files:
 - lib/mumuki/laboratory/controllers/content.rb
 - lib/mumuki/laboratory/controllers/current_organization.rb
 - lib/mumuki/laboratory/controllers/dynamic_errors.rb
+- lib/mumuki/laboratory/controllers/embedded_mode.rb
 - lib/mumuki/laboratory/controllers/exercise_seed.rb
 - lib/mumuki/laboratory/controllers/nested_in_exercise.rb
 - lib/mumuki/laboratory/controllers/notifications.rb
@@ -813,6 +817,7 @@ files:
 - lib/mumuki/laboratory/extensions/array.rb
 - lib/mumuki/laboratory/extensions/request.rb
 - lib/mumuki/laboratory/extensions/string.rb
+- lib/mumuki/laboratory/file.rb
 - lib/mumuki/laboratory/locales/activerecord.en.yml
 - lib/mumuki/laboratory/locales/activerecord.es.yml
 - lib/mumuki/laboratory/locales/datetime.es.yml