mumuki-domain 7.5.1 → 7.7.2

data/lib/mumuki/domain/helpers/user.rb

@@ -28,9 +28,9 @@ module Mumuki::Domain::Helpers::User
     role_here = "#{role}_here?"
 
     # Tells whether this user has #{role} permissions in
-    # the given organization
-    define_method role_of do |organization|
-      has_permission? role, organization.slug
+    # the given `slug_like`
+    define_method role_of do |slug_like|
+      has_permission? role, slug_like.to_mumukit_slug
     end
 
     # Tells whether this user has #{role} permissions in
@@ -49,9 +49,9 @@ module Mumuki::Domain::Helpers::User
   (Mumukit::Auth::Roles::ROLES - [:owner]).each do |role|
 
     # Assignes the #{role} role to this user
-    # for the given slug
-    define_method "make_#{role}_of!" do |slug|
-      add_permission! role, slug
+    # for the given `grant_like`
+    define_method "make_#{role}_of!" do |grant_like|
+      add_permission! role, grant_like.to_mumukit_grant
     end
   end
 

data/lib/mumuki/domain/locales/activerecord/en.yml

@@ -27,3 +27,4 @@ en:
           attributes:
             base:
               consistent_public_login: 'A public organization can not restrict login methods'
+              invalid_activity_range: 'The organization activity range are not valid'

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

@@ -44,6 +44,7 @@ es:
           attributes:
             base:
               consistent_public_login: 'Una organización pública no puede restringir los métodos de login'
+              invalid_activity_range: 'La fecha de deshabilitación no puede ser anterior a la de inicio del recorrido'
     models:
       exercise:
         one: Ejercicio

data/lib/mumuki/domain/locales/activerecord/pt.yml

@@ -27,3 +27,4 @@ pt:
           attributes:
             base:
               consistent_public_login: 'Uma organização pública não pode restringir métodos de login'
+              invalid_activity_range: 'O intervalo de atividades da organização não é válido'

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

@@ -1,16 +1,20 @@
 class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
   include Mumukit::Login::LoginSettingsHelpers
 
-  model_attr_accessor :login_methods,
+  model_attr_accessor :disabled_from,
+                      :embeddable?,
+                      :feedback_suggestions_enabled?,
+                      :forum_discussions_minimal_role,
+                      :forum_enabled?,
+                      :forum_only_for_trusted?,
+                      :gamification_enabled?,
+                      :immersive?,
+                      :in_preparation_until,
+                      :login_methods,
                       :login_provider,
                       :login_provider_settings,
-                      :forum_discussions_minimal_role,
-                      :raise_hand_enabled?,
-                      :feedback_suggestions_enabled?,
                       :public?,
-                      :embeddable?,
-                      :immersive?,
-                      :forum_enabled?,
+                      :raise_hand_enabled?,
                       :report_issue_enabled?
 
   def private?
@@ -24,4 +28,12 @@ class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
   def forum_discussions_minimal_role
     (@forum_discussions_minimal_role || 'student').to_sym
   end
+
+  def disabled?
+    disabled_from.present? && disabled_from.to_datetime < DateTime.now
+  end
+
+  def in_preparation?
+    in_preparation_until.present? && in_preparation_until.to_datetime > DateTime.now
+  end
 end

data/lib/mumuki/domain/status/discussion/discussion.rb

@@ -14,10 +14,6 @@ module Mumuki::Domain::Status::Discussion
     define_method(selector) { false }
   end
 
-  def allowed_for?(*)
-    true
-  end
-
   def reachable_statuses_for_moderator(*)
     []
   end
@@ -38,7 +34,7 @@ module Mumuki::Domain::Status::Discussion
     end
   end
 
-  def allowed_statuses_for(user, discussion)
-    STATUSES.select { |it| it.allowed_for?(user, discussion) }
+  def as_json(_options={})
+    to_s
   end
 end

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

@@ -9,6 +9,7 @@ class Mumuki::Domain::Submission::Base
                 :submission_id, :queries, :query_results, :manual_evaluation_comment]
 
   attr_accessor *ATTRIBUTES
+  attr_accessor :client_result
 
   def self.from_attributes(*args)
     new ATTRIBUTES.zip(args).to_h
@@ -26,6 +27,11 @@ class Mumuki::Domain::Submission::Base
     results
   end
 
+  def with_client_result(result)
+    self.client_result = result if result.present?
+    self
+  end
+
   def evaluate!(assignment)
     try_evaluate! assignment
   rescue => e

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

