mumuki-laboratory 9.15.0 → 9.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67dd086ce64c96505cea38bf9fdf857f304acd8322d91e4c139e0a847e89ce46
-  data.tar.gz: 48b771a27f10a159b4b10e38e88cee08f4f032969fbe7a533d188dd4f50cc0b5
+  metadata.gz: '0973e0c9ab8333b9b2f4207d9cc40e3c88199c67fcee8f35415b802d0494a85a'
+  data.tar.gz: 7a7c28856ecb1751c25a053fe0db0eaf0607a8c1dbaa22c70071eeb26617d2ba
 SHA512:
-  metadata.gz: a28dd46787bfb3b9fb50ab7ae7b6d1421e8abb5ec9b0f4f9c20bc4af62da0a5343c6a0973ebad6073af95f66178c49d0f4cccac36f11e1ce6245a23e4527143c
-  data.tar.gz: 3ba41f5eee2cdd908ecedbe5694de3738715f99a2c3e6c6e17d0049d2224f74be08fbbcf72b4910a4e4a7c440e05e2b87130466055919ba1b0b704d15ed29688
+  metadata.gz: 9db401ba5aa815447c273ab82597ee16c98cd0d13ca5f68720f3190114fa69f40f9195ac479d5f4fc234ef3cdfcc7fe7c2e11c8b6d2cd59a9be9194b596d2096
+  data.tar.gz: b06e42055b04fa8116ce5053e842d63a6c56e8a38c1c38d8b3ed2c23688ae0f0925f8208ece9c765d8987d0f3e6963cb8dcc8faa5ab11dc4e544c95af444d4a3

data/app/controllers/ajax_controller.rb

@@ -9,6 +9,6 @@ class AjaxController < ApplicationController
   end
 
   def validate_organization_enabled!
-    Organization.current.validate_enabled!
+    Organization.current.validate_enabled! unless current_user&.teacher_here?
   end
 end

data/app/controllers/application_controller.rb

@@ -19,11 +19,11 @@ class ApplicationController < ActionController::Base
   before_action :set_time_zone!
 
   before_action :ensure_user_enabled!, if: :current_user?
-
   before_action :redirect_to_proper_context!, if: :immersive_context_wrong?
-  before_action :validate_active_organization!
 
   before_action :authorize_if_private!
+  before_action :validate_active_organization!
+
   before_action :validate_user_profile!, if: :current_user?
   before_action :validate_accepted_role_terms!, if: :current_user?
   before_action :ensure_restore_progress!, if: :current_user?

data/app/helpers/discussions_helper.rb

@@ -184,7 +184,10 @@ module DiscussionsHelper
   end
 
   def discussion_info(discussion)
-    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:reply_count, count: discussion.visible_messages.size)}"
+    <<~HTML.html_safe
+      <span>#{friendly_time(discussion.created_at, :time_since)}</span>
+      <span> · #{t(:reply_count, count: discussion.visible_messages.size)}</span>
+    HTML
   end
 
   def discussion_filter_params_without_page

data/app/helpers/editor_helper.rb

@@ -8,7 +8,7 @@ module EditorHelper
 
   def read_only_editor(content, language, options = {})
     editor_options = editor_defaults(language, options.deep_merge(data: { readonly: true }), 'editor')
-    text_area_tag :solution_content, content, editor_options
+    text_area_tag 'solution[content]', content, editor_options
   end
 
   def spell_checked_editor(name, options = {})

data/app/helpers/time_helper.rb

@@ -0,0 +1,12 @@
+module TimeHelper
+  def friendly_time(time, t_key = nil)
+    friendly_time = time_ago_in_words time
+    friendly_time_t = t_key ? t(t_key, time: friendly_time) : friendly_time
+
+    <<~HTML.html_safe
+      <time title="#{time}">
+        #{friendly_time_t}
+      </time>
+    HTML
+  end
+end

data/app/helpers/user_discussions_helper.rb

@@ -1,6 +1,6 @@
 module UserDiscussionsHelper
   def user_discussions_table_title(discussion, user, last_read)
