mumuki-laboratory 5.7.0 → 5.8.0

data/config/routes.rb

@@ -15,7 +15,9 @@ Rails.application.routes.draw do
     concerns :debatable, controller: 'book_discussions', only: :index
 
     resources :discussions, only: [] do
-      resources :messages, only: [:create, :destroy], controller: 'discussions_messages'
+      resources :messages, only: [:create, :destroy], controller: 'discussions_messages' do
+        post :approve, on: :member
+      end
     end
 
     resources :book, only: [:show]

data/db/migrate/20180802190437_add_approved_to_messages.rb

@@ -0,0 +1,5 @@
+class AddApprovedToMessages < ActiveRecord::Migration[5.1]
+  def change
+    add_column :messages, :approved, :boolean, default: false
+  end
+end

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

@@ -12,6 +12,7 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
     rescue_from Mumuki::Laboratory::ForbiddenError, with: :forbidden
     rescue_from Mumuki::Laboratory::UnauthorizedError, with: :unauthorized
     rescue_from Mumuki::Laboratory::GoneError, with: :gone
+    rescue_from Mumuki::Laboratory::BlockedForumError, with: :blocked_forum
   end
 
   def not_found
@@ -29,7 +30,11 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
 
   def forbidden
     Rails.logger.info "Access to organization #{Organization.current} was forbidden to user #{current_user} with permissions #{current_user.permissions}"
-    render 'errors/forbidden', status: 403
+    render 'errors/forbidden', status: 403, locals: { explanation: :forbidden_explanation }
+  end
+
+  def blocked_forum
+    render 'errors/forbidden', status: 403, locals: { explanation: :blocked_forum_explanation }
   end
 
   def gone

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

@@ -1,6 +1,7 @@
 module Mumuki::Laboratory::Controllers::Notifications
+
   def user_notifications_path
-    "#{user_path}##{notifications_path}"
+    user_path(anchor: current_notifications_tab)
   end
 
   def has_notifications?
@@ -13,7 +14,7 @@ module Mumuki::Laboratory::Controllers::Notifications
 
   private
 
-  def notifications_path
+  def current_notifications_tab
     has_messages? ? 'messages' : 'discussions'
   end
 

data/lib/mumuki/laboratory/exceptions.rb

@@ -2,3 +2,4 @@ require_relative './exceptions/forbidden_error'
 require_relative './exceptions/gone_error'
 require_relative './exceptions/not_found_error'
 require_relative './exceptions/unauthorized_error'
+require_relative './exceptions/blocked_forum_error'

data/lib/mumuki/laboratory/exceptions/blocked_forum_error.rb

@@ -0,0 +1,2 @@
+class Mumuki::Laboratory::BlockedForumError < StandardError
+end

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

@@ -20,6 +20,7 @@ en:
   authoring_note: This guide's content was developed by %{authors} and <a href="%{collaborators}" target="_blank">many others</a>, under the terms of <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Creative Commons License Share-Alike, 4.0</a>
   back_to_mumuki: Back to Mumuki!
   bibliotheca: Bibliotheca
+  blocked_forum_explanation: You are not allowed to see this content. <br> Are you in the middle of an exam right now?
   cancel_subscription: Cancel your subscription.
   chapter: Chapter
   chapter_finished_html: You have finished %{chapter}!
@@ -88,6 +89,7 @@ en:
   history: History
   home: Home
   initial_state: Initial board
+  insert_file_name: Insert a file name
   invitation: Invitation to course
   invitation_for: 'Join %{course}'
   item_not_accessible: "You are not permitted to access this content"
@@ -115,6 +117,7 @@ en:
   moderator: Moderator
   mumuki_catchphrase: Improve your programming skills
   mumuki_short_description: Mumuki is a simple, open and collaborative platform for sharing and solving programming exercises. It is aimed to help people with learning and teaching programing languages and paradigms
+  my_doubts: My doubts
   my_submissions: My Submissions
   name: Name
   navigation_continue: 'Next: %{sibling}'
@@ -185,7 +188,6 @@ en:
   start_lesson: Start this lesson!
   start_practicing: Start Practicing!
   start_using_mumuki: Start using Mumuki!
