mumuki-domain 7.7.3 → 7.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d90b804c5db198580621210484a9cf0f11fa731691ee6186f98182ca9451dbc
-  data.tar.gz: 29d6e0e3a262005498185ba6840b1fde83b36d0981c378734022099783981d36
+  metadata.gz: 14a6d0b035451e69ddc77479e3f32854ecae51ca0a3c6bc3031f8d68a4b7fcdd
+  data.tar.gz: a1dbea618e7a152e55417174cecf35a0338a464cd199b02114d524c65c7c23c5
 SHA512:
-  metadata.gz: 81415fdb4e315df30ee1b4556d5cc56fe1252a5bb967fa338606aca498cc7fed213ff54230a5c93e9402a4b2acdd9df86180106ff4d3c1ae04e1aca8448901ec
-  data.tar.gz: 1296ed07fbc39995631d85b440982b6b8100a46c2b99f7d9c22dbc9a5b5aab1f3544ea833d1646897f6309d38aa0f6a68c7de606290d38f6cc8f1881b54842aa
+  metadata.gz: d3e2039abf83cd21c0ef3d6b33bcfcef54db1dc7df1eb91fb771ab218076b484b34a4a7c034a1e945d5ab3f84e739fdffbdba05999e2bb1878430af4698e4678
+  data.tar.gz: 1cc3cb4565b4999bfac4f351fffb0d937c28db74c93e26a94267332b9c15ca8812f0bce4c19e2298169a957d008546bde95442a2ca7d798f9912b2bd3c9c39e8

data/app/models/concerns/navigation/siblings_navigation.rb

@@ -1,11 +1,11 @@
 module SiblingsNavigation
 
   def next_for(user)
-    pending_siblings_for(user).select { |it| it.number > number }.sort_by(&:number).first
+    user.pending_siblings_at(self).select { |it| it.number > number }.sort_by(&:number).first
   end
 
   def restart(user)
-    pending_siblings_for(user).sort_by(&:number).first
+    user.pending_siblings_at(self).sort_by(&:number).first
   end
 
   def siblings

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

@@ -5,7 +5,7 @@ module Submittable
 
   def find_assignment_and_submit!(user, submission)
     assignment = assignment_for user
-    results = submission.run! assignment, evaluation_class.new
+    results = user.run_submission! submission, assignment, evaluation_class.new
     [assignment, results]
   end
 end

data/app/models/concerns/with_assignments.rb

@@ -28,6 +28,6 @@ module WithAssignments
   end
 
   def assignment_for(user, organization=Organization.current)
-    find_assignment_for(user, organization) || user.assignments.build(exercise: self, organization: organization)
+    find_assignment_for(user, organization) || user.build_assignment(self, organization)
   end
 end

data/app/models/concerns/with_progress.rb

@@ -1,6 +1,6 @@
 module WithProgress
   def progress_for(user, organization)
-    Indicator.find_or_initialize_by(user: user, organization: organization, content: self)
+    user.progress_at(self, organization)
   end
 
   def completion_percentage_for(user, organization=Organization.current)

data/app/models/guide.rb

@@ -42,7 +42,7 @@ class Guide < Content
   end
 
   def next_exercise(user)
-    pending_exercises(user).order('public.exercises.number asc').first
+    user.next_exercise_at(self)
   end
 
   # TODO: Make use of pending_siblings logic

data/app/models/organization.rb

@@ -18,6 +18,7 @@ class Organization < ApplicationRecord
   has_many :usages
 
   validates_presence_of :contact_email, :locale
+  validates_presence_of :welcome_email_template, if: :greet_new_users?
   validates :name, uniqueness: true,
                    presence: true,
                    format: { with: Mumukit::Platform::Organization.anchored_valid_name_regex }

data/app/models/user.rb

@@ -39,6 +39,8 @@ class User < ApplicationRecord
   before_validation :set_uid!
   validates :uid, presence: true
 
+  after_save :welcome_to_new_organizations!, if: :gained_access_to_new_orga?
+
   resource_fields :uid, :social_id, :email, :permissions, :verified_first_name, :verified_last_name, *profile_fields
 
   def last_lesson
@@ -189,8 +191,50 @@ class User < ApplicationRecord
     name.split.map(&:first).map(&:capitalize).join(' ')
   end
 