@@ -2,6 +2,8 @@ class Mumuki::Domain::Submission::Solution < Mumuki::Domain::Submission::Persist
   attr_accessor :content
 
   def try_evaluate!(assignment)
-    assignment.run_tests!(content: content).except(:response_type)
+    assignment
+      .run_tests!({client_result: client_result}.compact.merge(content: content))
+      .except(:response_type)
   end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.5.1'
+    VERSION = '7.7.2'
   end
 end

data/lib/mumuki/domain/workspace.rb

@@ -0,0 +1,38 @@
+class Mumuki::Domain::Workspace
+  attr_accessor :user, :area
+
+  # area is a organization-like or course-like object
+  # that can be converted into slugs, has content and access-rules information
+  def initialize(user, area)
+    @user = user
+    @area = area
+  end
+
+  def annonymous?
+    user.nil?
+  end
+
+  def teacher?
+    user.teacher_of? area
+  end
+
+  # Takes a didactic sequence of containers and retuns the enabled containers
+  # for this user in this workspace.
+  #
+  # This method does not check the user is actually member of the area,
+  # you should check that before sending this message
+  #
+  def enabled_containers(sequence)
+    return sequence if annonymous? || teacher?
+
+    # TODO refactor when introducing access rules
+    if area.progressive_display_lookahead
+      user.completed_containers_with_lookahead(
+        sequence,
+        area.to_organization,
+        lookahead: area.progressive_display_lookahead)
+    else
+      sequence
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.5.1
+  version: 7.7.2
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -252,6 +252,7 @@ files:
 - app/models/chapter.rb
 - app/models/complement.rb
 - app/models/concerns/assistable.rb
+- app/models/concerns/container.rb
 - app/models/concerns/contextualization.rb
 - app/models/concerns/disabling.rb
 - app/models/concerns/friendly_name.rb
@@ -268,7 +269,6 @@ files:
 - app/models/concerns/topic_container.rb
 - app/models/concerns/with_assignments.rb
 - app/models/concerns/with_case_insensitive_search.rb
-- app/models/concerns/with_content.rb
 - app/models/concerns/with_description.rb
 - app/models/concerns/with_discussion_creation.rb
 - app/models/concerns/with_discussion_creation/subscription.rb
@@ -299,6 +299,7 @@ files:
 - app/models/discussion.rb
 - app/models/event.rb
 - app/models/exam.rb
+- app/models/exam/passing_criterion.rb
 - app/models/exam_authorization.rb
 - app/models/exercise.rb
 - app/models/exercise/challenge.rb
@@ -604,7 +605,16 @@ files:
 - db/migrate/20200508191543_create_avatars.rb
 - db/migrate/20200518135658_add_avatar_to_users.rb
 - db/migrate/20200527180729_add_disabled_at_to_users.rb
+- db/migrate/20200601203033_add_course_to_exam.rb
+- db/migrate/20200605161350_add_passing_criterions_to_exam.rb
+- db/migrate/20200608132959_add_progressive_display_lookahead_to_organizations.rb
+- db/migrate/20200702165503_add_messages_count_to_discussion.rb
+- db/migrate/20200728162727_add_not_actually_a_question_field_to_messages.rb
+- 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
 - lib/mumuki/domain.rb
+- lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
 - lib/mumuki/domain/evaluation.rb
 - lib/mumuki/domain/evaluation/automated.rb
@@ -612,10 +622,12 @@ files:
 - lib/mumuki/domain/exceptions.rb
 - lib/mumuki/domain/exceptions/blocked_forum_error.rb
 - lib/mumuki/domain/exceptions/disabled_error.rb
+- lib/mumuki/domain/exceptions/disabled_organization_error.rb
 - lib/mumuki/domain/exceptions/forbidden_error.rb
 - lib/mumuki/domain/exceptions/gone_error.rb
 - lib/mumuki/domain/exceptions/not_found_error.rb
 - lib/mumuki/domain/exceptions/unauthorized_error.rb
+- lib/mumuki/domain/exceptions/unprepared_organization_error.rb
 - lib/mumuki/domain/extensions.rb
 - lib/mumuki/domain/extensions/array.rb
 - lib/mumuki/domain/extensions/hash.rb
@@ -690,6 +702,7 @@ files:
 - lib/mumuki/domain/syncable.rb
 - lib/mumuki/domain/syncable/with_resource_fields.rb
 - lib/mumuki/domain/version.rb
+- lib/mumuki/domain/workspace.rb
 homepage: https://mumuki.org
 licenses:
 - AGPL-3.0
@@ -709,8 +722,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Mumuki Platform's Domain Model