-  stats: Some stats
   status: Status
   stay_here: I want to stay here
   stop_emails?: Want to stop getting emails?

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

@@ -21,6 +21,7 @@ es:
   authoring_note: Esta guía fue desarrollada por %{authors} y <a href="%{collaborators}" target="_blank">muchas personas más</a>, bajo los términos de la <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Licencia Creative Commons Compartir-Igual, 4.0</a>.
   back_to_mumuki: ¡Volvé a Mumuki!
   bibliotheca: Biblioteca
+  blocked_forum_explanation: Es decir que no tenés autorización para ver este contenido. <br> ¿Puede que estés en medio de un examen?
   cancel_subscription: Cancelá tu subscripción.
   chapter: Capítulo
   chapter_finished_html: ¡Terminaste %{chapter}! ¡Felicitaciones!
@@ -98,6 +99,7 @@ es:
   hour: hora
   hours: horas
   initial_state: Tablero inicial
+  insert_file_name: Ingresa un nombre de archivo
   invitation: Invitación a curso
   invitation_for: 'Unirse a %{course}'
   item_not_accessible: "No tenés permisos para acceder a este contenido"
@@ -128,6 +130,7 @@ es:
   moderator: Moderador
   mumuki_catchphrase: Aprendé a programar
   mumuki_short_description: Mumuki es la plataforma libre y gratuita para aprender a programar, de la práctica a la teoría y en tu idioma
+  my_doubts: Mis consultas
   name: Nombre
   navigation_continue: 'Siguiente %{kind}: %{sibling}'
   navigation_next: Siguiente %{kind}
@@ -208,7 +211,6 @@ es:
   start_lesson: ¡Comenzá esta lección!
   start_practicing: ¡Empezá ahora!
   start_using_mumuki: ¡Empezá a usar Mumuki!
-  stats: Tu Progreso
   status: Estado
   stay_here: No, quiero quedarme acá
   stop_emails?: ¿Querés dejar de recibir estos mails?
@@ -235,7 +237,6 @@ es:
   unauthorized_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que no iniciaste sesión.
   uncategorized: No categorizado
   undo_upvote: No es útil
-  unknown: no resuelto
   unmeet_expectations: Objetivos que no se cumplieron
   unsubscribe: Dejar de recibir notificaciones
   unsubscribed_successfully: Te desuscribiste exitosamente de los recordatorios.

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

@@ -21,6 +21,7 @@ pt:
   authoring_note: 'Este guia foi desenvolvido por %{authors} e <a href="%{collaborators}" target="_blank"> muitas outras pessoas </a>, nos termos do <a href = "https://creativecommons.org/licenses/by-sa/4.0/" target="_blank"> Creative Commons License Share-Equal, 4.0 </a>.'
   back_to_mumuki: Voltei para Mumuki!
   bibliotheca: Biblioteca
+  blocked_forum_explanation: Você não tem permissão para ver este conteúdo. <br> Você está no meio de um exame agora?
   chapter: Capítulo
   chapter_finished_html: Você terminou %{chapter}! Parabéns!
   chapter_number: Capítulo %{number}
@@ -96,6 +97,7 @@ pt:
   hour: hora
   hours: horas
   initial_state: Tabuleiro inicial
+  insert_file_name: Insira um nome de arquivo
   invitation: Convite para o curso
   invitation_for: Participe %{curso}
   item_not_accessible: Você não tem permissões para acessar este conteúdo
@@ -124,6 +126,7 @@ pt:
   moderator: Moderador
   mumuki_catchphrase: Aprendi a programar
   mumuki_short_description: Mumuki é a plataforma gratuita e gratuita para aprender a programar, desde a prática até a teoria e no seu idioma
+  my_doubts: Minhas duvidas
   name: Nome
   navigation_continue: "Próximo %{kind}: %{sibling}"
   navigation_next: Próximo %{kind}
@@ -198,7 +201,6 @@ pt:
   sort: Ordenar
   start_lesson: Comece esta lição!
   start_practicing: Comece agora!
-  stats: Seu progresso
   status: Estado
   stay_here: Não, eu quero ficar aqui
   submission: solução