+  def progress_at(content, organization)
+    Indicator.find_or_initialize_by(user: self, organization: organization, content: content)
+  end
+
+  def build_assignment(exercise, organization)
+    assignments.build(exercise: exercise, organization: organization)
+  end
+
+  def pending_siblings_at(content)
+    content.pending_siblings_for(self)
+  end
+
+  def next_exercise_at(guide)
+    guide.pending_exercises(self).order('public.exercises.number asc').first
+  end
+
+  def run_submission!(submission, assignment, evaluation)
+    submission.run! assignment, evaluation
+  end
+
+  def incognito?
+    false
+  end
+
   private
 
+  def welcome_to_new_organizations!
+    new_accessible_organizations.each do |organization|
+      UserMailer.welcome_email(self, organization).deliver_later if organization.greet_new_users?
+    end
+  end
+
+  def gained_access_to_new_orga?
+    new_accessible_organizations.present?
+  end
+
+  def new_accessible_organizations
+    return [] unless saved_change_to_permissions?
+
+    old, new = saved_change_to_permissions
+    new_organizations = (new.any_granted_organizations - old.any_granted_organizations).to_a
+    Organization.where(name: new_organizations)
+  end
+
   def set_uid!
     self.uid ||= email
   end

data/db/migrate/20200804191643_add_incognito_mode_enabled_to_organization.rb

@@ -0,0 +1,5 @@
+class AddIncognitoModeEnabledToOrganization < ActiveRecord::Migration[5.1]
+  def change
+    add_column :organizations, :incognito_mode_enabled, :boolean
+  end
+end

data/lib/mumuki/domain.rb

@@ -26,6 +26,7 @@ Mumukit::Platform.configure do |config|
 end
 
 require_relative './domain/area'
+require_relative './domain/incognito'
 require_relative './domain/evaluation'
 require_relative './domain/submission'
 require_relative './domain/status'

data/lib/mumuki/domain/incognito.rb

@@ -0,0 +1,112 @@
+module Mumuki::Domain
+  class IncognitoClass
+
+    def incognito?
+      true
+    end
+
+    # ============
+    # Permissions
+    # ============
+
+    def ensure_enabled!
+    end
+
+    def has_student_granted_organizations?
+      false
+    end
+
+    def teacher_here?
+      false
+    end
+
+    def teacher_of?(*)
+      false
+    end
+
+    def profile_completed?
+      true
+    end
+
+    def writer?
+      false
+    end
+
+    def moderator_here?
+      false
+    end
+
+    def can_discuss_here?
+      false
+    end
+
+    # ========
+    # Visiting
+    # ========
+
+    def visit!(*)
+    end
+
+    # ========
+    # Progress
+    # ========
+
+    def next_exercise_at(guide)
+      guide.exercises.first
+    end
+
+    # def completed_containers_with_lookahead(*)
+    #   raise 'Unsupported operation. Userless mode and progressive display modes are incompatible'
+    # end
+
+    def progress_at(content, organization)
+      Indicator.new content: content, organization: organization
+    end
+
+    def build_assignment(exercise, organization)
+      Assignment.new exercise: exercise, organization: organization, submitter: self
+    end
+
+    def pending_siblings_at(content)
+      []
+    end
+
+    # ============
+    # ActiveRecord
+    # ============
+
+    def id
+      '<incognito>'
+    end
+
+    def is_a?(other)
+      other.is_a?(Class) && other.name == 'User' || super
+    end
+
+    def _read_attribute(key)
+      return id if key == 'id'
+      raise "unknown attribute #{key}"
+    end
+
+    def self.primary_key
+      'id'
+    end
+
+    # ==========
+    # Evaluation
+    # ==========
+
+    def interpolations
+      []
+    end
+
+    def run_submission!(submission, assignment, evaluation)
+      results = submission.dry_run! assignment, evaluation
+      assignment.assign_attributes results
+      results
+    end
+
+  end
+
+  Incognito = IncognitoClass.new
+end

data/lib/mumuki/domain/organization/profile.rb

@@ -11,7 +11,8 @@ class Mumuki::Domain::Organization::Profile < Mumukit::Platform::Model
                       :contact_email,
                       :terms_of_service,
                       :community_link,
-                      :errors_explanations
+                      :errors_explanations,
+                      :welcome_email_template
 
   def locale_json
     locale_h.to_json

data/lib/mumuki/domain/organization/settings.rb