-    %Q{
+    <<~HTML.html_safe
       <tr></tr>
       <thead>
         <tr>
@@ -9,30 +9,30 @@ module UserDiscussionsHelper
           </td>
         </tr>
       </thead>
-    }.html_safe
+    HTML
   end
 
   def user_discussions_table_header
-    %Q{
+    <<~HTML.html_safe
       <tr class="fw-bold">
         <td></td>
         <td>#{t(:exercise)}</td>
         <td>#{t(:discussion_created_by)}</td>
         <td>#{t(:last_message)}</td>
       </tr>
-    }.html_safe
+    HTML
   end
 
   def user_discussions_table_item(discussion, user)
-    %Q{
+    <<~HTML.html_safe
       <tr>
         <td class="text-center">
           #{icon_for_read(discussion.read_by?(user))}
         </td>
         <td>#{link_to discussion.item.name, item_discussion_path(discussion)}</td>
         <td>#{discussion_user_name discussion.initiator}</td>
-        <td>#{t(:time_since, time: time_ago_in_words(discussion.last_message_date))}</td>
+        <td>#{friendly_time(discussion.last_message_date, :time_since)}</td>
       </tr>
-    }.html_safe
+    HTML
   end
 end

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

@@ -4,7 +4,7 @@
       <div class="discussion-message-bubble-title">
         <%= linked_discussion_user_name(discussion.initiator) %>
         <span class="message-date">
-          <%= t(:time_since, time: time_ago_in_words(discussion.created_at)) %>
+          <%= friendly_time(discussion.created_at, :time_since) %>
         </span>
       </div>
     </div>

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

@@ -7,7 +7,7 @@
           <span class="moderator-badge"><%= t(:moderation) %></span>
         <% end %>
         <span class="message-date">
-          <%= t(:time_since, time: time_ago_in_words(message.created_at)) %>
+          <%= friendly_time(message.created_at, :time_since) %>
         </span>
         <span class="actions">
           <% if message.authorized?(current_user) && !message.deleted? %>
@@ -47,7 +47,7 @@
           <% if current_user&.moderator_here? %>
             <hr>
             <%= t :deleted_by, deleter: message.deleted_by.name %>
-            <%= t(:time_since, time: time_ago_in_words(message.deleted_at)) %>.
+            <%= friendly_time(message.deleted_at, :time_since) %>
             <a href='<%= "#deletedMessage#{message.id}" %>' data-bs-toggle="collapse">
               <%= t :show_message %>
             </a>

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

@@ -26,7 +26,7 @@
           </span>
           <span class="discussion-initiator">
             <strong><%= discussion_user_name discussion.initiator %></strong>
-            <%= t(:asked_time_since, time: time_ago_in_words(discussion.created_at)) %>
+            <%= friendly_time(discussion.created_at, :asked_time_since) %>
             <span class="discussion-status-icon">
               <%= discussion_status_fa_icon(discussion) %>
             </span>

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

@@ -6,7 +6,7 @@
             <div class="message">
               <p> <%= message.content_html %></p>
               <div class="sender"><%= message.sender unless message.sender == current_user_uid %></div>
-              <time><%= time_ago_in_words message.created_at %></time>
+              <%= friendly_time(message.created_at) %>
             </div>
           </li>
       <% end %>

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

@@ -31,7 +31,7 @@
       <span> <strong><%= t :email %>:</strong> <%= @user.email %> </span>
     </div>
     <div>
-      <span> <strong><%= t :programming_since %>:</strong> <%= t(:time_since, time: time_ago_in_words(@user.created_at)) %> </span>
+      <span> <strong><%= t :programming_since %>:</strong> <%= friendly_time(@user.created_at, :time_since) %> </span>
     </div>
   </div>
 </div>

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

@@ -20,7 +20,7 @@
             <td><%= icon_for_read(message.read?) %></td>
             <td><%= link_to message.exercise.name, exercise_path(message.exercise.id) %></td>
             <td><%= mail_to message.sender %></td>
-            <td><%= time_ago_in_words message.created_at %></td>
+            <td><%= friendly_time(message.created_at) %></td>
           </tr>
         <% end %>
       </table>

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