@@ -223,7 +225,6 @@ pt:
   try_again: Opa, algo deu errado em Mumuki. Reinicie o exercício, aguarde alguns segundos e tente novamente.
   unauthorized_explanation: Opa! Isso é o que é conhecido como %{error}, ou seja, você não fez logon.
   uncategorized: Não classificado
-  unknown: não resolvido
   unmeet_expectations: Objetivos que não foram atendidos
   unsubscribe: Cancelar subscrição
   upload_solution: Carregar solução

data/lib/mumuki/laboratory/mumukit/directives.rb

@@ -1,15 +1,16 @@
 require 'mumukit/directives'
 
 class Mumukit::Directives::Sections < Mumukit::Directives::Directive
-  def build(section, content)
-    "#{comment_type.comment "<#{section}#"}#{content}#{comment_type.comment "##{section}>"}"
-  end
-
   def join(sections)
     file_declarations, file_references = sections.map do |section, content|
       [build(section, content), interpolate(section)]
     end.transpose
-    "#{file_declarations.join "\n"}\n#{build 'content', file_references.join("\n")}"
+
+    file_declarations.join "\n"
+  end
+
+  def build(section, content)
+    "#{comment_type.comment "<#{section}#"}#{content}#{comment_type.comment "##{section}>"}"
   end
 
   def interpolate(section)

data/lib/mumuki/laboratory/status/submission/pending.rb

@@ -1,11 +1,7 @@
 module Mumuki::Laboratory::Status::Submission::Pending
   extend Mumuki::Laboratory::Status::Submission
 
-  def self.group
-    Mumuki::Laboratory::Status::Submission::Unknown
-  end
-
   def self.iconize
-    {class: :info, type: 'clock-o'}
+    {class: :muted, type: :circle}
   end
 end

data/lib/mumuki/laboratory/status/submission/running.rb

@@ -2,7 +2,7 @@ module Mumuki::Laboratory::Status::Submission::Running
   extend Mumuki::Laboratory::Status::Submission
 
   def self.group
-    Mumuki::Laboratory::Status::Submission::Unknown
+    Mumuki::Laboratory::Status::Submission::Pending
   end
 
   def self.iconize

data/lib/mumuki/laboratory/status/submission/submission.rb

@@ -2,7 +2,6 @@ module Mumuki::Laboratory::Status::Submission
   include Mumuki::Laboratory::Status
 end
 
-require_relative './unknown'
 require_relative './pending'
 require_relative './running'
 require_relative './passed'

data/lib/mumuki/laboratory/version.rb

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

data/spec/controllers/discussions_controller_spec.rb

@@ -6,6 +6,7 @@ describe DiscussionsController, organization_workspace: :test do
   let(:exercise_params) { {debatable_class: 'Exercise', exercise_id: exercise.id} }
 
   before { set_current_user! user }
+  before { Organization.current.tap { |it| it.forum_enabled = true }.save! }
 
   describe 'post' do
     before { allow_any_instance_of(DiscussionsController).to receive(:discussion_params).and_return title: 'A title' }

data/spec/controllers/exercise_solutions_controller_spec.rb

@@ -28,7 +28,7 @@ describe ExerciseSolutionsController, organization_workspace: :test do
     let(:files) { problem.files_for(user) }
 
     it { expect(response.status).to eq 200 }
-    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(Assignment.last.solution).to eq("/*<a_file.css#*/a css content/*#a_file.css>*/\n/*<a_file.js#*/a js content/*#a_file.js>*/") }
     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' }

data/spec/controllers/organizations_api_controller_spec.rb

@@ -33,7 +33,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
 
           it { check_status! 200 }
 
-          it { expect(body[:organizations].map { |it| it[:name] }).to eq %w(base public dot.org private another_private) }
+          it { expect(body[:organizations].map { |it| it[:name] }).to contain_exactly(*%w(base public dot.org private another_private)) }
         end
         context 'with non-wildcard permissions' do
           before { get :index }

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: 20180704150839) do
+ActiveRecord::Schema.define(version: 20180802190437) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -235,6 +235,7 @@ ActiveRecord::Schema.define(version: 20180704150839) do
     t.datetime "updated_at"
     t.boolean "read", default: false
     t.integer "discussion_id"