@@ -15,7 +15,8 @@ class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
                       :login_provider_settings,
                       :public?,
                       :raise_hand_enabled?,
-                      :report_issue_enabled?
+                      :report_issue_enabled?,
+                      :greet_new_users?
 
   def private?
     !public?

data/lib/mumuki/domain/submission/base.rb

@@ -21,12 +21,16 @@ class Mumuki::Domain::Submission::Base
 
   def run!(assignment, evaluation)
     save_submission! assignment
-    results = evaluation.evaluate! assignment, self
+    results = dry_run! assignment, evaluation
     save_results! results, assignment
     notify_results! results, assignment
     results
   end
 
+  def dry_run!(assignment, evaluation)
+    evaluation.evaluate! assignment, self
+  end
+
   def with_client_result(result)
     self.client_result = result if result.present?
     self

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.7.3'
+    VERSION = '7.8.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.7.3
+  version: 7.8.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.6'
+        version: '7.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.6'
+        version: '7.8'
 - !ruby/object:Gem::Dependency
   name: mumukit-assistant
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: mumukit-sync
   requirement: !ruby/object:Gem::Requirement
@@ -613,6 +613,7 @@ files:
 - db/migrate/20200728163038_add_requires_moderator_response_to_discussions.rb
 - db/migrate/20200730221001_add_trusted_for_forum_to_user.rb
 - db/migrate/20200731081757_add_last_moderator_access_fields_to_discussion.rb
+- db/migrate/20200804191643_add_incognito_mode_enabled_to_organization.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
@@ -657,12 +658,11 @@ files:
 - lib/mumuki/domain/helpers/course.rb
 - lib/mumuki/domain/helpers/organization.rb
 - lib/mumuki/domain/helpers/user.rb
+- lib/mumuki/domain/incognito.rb
 - lib/mumuki/domain/locales/activerecord/en.yml
-- lib/mumuki/domain/locales/activerecord/es-CL.yml
 - lib/mumuki/domain/locales/activerecord/es.yml
 - lib/mumuki/domain/locales/activerecord/pt.yml
 - lib/mumuki/domain/locales/console_submission/en.yml
-- lib/mumuki/domain/locales/console_submission/es-CL.yml
 - lib/mumuki/domain/locales/console_submission/es.yml
 - lib/mumuki/domain/locales/console_submission/pt.yml
 - lib/mumuki/domain/organization.rb

data/lib/mumuki/domain/locales/activerecord/es-CL.yml

@@ -1,59 +0,0 @@
----
-es-CL:
-  activerecord:
-    attributes:
-      exercise:
-        description: Descripción
-        extra: Biblioteca
-        hint: Ayudas
-        language: Lenguaje
-        locale: Idioma
-        tag_list: Etiquetas
-        title: Título
-      guide:
-        description: Descripción
-        github_repository: Repositorio Github
-        language: Lenguaje
-        locale: Idioma
-        name: Nombre
-      submission:
-        content: Contenido
-    errors:
-      models:
-        guide:
-          attributes:
-            base:
-              in_use: 'La guía aún está siendo utilizada en la organización %{organization}'
-        topic:
-          attributes:
-            base:
-              in_use: 'El tema aún está siendo utilizado en la organización %{organization}'
-        exercise:
-          attributes:
-            randomizations:
-              invalid_format: 'formato inválido'
-            own_expectations:
-              invalid_format: 'formato inválido'
-            assistance_rules:
-              invalid_format: 'formato inválido'
-            name:
-              invalid_format: 'no debe contener /'
-            base:
-              evaluation_criteria_required:  'Tienes que proveer tests y/o expectativas'
-        organization:
-          attributes:
-            base:
-              consistent_public_login: 'Una organización pública no puede restringir los métodos de login'
-              invalid_activity_range: 'La fecha de inhabilitación no puede ser anterior a la de inicio del recorrido'
-    models:
-      exercise:
-        one: Ejercicio
-        other: Ejercicios
-      chapter:
-        one: Capítulo
-        other: Capítulos
-      guide: Guía
-      language: Lenguaje
-      submission:
-        one: Solución
-        other: Soluciones

data/lib/mumuki/domain/locales/console_submission/es-CL.yml

@@ -1,3 +0,0 @@
-es-CL:
-  console_submission:
-    try_again: ¡Ups! Algo salió mal en mumuki. Reinicia el ejercicio, espera unos segundos y vuelve a intentar.