@@ -38,7 +38,7 @@
                 <%= render partial: "notifications/#{notification.subject}", locals: { notification: notification } %>
               </td>
               <td class="col-md-3">
-                <%= t(:time_since, time: time_ago_in_words(notification.created_at)) %>
+                <%= friendly_time(notification.created_at, :time_since) %>
               </td>
             </tr>
           <% end %>

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.15.0'
+    VERSION = '9.16.0'
   end
 end

data/spec/features/not_found_private_flow_spec.rb

@@ -30,7 +30,7 @@ feature 'not found private on app', organization_workspace: :base do
     expect(page.text).to json_eq errors: [
       'The operation on organization base' +
       ' was forbidden to user foo+1@bar.com' +
-      ' with permissions !student:central/*;teacher:;headmaster:;janitor:;admin:;owner:;ex_student:']
+      ' with permissions !student:central/*;teacher:;headmaster:;janitor:;admin:;owner:']
   end
 
   scenario 'api with authentication', :json_eq_error do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.15.0
+  version: 9.16.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.15.0
+        version: 9.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.15.0
+        version: 9.16.0
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -567,6 +567,7 @@ files:
 - app/helpers/progress_bar_helper.rb
 - app/helpers/progress_helper.rb
 - app/helpers/runner_assets_helper.rb
+- app/helpers/time_helper.rb
 - app/helpers/time_zone_helper.rb
 - app/helpers/toast_helper.rb
 - app/helpers/user_activity_helper.rb
@@ -980,135 +981,135 @@ signing_key:
 specification_version: 4
 summary: Code assement web application for the Mumuki Platform.
 test_files:
-- spec/evaluation_helper.rb
-- spec/api_helper.rb
-- spec/features/exams_flow_spec.rb
-- spec/features/standard_flow_spec.rb
-- spec/features/guides_flow_spec.rb
-- spec/features/dynamic_exam_spec.rb
-- spec/features/disabled_organization_flow_spec.rb
-- spec/features/user_activity_flow_spec.rb
+- spec/features/disable_user_flow_spec.rb
+- spec/features/exercise_flow_spec.rb
+- spec/features/certificate_programs_flow_spec.rb
+- spec/features/progressive_tips_spec.rb
+- spec/features/runner_assets_spec.rb
+- spec/features/guide_reset_spec.rb
 - spec/features/home_public_flow_spec.rb
+- spec/features/links_flow_spec.rb
+- spec/features/not_found_private_flow_spec.rb
+- spec/features/dynamic_exam_spec.rb
+- spec/features/chapters_flow_spec.rb
 - spec/features/read_only_flow_spec.rb
+- spec/features/discussion_flow_spec.rb
+- spec/features/complements_flow_spec.rb
+- spec/features/standard_flow_spec.rb
+- spec/features/user_activity_flow_spec.rb
+- spec/features/invitations_flow_spec.rb
 - spec/features/home_private_flow_spec.rb
-- spec/features/immersive_redirection_spec.rb
-- spec/features/progressive_tips_spec.rb
+- spec/features/exams_flow_spec.rb
+- spec/features/topic_flow_spec.rb
 - spec/features/login_flow_spec.rb
-- spec/features/exercise_flow_spec.rb
-- spec/features/disable_user_flow_spec.rb
-- spec/features/menu_bar_spec.rb
-- spec/features/not_found_private_flow_spec.rb
-- spec/features/guide_reset_spec.rb
-- spec/features/notifications_flow_spec.rb
+- spec/features/not_found_public_flow_spec.rb
+- spec/features/immersive_redirection_spec.rb
+- spec/features/disabled_organization_flow_spec.rb
 - spec/features/lessons_flow_spec.rb
-- spec/features/chapters_flow_spec.rb
+- spec/features/guides_flow_spec.rb
+- spec/features/notifications_flow_spec.rb
+- spec/features/menu_bar_spec.rb
 - spec/features/profile_flow_spec.rb
