mumuki-laboratory 5.0.12 → 5.1.0

data/app/controllers/concerns/users_controller_template.rb

@@ -0,0 +1,28 @@
+module UsersControllerTemplate
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_user!, only: [:show, :update]
+    before_action :set_new_user!, only: :create
+    before_action :protect_permissions_assignment!, only: [:create, :update]
+  end
+
+  private
+
+  def protect_permissions_assignment!
+    current_user.protect_permissions_assignment! user_params[:permissions], @user.permissions
+  end
+
+  def user_params
+    params.require(:user).permit(:first_name, :last_name, :email, :image_url, permissions: Mumukit::Auth::Roles::ROLES)
+  end
+
+  def set_user!
+    @user = User.find_by uid: params[:id]
+  end
+
+  def set_new_user!
+    @user = User.new user_params
+  end
+
+end

data/app/controllers/concerns/with_api_errors.rb

@@ -0,0 +1,37 @@
+module WithApiErrors
+  # TODO we should extend DynamiceErrors
+  extend ActiveSupport::Concern
+
+  included do
+    unless Rails.application.config.consider_all_requests_local
+      rescue_from ActionController::RoutingError, with: :not_found!
+    end
+
+    rescue_from ActiveRecord::RecordNotFound, with: :not_found!
+    rescue_from Mumukit::Auth::UnauthorizedAccessError, with: :forbidden!
+    rescue_from ActiveRecord::RecordInvalid, with: :bad_record!
+  end
+
+  private
+
+  def bad_record!(e)
+    render_errors! e.record.errors, 400
+  end
+
+  def not_found!(e)
+    render_error! e, 404
+  end
+
+  def forbidden!(e)
+    render_error! e, 403
+  end
+
+  def render_error!(e, status)
+    render_errors! [e.message], status
+  end
+
+  def render_errors!(errors, status)
+    summary = { errors: errors }
+    render json: summary, status: status
+  end
+end

data/app/controllers/concerns/with_authorization.rb

@@ -0,0 +1,19 @@
+module WithAuthorization
+  extend ActiveSupport::Concern
+
+  def authorize_janitor!
+    authorize! :janitor
+  end
+
+  def authorize_owner!
+    authorize! :owner
+  end
+
+  def authorization_slug
+    protection_slug || '_/_'
+  end
+
+  def protection_slug
+    @slug
+  end
+end

data/app/controllers/concerns/with_errors_filter.rb

@@ -0,0 +1,32 @@
+module WithErrorsFilter
+  extend ActiveSupport::Concern
+
+  included do
+    around_action :catch_exceptions
+    rescue_from Exception do |e| catch_unhandled_errors(e) end
+  end
+
+  def catch_exceptions
+    yield
+  rescue ActiveRecord::RecordInvalid => e
+    render! e.record.errors
+  end
+
+  def catch_unhandled_errors(e)
+    summary = {
+        errors: {
+            :exception => "#{e.class.name} : #{e.message}"
+        }
+    }
+    summary[:trace] = e.backtrace[0, 10] if Rails.env.development?
+
+    render json: summary, status: :internal_server_error
+  end
+
+  private
+
+  def render!(errors)
+    summary = { errors: errors }
+    render json: summary, status: :bad_request
+  end
+end

data/app/helpers/reset_button_helper.rb

@@ -1,6 +1,6 @@
 module ResetButtonHelper
   def restart_icon
-    fa_icon('trash-o', title: t(:restart), class: 'fa-fw', role: 'button', tabindex: '0', 'aria-label': t(:restart))
+    fa_icon('undo', title: t(:restart), class: 'fa-fw', role: 'button', tabindex: '0', 'aria-label': t(:restart))
   end
 
   def restart_guide_link(guide)

data/app/models/api_client.rb

@@ -0,0 +1,27 @@
+class ApiClient < ApplicationRecord
+
+  belongs_to :user
+  accepts_nested_attributes_for :user
+  validates_presence_of :description
+
+  #TODO add JWT expiration and api client invalidation
+  #TODO rename toke to encoded_token
+  before_create :set_encoded_token!
+
+  def verify!
+    raise 'Invalid Api Client' if Mumukit::Auth::Token.decode(token).uid != user.uid
+  end
+
+  def self.verify_token!(token)
+    client = find_by token: token
+    raise 'No Api Client found for Token' unless client
+    client.verify!
+  end
+
+  private
+
+  def set_encoded_token!
+    self.token = Mumukit::Auth::Token.encode user.uid, {}
+  end
+
+end

data/app/models/api_client_spec.rb

@@ -0,0 +1,6 @@
+require 'rails_helper'
+
+describe ApiClient, type: :model do
+  let(:api_client) {create :api_client}
+  it {expect { Mumukit::Auth::Token.decode(api_client.token).verify_client!}.to_not raise_error }
+end

data/app/models/concerns/with_assignments.rb

