mumuki-domain 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e3057a4511ba66a280fe3f5bf53052a33161ecd9a45dfb6851d2dc21ea7ad20
-  data.tar.gz: bb89fde6326417de9590369040b1d61a13ec35ea1abe8d365c0d21aa66777315
+  metadata.gz: 9075756cb0cd46b955959afe62c837fb11a293cf520f7e7a3e0666c88e9bc014
+  data.tar.gz: a775162a5319a08a2a2953586bd59efd3cca7ebffddb9c72b236175c5dcbb1a8
 SHA512:
-  metadata.gz: 586446caac1b0eeecf18d5754e1fb1120e1d0f5a87a4d386152f64af9d6f0b5f18b089676cc994c7f717baa3382b120d7ea71e011263e8761ad5b830dbfefb02
-  data.tar.gz: 77d0ddcfaea1ffaae2d22e5cb7e9b30e08b3d6ef4d303fad9df0062294353dab7834f35fd8fdf339fa770cc233c293f6bf6173442262f11e98eef2521bf3d952
+  metadata.gz: '08190f559ca10836c7d2cfd9c98a864ea18d31fb1f13115727ffc9738a7913fe4af136571b0036c1701b166162e61d2d726653a0cb8f3f1711f9677bde815e03'
+  data.tar.gz: ed6f365ac0c552ccd2f5136fd825052b51da29846a6ea042d27a57e991008d5cfe02265a5450eb2a9b62756ddfb96300c5be1f47dd699b26a8d47b57883c3758

data/app/models/assignment.rb

@@ -52,10 +52,10 @@ class Assignment < Progress
     self.organization = Organization.current
   end
 
-  def recontextualize!
-    if organization != Organization.current
+  def recontextualize!(new_organization = Organization.current)
+    if organization != new_organization
       dirty_parent_by_submission! if organization.present? && exercise.used_in?(organization)
-      self.organization = Organization.current
+      self.organization = new_organization
       self.parent_id = nil
     end
   end
@@ -126,7 +126,7 @@ class Assignment < Progress
   end
 
   def content=(content)
-    if content.present?
+    unless exercise.reading?
       self.solution = exercise.single_choice? ? exercise.choice_index_for(content) : content
     end
   end

data/app/models/concerns/container.rb

@@ -20,6 +20,14 @@ module Container
     content.progress_for(user, organization)
   end
 
+  def navigable_content_in(organization = Organization.current)
+    content.usage_in_organization(organization)
+  end
+
+  def content_used_in?(organization)
+    navigable_content_in(organization).present?
+  end
+
   private
 
   # Generally we are calling progress_for for each sibling. That method needs the

data/app/models/concerns/with_usages.rb

@@ -16,6 +16,18 @@ module WithUsages
     item.is_a?(type) ? item : nil
   end
 
+  def navigable_content_in(organization = Organization.current)
+    self if used_in?(organization)
+  end
+
+  def content_used_in?(organization)
+    navigable_content_in(organization).present?
+  end
+
+  def used_in?(organization)
+    usage_in_organization(organization).present?
+  end
+
   class_methods do
     def aggregate_of(association)
       super

data/app/models/discussion.rb

@@ -44,6 +44,10 @@ class Discussion < ApplicationRecord
     end
   end
 
+  def navigable_content_in(_)
+    nil
+  end
+  
   def used_in?(organization)
     organization == self.organization
   end

data/app/models/exercise.rb

@@ -47,6 +47,14 @@ class Exercise < ApplicationRecord
     guide.usage_in_organization(organization).present?
   end
 
+  def navigable_content_in(organization = Organization.current)
+    self if used_in?(organization)
+  end
+
+  def content_used_in?(organization)
+    navigable_content_in(organization).present?
+  end
+
   def structural_parent
     guide
   end
@@ -231,6 +239,10 @@ class Exercise < ApplicationRecord
     guide.pending_exercises(user)
   end
 
+  def reading?
+    is_a? Reading
+  end
+
   private
 
   def evaluation_class

data/app/models/user.rb

@@ -243,9 +243,9 @@ class User < ApplicationRecord
     Organization.current? ?  Organization.current : main_organization
   end
 
-  def current_immersive_context_at(exercise)
+  def current_immersive_context_at(path_item)
     if Organization.current?
-      immersive_organization_at(exercise) || Organization.current
+      immersive_organization_at(path_item) || Organization.current
     else
       main_organization
     end
@@ -259,13 +259,19 @@ class User < ApplicationRecord
       new_permissions: permissions.as_json
     }
   end
-  
+
   def save_and_notify!
     save!
     notify_permissions_changed!
     self
   end
 
+  def current_immersive_context_and_content_at(path_item)
+    immersive_organization_with_content_at(path_item).tap do |orga, _|
+      return [Organization.current, path_item] unless orga.present?
+    end
+  end
+
   private
 
   def welcome_to_new_organizations!

data/lib/mumuki/domain/extensions/array.rb

@@ -15,6 +15,10 @@ class Array
   def single?
     size == 1
   end
+
+  def multiple?
+    size > 1
+  end
 end
 
 class NilClass

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

@@ -29,7 +29,7 @@ module Mumuki::Domain::Helpers::Organization
   end
 
   def immersed_in?(other)
-    immersible? && other.immersive? && target_audience == other.target_audience
+    immersible? && other.immersive? && !other.disabled? && target_audience == other.target_audience
   end
 
   def switch!

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

@@ -101,12 +101,21 @@ module Mumuki::Domain::Helpers::User
   end
 
   def immersive_organizations_at(path_item, current = Organization.current)
-    return [] unless current.immersible?
-
     usage_filter = path_item ? lambda { |it| path_item.used_in?(it) } : lambda { |_| true }
-    student_granted_organizations
-      .select { |it| current.immersed_in?(it) }
-      .select(&usage_filter)
+    immersive_organizations_for(current).select(&usage_filter)
+  end
+
+  def immersive_organization_with_content_at(path_item, current = Organization.current)
+    orga = immersive_organizations_with_content_at(path_item, current).single
+    [orga, path_item&.navigable_content_in(orga)]
+  end
+
+  def immersive_organizations_with_content_at(path_item, current = Organization.current)
+    immersive_without_usage = immersive_organizations_for(current)
+    return immersive_without_usage unless path_item.present?
+
+    immersive_with_usage = immersive_without_usage.select { |it| path_item.content_used_in? it }
+    immersive_with_usage.empty? ? immersive_without_usage : immersive_with_usage
   end
 
   ## API Exposure
@@ -120,4 +129,12 @@ module Mumuki::Domain::Helpers::User
       [:first_name, :last_name, :gender, :birthdate]
     end
   end
+
+  private
+
+  def immersive_organizations_for(organization)
+    return [] unless organization.immersible?
+
+    student_granted_organizations.select { |it| organization.immersed_in?(it) }
+  end
 end

data/lib/mumuki/domain/incognito.rb

@@ -52,7 +52,15 @@ module Mumuki::Domain
       nil
     end
 
-    def immersive_organizations_at(_)
+    def current_immersive_context_and_content_at(_)
+      [nil, nil]
+    end
+
+    def immersive_organizations_with_content_at(_, _ = nil)
+      []
+    end
+
+    def immersive_organizations_at(_, _ = nil)
       []
     end
 

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '8.0.0'
+    VERSION = '8.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: mumukit-sync
   requirement: !ruby/object:Gem::Requirement