-- spec/features/complements_flow_spec.rb
-- spec/features/not_found_public_flow_spec.rb
-- spec/features/certificate_programs_flow_spec.rb
-- spec/features/topic_flow_spec.rb
-- spec/features/links_flow_spec.rb
-- spec/features/runner_assets_spec.rb
-- spec/features/invitations_flow_spec.rb
-- spec/features/discussion_flow_spec.rb
 - spec/features/terms_flow_spec.rb
-- spec/capybara_helper.rb
+- spec/javascripts/results-renderers-spec.js
+- spec/javascripts/i18n-spec.js
 - spec/javascripts/gamification-spec.js
-- spec/javascripts/upload-spec.js
+- spec/javascripts/global-spec.js
+- spec/javascripts/elipsis-spec.js
+- spec/javascripts/kids-button-spec.js
+- spec/javascripts/sync-mode-spec.js
+- spec/javascripts/spec-helper.js
 - spec/javascripts/timer-spec.js
+- spec/javascripts/csrf-token-spec.js
+- spec/javascripts/submissions-store-spec.js
 - spec/javascripts/timeout-spec.js
-- spec/javascripts/elipsis-spec.js
 - spec/javascripts/editors-spec.js
 - spec/javascripts/speech-bubble-renderer-spec.js
-- spec/javascripts/results-renderers-spec.js
-- spec/javascripts/sync-mode-spec.js
-- spec/javascripts/i18n-spec.js
-- spec/javascripts/submissions-store-spec.js
-- spec/javascripts/kids-button-spec.js
+- spec/javascripts/upload-spec.js
 - spec/javascripts/exercise-spec.js
-- spec/javascripts/global-spec.js
-- spec/javascripts/bridge-spec.js
 - spec/javascripts/events-spec.js
-- spec/javascripts/spec-helper.js
-- spec/javascripts/csrf-token-spec.js
-- spec/login_helper.rb
+- spec/javascripts/bridge-spec.js
 - spec/spec_helper.rb
-- spec/controllers/exam_authorization_requests_controller_spec.rb
-- spec/controllers/api_clients_controller.rb
-- spec/controllers/exercise_solutions_controller_spec.rb
-- spec/controllers/discussions_controller_spec.rb
-- spec/controllers/exam_registrations_controller_spec.rb
-- spec/controllers/organizations_api_controller_spec.rb
-- spec/controllers/certificates_controller_spec.rb
-- spec/controllers/discussions_messages_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
-- spec/controllers/invitations_controller_spec.rb
-- spec/controllers/guide_progress_controller_spec.rb
-- spec/controllers/users_api_controller_spec.rb
-- spec/controllers/students_api_controller_spec.rb
-- spec/controllers/confirmations_controller_spec.rb
-- spec/controllers/messages_controller_spec.rb
-- spec/controllers/chapters_controller_spec.rb
-- spec/controllers/courses_api_controller_spec.rb
-- spec/mailers/user_mailer_spec.rb
-- spec/mailers/previews/user_mailer_preview.rb
 - spec/teaspoon_env.rb
-- spec/dummy/bin/update
-- spec/dummy/bin/yarn
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/bin/setup
-- spec/dummy/bin/rails
-- spec/dummy/config/cable.yml
-- spec/dummy/config/boot.rb
-- spec/dummy/config/secrets.yml
+- spec/evaluation_helper.rb
+- spec/dummy/public/medal/outline.svg
+- spec/dummy/public/error/404.svg
+- spec/dummy/public/error/500.svg
+- spec/dummy/public/error/timeout_3.svg
+- spec/dummy/public/error/timeout_1.svg
+- spec/dummy/public/error/timeout_2.svg
+- spec/dummy/public/error/401.svg
+- spec/dummy/public/error/403.svg
+- spec/dummy/public/error/410.svg
+- spec/dummy/public/character/animations.json
+- spec/dummy/public/character/magnifying_glass/apparition.svg
+- spec/dummy/public/character/magnifying_glass/loop.svg
+- spec/dummy/public/character/kibi/failure.svg
+- spec/dummy/public/character/kibi/context.svg
+- spec/dummy/public/character/kibi/passed_with_warnings.svg
+- spec/dummy/public/character/kibi/jump.svg
+- spec/dummy/public/character/kibi/success_l.svg
+- spec/dummy/public/character/kibi/success2_l.svg
+- spec/dummy/Rakefile
+- spec/dummy/config/application.rb
+- spec/dummy/config/puma.rb
+- spec/dummy/config/spring.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/environments/development.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/database.yml
 - spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/spring.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/rabbit.yml