@@ -19,7 +19,10 @@ module WithAssignments
   end
 
   def interpolate_for(user, field)
-    language.directives_interpolations.interpolate(field, lambda { |content| replace_content_reference(user, content) }).first
+    language
+      .directives_interpolations
+      .interpolate(field, lambda { |content| replace_content_reference(user, content) })
+      .first
   end
 
   def default_content_for(user)

data/app/models/course.rb

@@ -11,12 +11,10 @@ class Course < ApplicationRecord
   end
 
   def slug=(slug)
-    self[:slug] = slug
-    self[:organization_id] = Organization.find_by(name: Mumukit::Auth::Slug.parse(slug).organization).id
-  end
+    s = Mumukit::Auth::Slug.parse(slug)
 
-  def organization=(organization)
-    self[:organization_id] = organization.id
-    self[:slug] = "#{organization.name}/#{code}"
+    self[:slug] = slug
+    self[:code] = s.course
+    self[:organization_id] = Organization.find_by!(name: s.organization).id
   end
 end

data/app/models/exercise/challenge.rb

@@ -13,12 +13,11 @@ class Challenge < Exercise
   end
 
   def extra
-    extra_code = [guide.extra, self[:extra]].compact.join("\n")
-    if extra_code.empty? or extra_code.end_with? "\n"
-      extra_code
-    else
-      "#{extra_code}\n"
-    end
+    [guide.extra, self[:extra]]
+      .compact
+      .join("\n")
+      .strip
+      .ensure_newline
   end
 
   private

data/app/models/language.rb

@@ -32,7 +32,7 @@ class Language < ApplicationRecord
   end
 
   def import!
-    import_from_json! Mumukit::Bridge::Runner.new(runner_url).importable_info
+    import_from_json! bridge.importable_info
   end
 
   def devicon

data/app/models/organization.rb

@@ -80,6 +80,10 @@ class Organization < ApplicationRecord
     errors_explanations.try { |it| it[code.to_s] } || I18n.t(advice)
   end
 
+  def self.accessible_as(user, role)
+    all.select { |it| it.public? || user.has_permission?(role, it.slug) }
+  end
+
   private
 
   def ensure_consistent_public_login

data/app/models/user.rb

@@ -27,6 +27,8 @@ class User < ApplicationRecord
 
   after_initialize :init
 
+  before_validation :set_uid!
+
   def last_lesson
     last_guide.try(:lesson)
   end
@@ -74,7 +76,7 @@ class User < ApplicationRecord
     end
   end
 
-  def transfer_progress_to!(another)
+  def copy_progress_to!(another)
     transaction do
       assignments.update_all(submitter_id: another.id)
       if another.never_submitted? || last_submission_date.try { |it| it > another.last_submission_date }
@@ -99,8 +101,27 @@ class User < ApplicationRecord
     Rails.application.message_verifier(:unsubscribe)
   end
 
+  def attach!(role, course)
+    add_permission! role, course.slug
+    save_and_notify!
+  end
+
+  def detach!(role, course)
+    remove_permission! role, course.slug
+    save_and_notify!
+  end
+
+  def self.create_if_necessary(user)
+    user[:uid] ||= user[:email]
+    where(uid: user[:uid]).first_or_create(user)
+  end
+
   private
 
+  def set_uid!
+    self.uid ||= email
+  end
+
   def init
     self.image_url ||= "user_shape.png"
   end

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

@@ -0,0 +1,11 @@
+<div class="row">
+  <div class="col-md-12">
+    <div class="actions">
+      <% if assignment.passed? %>
+        <%= next_exercise_button(@exercise) %>
+      <% else %>
+        <button class="btn btn-success btn-block" data-dismiss="modal" aria-label="<%= t :retry_exercise %>"> <%= t :retry_exercise %> </button>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -65,10 +65,4 @@
 
 <%= corollary_box @exercise unless assignment.should_retry? %>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="actions">
-      <%= next_exercise_button(@exercise) %>
-    </div>
-  </div>
-</div>
+<%= render partial: 'exercise_solutions/results_button', locals: {assignment: assignment} unless @exercise.input_kids? %>

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

@@ -0,0 +1,7 @@
+<div class="row">
+  <div class="col-md-12">
+    <div class="actions">
+      <%= next_exercise_button(@exercise) %>
+    </div>
+  </div>
+</div>

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

@@ -10,6 +10,9 @@
         <li data-target="hint" title="<%= t :need_a_hint %>"><i class="fa fa-fw fa-lightbulb-o"></i></li>
       </ul>
   <% end %>
-  <div class="description"><%= @exercise.description_task %></div>
-  <div class="hint" style="display: none"><%= @exercise.hint_html %></div>
+  <div class="mu-kids-character-speech-bubble-normal">
+    <div class="description"><%= @exercise.description_task %></div>
+    <div class="hint" style="display: none"><%= @exercise.hint_html %></div>
+  </div>
+  <div class="mu-kids-character-speech-bubble-failed" style="display: none"></div>
 </div>

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