+    t.boolean "approved", default: false
   end
 
   create_table "organizations", id: :serial, force: :cascade do |t|

data/spec/factories/api_client_factory.rb

@@ -1,11 +1,11 @@
 FactoryBot.define do
   factory :api_client do |t|
     transient do
-      role :janitor
-      grant 'test/*'
+      role { :janitor }
+      grant { 'test/*' }
     end
 
-    description "foo"
+    description { "foo" }
     user {
       create :user,
              first_name: 'foo',

data/spec/factories/assignments_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :assignment do
-    status :pending
+    status { :pending }
     exercise
     submitter { create(:user) }
   end

data/spec/factories/chapter_factory.rb

@@ -5,7 +5,7 @@ FactoryBot.define do
     book { Organization.current.book rescue nil }
 
     transient do
-      lessons []
+      lessons { [] }
       name { Faker::Lorem.sentence(3) }
     end
 

data/spec/factories/course_factory.rb

@@ -1,9 +1,9 @@
 FactoryBot.define do
   factory :course do
-    period '2016'
-    shifts %w(morning)
-    days %w(monday wednesday)
-    description 'test'
-    organization_id 1
+    period { '2016' }
+    shifts { %w(morning) }
+    days { %w(monday wednesday) }
+    description { 'test' }
+    organization_id { 1 }
   end
 end

data/spec/factories/discussion_factory.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :discussion do
-    title 'A discussion'
-    description 'A discussion description'
+    title { 'A discussion' }
+    description { 'A discussion description' }
     initiator { create(:user) }
     item { create(:exercise) }
   end

data/spec/factories/exercise_factory.rb

@@ -4,27 +4,27 @@ FactoryBot.define do
     sequence(:name) { |n| "lang#{n}" }
 
     runner_url { Faker::Internet.url }
-    queriable true
+    queriable { true }
   end
 
   factory :haskell, parent: :language do
-    name 'haskell'
+    name { 'haskell' }
   end
 
   factory :bash, parent: :language do
-    name 'bash'
-    triable true
-    stateful_console true
+    name { 'bash' }
+    triable { true }
+    stateful_console { true }
   end
 
   factory :text_language, parent: :language do
-    name 'text'
+    name { 'text' }
   end
 
   factory :gobstones, parent: :language do
-    name 'gobstones'
-    extension 'gbs'
-    queriable false
+    name { 'gobstones' }
+    extension { 'gbs' }
+    queriable { false }
   end
 
   factory :exercise_base do
@@ -32,44 +32,42 @@ FactoryBot.define do
     sequence(:bibliotheca_id) { |n| n }
     sequence(:number) { |n| n }
 
-    locale :en
+    locale { :en }
     guide
   end
 
   factory :challenge, parent: :exercise_base do
-    layout 'input_right'
+    layout { 'input_right' }
   end
 
   factory :reading, class: Reading, parent: :exercise_base do
-    name 'A reading'
-    description 'Simple reading'
+    name { 'A reading' }
+    description { 'Simple reading' }
   end
 
   factory :problem, class: Problem, parent: :challenge do
-    name 'A problem'
-    description 'Simple problem'
-    test 'dont care'
+    name { 'A problem' }
+    description { 'Simple problem' }
+    test { 'dont care' }
   end
 
   factory :interactive, class: Interactive, parent: :challenge do
-    name 'An interactive problem'
-    description 'Simple interactive problem'
-    goal :query_passes
+    name { 'An interactive problem' }
+    description { 'Simple interactive problem' }
+    goal { :query_passes }
     language { create(:bash) }
   end
 
   factory :playground, class: Playground, parent: :challenge do
-    name 'A Playground'
-    description 'Simple playground'
+    name { 'A Playground' }
+    description { 'Simple playground' }
   end
 
   factory :exercise, parent: :problem
 
   factory :x_equal_5_exercise, parent: :exercise do
-    test <<-EOT
-          describe "x" $ do
-            it "should be equal 5" $ do
-               x `shouldBe` 5
-    EOT
+    test { 'describe "x" $ do
+             it "should be equal 5" $ do
+                x `shouldBe` 5' }
   end
 end