-- spec/dummy/config/puma.rb
-- spec/dummy/Rakefile
-- spec/dummy/db/schema.rb
-- spec/dummy/db/seeds.rb
-- spec/dummy/public/character/kibi/success_l.svg
-- spec/dummy/public/character/kibi/failure.svg
-- spec/dummy/public/character/kibi/context.svg
-- spec/dummy/public/character/kibi/jump.svg
-- spec/dummy/public/character/kibi/success2_l.svg
-- spec/dummy/public/character/kibi/passed_with_warnings.svg
-- spec/dummy/public/character/animations.json
-- spec/dummy/public/character/magnifying_glass/loop.svg
-- spec/dummy/public/character/magnifying_glass/apparition.svg
-- spec/dummy/public/medal/outline.svg
-- spec/dummy/public/error/timeout_2.svg
-- spec/dummy/public/error/410.svg
-- spec/dummy/public/error/timeout_3.svg
-- spec/dummy/public/error/500.svg
-- spec/dummy/public/error/403.svg
-- spec/dummy/public/error/timeout_1.svg
-- spec/dummy/public/error/404.svg
-- spec/dummy/public/error/401.svg
-- spec/dummy/config.ru
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/cable.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/package.json
-- spec/helpers/with_choices_spec.rb
-- spec/helpers/email_helper_spec.rb
+- spec/dummy/config.ru
+- spec/dummy/db/seeds.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/bin/yarn
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/bundle
+- spec/dummy/bin/setup
+- spec/dummy/bin/update
+- spec/controllers/certificates_controller_spec.rb
+- spec/controllers/students_api_controller_spec.rb
+- spec/controllers/api_clients_controller.rb
+- spec/controllers/organizations_api_controller_spec.rb
+- spec/controllers/exam_authorization_requests_controller_spec.rb
+- spec/controllers/confirmations_controller_spec.rb
+- spec/controllers/exam_registrations_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/controllers/exercise_solutions_controller_spec.rb
+- spec/controllers/discussions_controller_spec.rb
+- spec/controllers/courses_api_controller_spec.rb
+- spec/controllers/discussions_messages_controller_spec.rb
+- spec/controllers/users_api_controller_spec.rb
+- spec/controllers/messages_controller_spec.rb
+- spec/controllers/invitations_controller_spec.rb
+- spec/controllers/guide_progress_controller_spec.rb
+- spec/controllers/chapters_controller_spec.rb
+- spec/login_helper.rb
+- spec/mailers/previews/user_mailer_preview.rb
+- spec/mailers/user_mailer_spec.rb
+- spec/capybara_helper.rb
+- spec/helpers/icons_helper_spec.rb
+- spec/helpers/certificate_helper_spec.rb
 - spec/helpers/test_results_rendering_spec.rb
-- spec/helpers/authors_helper_spec.rb
+- spec/helpers/avatar_helper_spec.rb
+- spec/helpers/exercise_input_helper_spec.rb
 - spec/helpers/with_navigation_spec.rb
-- spec/helpers/certificate_helper_spec.rb
-- spec/helpers/page_title_helper_spec.rb
+- spec/helpers/email_helper_spec.rb
 - spec/helpers/user_activity_helper_spec.rb
-- spec/helpers/application_helper_spec.rb
+- spec/helpers/with_choices_spec.rb
 - spec/helpers/breadcrumbs_helper_spec.rb
-- spec/helpers/icons_helper_spec.rb
-- spec/helpers/exercise_input_helper_spec.rb
-- spec/helpers/avatar_helper_spec.rb
+- spec/helpers/page_title_helper_spec.rb
+- spec/helpers/application_helper_spec.rb
+- spec/helpers/authors_helper_spec.rb
+- spec/api_helper.rb