@@ -2,4 +2,5 @@
 
 <%= render_custom_editor(@exercise) %>
 <%= form.hidden_field :content, id: "mu-custom-editor-value", value: @current_content %>
+<%= form.hidden_field :default_content, id: "mu-custom-editor-default-value", value: @exercise.default_content %>
 <%= form.hidden_field :content_extra, id: "mu-custom-editor-extra", value: @exercise.extra %>

data/app/views/layouts/exercise_inputs/forms/_kids_form.html.erb

@@ -7,6 +7,9 @@
     <div class="actions mu-kids-submit-button">
       <%= render_submit_button(@exercise) %>
     </div>
+    <div class="actions mu-kids-reset-button"></div>
+    <img class="mu-kids-compass-rose" src="/compass_rose.svg">
+    <div class="mu-kids-overlay" style="display: none"></div>
   <% end %>
 <% else %>
   <p><%= t :you_must_sign_in_before_submitting %></p>

data/app/views/layouts/exercise_inputs/layouts/_input_kids.html.erb

@@ -20,12 +20,12 @@
 
         <div class="mu-kids-states">
           <div class="mu-kids-state mu-state-initial mu-kids-gbs-board-initial">
-            <strong>Tablero inicial</strong>
+            <strong id="mu-initial-state-text"><%= t :initial_state %></strong>
+            <strong id="mu-actual-state-text"><%= t :actual_state %></strong>
             <div class="mu-kids-state-image"><%= @exercise.initial_state&.html_safe %></div>
           </div>
-          <hr>
           <div class="mu-kids-state mu-state-final">
-            <strong>Tablero esperado</strong>
+            <strong><%= t :expected_state %></strong>
             <div class="mu-kids-state-image"><%= @exercise.final_state&.html_safe %></div>
           </div>
         </div>

data/app/views/layouts/modals/_kids_context.html.erb

@@ -2,9 +2,6 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t :continue_exercise %>">
-          <span aria-hidden="true">&times;</span>
-        </button>
         <h4 class="text-center">
           <strong><%= "#{@exercise.number}. #{@exercise.name}" %></strong>
         </h4>

data/app/views/layouts/modals/_kids_results.html.erb

@@ -20,6 +20,8 @@
           </div>
         </div>
       </div>
+      <div class="modal-footer">
+      </div>
     </div>
   </div>
 </div>

data/config/routes.rb

@@ -49,6 +49,29 @@ Rails.application.routes.draw do
     # Organizations assets
     get '/theme_stylesheet'     => 'assets#theme_stylesheet'
     get '/extension_javascript' => 'assets#extension_javascript'
+
+
+    namespace :api do
+      organization_regexp = Regexp.new Mumukit::Platform::Organization::Helpers.valid_name_regex
+      uid_regexp = /[^\/]+/
+
+      resources :users, only: [:create, :update],  constraints: {id: uid_regexp}
+      resources :organizations,
+                    only: [:index, :show, :create, :update],
+                    constraints: {id: organization_regexp}
+
+      resources :courses, only: [:create]
+      constraints(uid: uid_regexp) do
+        '/courses/:organization/:course'.tap do |it|
+          post "#{it}/students" => 'students#create'
+          post "#{it}/students/:uid/attach" => 'students#attach'
+          post "#{it}/students/:uid/detach" => 'students#detach'
+          post "#{it}/teachers" => 'teachers#create'
+          post "#{it}/teachers/:uid/attach" => 'teachers#attach'
+          post "#{it}/teachers/:uid/detach" => 'teachers#detach'
+        end
+      end
+    end
   end
 
   #Rescue not found routes

data/db/migrate/20180129142749_add_api_client.rb

@@ -0,0 +1,11 @@
+class AddApiClient < ActiveRecord::Migration[5.1]
+  def change
+    create_table :api_clients do |t|
+      t.string :description
+      t.string :token
+      t.references :user
+
+      t.timestamps
+    end
+  end
+end

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

@@ -12,7 +12,8 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
       guide_finished_by_solution: guide_finished_by_solution?,
       class_for_progress_list_item: class_for_progress_list_item(@exercise, true),
       html: render_results_html(assignment),
-      title_html: render_results_title_html(assignment))
+      title_html: render_results_title_html(assignment),
+      button_html: render_results_button_html(assignment))
   end
 
   def render_results_html(assignment)
@@ -25,6 +26,11 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
                      locals: {assignment: assignment}
   end
 
+  def render_results_button_html(assignment)
+    render_to_string partial: 'exercise_solutions/kids_results_button',
+                     locals: {assignment: assignment}
+  end
+
   def guide_finished_by_solution?
     !@guide_previously_done && @exercise.guide_done_for?(current_user)
   end