mumuki-domain 6.5.1 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3035243b0b927688b208101efda8b3be665d244cb4099faf8b8a1bf3a7aa89e1
-  data.tar.gz: 417de725ebff9ebfd3687084ba41f66e9a44eb4899976ddc75923b4c80894107
+  metadata.gz: 0fe12401571cc46abe567d3337c252fcbf0d9a974f37ad207b3d424086b95b7c
+  data.tar.gz: dbc42a3ada461878dd43b5eb8dc14d0ec449349099b01a0b80dbf428f08edcdf
 SHA512:
-  metadata.gz: 8e9088e52953f6d5fe90bfc66d8e8f793700166eb63c9ac7c298e17aab8bba59a5336af7aeeb9aad3c63be885f0a45b3f3cc546c38989da9b0c9bf21dbac4c87
-  data.tar.gz: 81ecbff2d1327923403fe3e89a726519469790e70b82c337c4b91690be00aead66280cf6efe97c3d25bb0502667e9970c70ffbfd9b9600cff2a46d6d091e2c2d
+  metadata.gz: c228e0879bfc3c4e74013e21a5a8f5e5656e4c2da491b340fd89d24ab7bcc015735d42ad8ca66a2a54662a5ba0a15cf1c1a8ba53d145fbe6c8ce76da69815b81
+  data.tar.gz: 6bf1b18815eda0d228a78c6471b6e6d786358dbd1e94ba951d480e830eb03163c83182022bcdd4eeec15fb99ba2e774cfd6947d3f0562ba9277182d297e4a9c3

data/app/models/application_record.rb

@@ -101,6 +101,14 @@ class ApplicationRecord < ActiveRecord::Base
     a_hash.with_indifferent_access.slice(*attributes).except(*options[:except])
   end
 
+  def self.organic_on(*selectors)
+    selectors.each do |selector|
+      define_method("#{selector}_in_organization") do |organization = Organization.current|
+        send(selector).where(organization: organization)
+      end
+    end
+  end
+
   private
 
   def raise_foreign_key_error!

data/app/models/assignment.rb

@@ -16,7 +16,7 @@ class Assignment < ApplicationRecord
 
   validates_presence_of :exercise, :submitter
 
-  delegate :language, :name, :navigable_parent,
+  delegate :language, :name, :navigable_parent, :settings,
            :limited?, :input_kids?, :choice?, to: :exercise
 
   alias_attribute :status, :submission_status
@@ -118,11 +118,11 @@ class Assignment < ApplicationRecord
 
   %w(query try).each do |key|
     name = "run_#{key}!"
-    define_method(name) { |params| exercise.send name, params.merge(extra: extra) }
+    define_method(name) { |params| exercise.send name, params.merge(extra: extra, settings: settings) }
   end
 
   def run_tests!(params)
-    exercise.run_tests! params.merge(extra: extra, test: test)
+    exercise.run_tests! params.merge(extra: extra, test: test, settings: settings)
   end
 
   def to_resource_h

data/app/models/book.rb

@@ -7,6 +7,7 @@ class Book < Content
 
   has_many :exercises, through: :chapters
   has_many :discussions, through: :exercises
+  organic_on :discussions
 
   delegate :first_lesson, to: :first_chapter
 

data/app/models/concerns/syncable.rb

@@ -59,11 +59,6 @@ module Syncable
       find_or_initialize_by sync_key_id_field => sync_key_id
     end
 
-    # `locate_resource` is a helpful method that can be used
-    # outside the `Mumukit::Sync` context, thus this mixin provide
-    # a shorter alias
-    alias_method :locate, :locate_resource
-
     # `locate!` is similar to `locate`, but fails instead of creating a
     # a new object when not found
     #

data/app/models/concerns/with_discussion_creation/subscription.rb

@@ -2,9 +2,13 @@ module WithDiscussionCreation::Subscription
   extend ActiveSupport::Concern
 
   included do
-    has_many :discussions, foreign_key: 'initiator_id'
     has_many :subscriptions
     has_many :watched_discussions, through: :subscriptions, source: :discussion
+    organic_on :watched_discussions
+  end
+
+  def subscriptions_in_organization
+    subscriptions.joins(:discussion).where(discussion: discussions_in_organization)
   end
 
   def subscribed_to?(discussion)
@@ -28,6 +32,6 @@ module WithDiscussionCreation::Subscription
   end
 
   def unread_discussions
-    subscriptions.where(read: false).map(&:discussion)
+    subscriptions_in_organization.where(read: false).map(&:discussion)
   end
 end

data/app/models/concerns/with_discussion_creation.rb

@@ -5,5 +5,6 @@ module WithDiscussionCreation
     has_many :discussions, foreign_key: 'initiator_id'
     include WithDiscussionCreation::Subscription
     include WithDiscussionCreation::Upvote
+    organic_on :discussions
   end
 end

data/app/models/concerns/with_discussions.rb

@@ -3,10 +3,11 @@ module WithDiscussions
 
   included do
     has_many :discussions, as: :item, dependent: :destroy
+    organic_on :discussions
   end
 
-  def discuss!(user, discussion)
-    discussion.merge!(initiator_id: user.id)
+  def discuss!(user, discussion, organization = Organization.current)
+    discussion.merge!(initiator_id: user.id, organization: organization)
     discussion.merge!(submission: submission_for(user)) if submission_for(user).present?
     created_discussion = discussions.create discussion
     user.subscribe_to! created_discussion

data/app/models/concerns/with_slug.rb

@@ -8,11 +8,15 @@ module WithSlug
     before_create :normalize_slug!
   end
 
-  def slug_parts
+  def transparent_params
     org, repo = slug.split('/')
     {organization: org, repository: repo}
   end
 
+  def transparent_id
+    slug
+  end
+
   def normalize_slug!
     self.slug = self.slug.to_mumukit_slug.normalize.to_s
   end
@@ -40,7 +44,7 @@ module WithSlug
       all.select { |it| !it.private? || permissions&.writer?(it.slug) }
     end
 
-    def by_slug_parts!(args)
+    def find_transparently!(args)
       find_by!(slug: "#{args[:organization]}/#{args[:repository]}")
     end
 

data/app/models/concerns/with_usages.rb

@@ -4,10 +4,11 @@ module WithUsages
   included do
     has_many :usages, as: :item
     before_destroy :ensure_unused!
+    organic_on :usages
   end
 
   def usage_in_organization(organization = Organization.current)
-    usages.in_organization(organization).first.try(:parent_item)
+    usages_in_organization(organization).first.try(:parent_item)
   end
 
   def usage_in_organization_of_type(type, organization = Organization.current)

data/app/models/course.rb

@@ -15,7 +15,7 @@ class Course < ApplicationRecord
   end
 
   def import_from_resource_h!(resource_h)
-    update! Mumukit::Platform::Course::Helpers.slice_platform_json(resource_h)
+    update! Mumukit::Platform::Course::Helpers.slice_resource_h(resource_h)
   end
 
   def slug=(slug)

data/app/models/discussion.rb

@@ -5,6 +5,7 @@ class Discussion < ApplicationRecord
   has_many :messages, -> { order(:created_at) }, dependent: :destroy
   belongs_to :initiator, class_name: 'User'
   belongs_to :exercise, foreign_type: :exercise, foreign_key: 'item_id'
+  belongs_to :organization
   has_many :subscriptions
   has_many :upvotes
 
@@ -23,7 +24,7 @@ class Discussion < ApplicationRecord
   delegate :to_discussion_status, to: :status
 
   scope :for_user, -> (user) do
-    if user.try(:moderator?)
+    if user.try(:moderator_here?)
       all
     else
       where.not(status: :closed).where.not(status: :pending_review).or(where(initiator: user))
@@ -41,11 +42,11 @@ class Discussion < ApplicationRecord
   end
 
   def used_in?(organization)
-    item.used_in?(organization)
+    organization == self.organization
   end
 
   def commentable_by?(user)
-    user&.moderator? || (opened? && user.present?)
+    user&.moderator_here? || (opened? && user.present?)
   end
 
   def subscribable?
@@ -87,7 +88,7 @@ class Discussion < ApplicationRecord
   end
 
   def authorized?(user)
-    initiator?(user) || user.try(:moderator?)
+    initiator?(user) || user.try(:moderator_here?)
   end
 
   def initiator?(user)

data/app/models/exam.rb

@@ -73,7 +73,11 @@ class Exam < ApplicationRecord
   end
 
   def start!(user)
-    authorization_for(user).start! unless user.teacher_here?
+    return if user.teacher_here?
+
+    authorization = authorization_for(user)
+    raise Mumuki::Domain::ForbiddenError unless authorization
+    authorization.start!
   end
 
   def started?(user)

data/app/models/exercise.rb

@@ -25,6 +25,8 @@ class Exercise < ApplicationRecord
   defaults { self.submissions_count = 0 }
 
   serialize :choices, Array
+  serialize :settings, Hash
+
   validates_presence_of :submissions_count,
                         :guide, :bibliotheca_id
 
@@ -64,12 +66,12 @@ class Exercise < ApplicationRecord
     [language&.name, *tag_list].compact
   end
 
-  def slug
-    "#{guide.slug}/#{bibliotheca_id}"
+  def transparent_id
+    "#{guide.transparent_id}/#{bibliotheca_id}"
   end
 
-  def slug_parts
-    guide.slug_parts.merge(bibliotheca_id: bibliotheca_id)
+  def transparent_params
+    guide.transparent_params.merge(bibliotheca_id: bibliotheca_id)
   end
 
   def friendly
@@ -116,6 +118,7 @@ class Exercise < ApplicationRecord
                      free_form_editor_source initial_state final_state))
       .merge(id: bibliotheca_id, language: language_resource_h, type: type.underscore)
       .merge(expectations: self[:expectations])
+      .merge(settings: self[:settings])
       .merge(RANDOMIZED_FIELDS.map { |it| [it, self[it]] }.to_h)
       .symbolize_keys
       .compact
@@ -193,6 +196,19 @@ class Exercise < ApplicationRecord
       .map { |name, content| Mumuki::Domain::File.new name, content }
   end
 
+  def self.find_transparently!(params)
+    Guide.find_transparently!(params).locate_exercise! params[:bibliotheca_id]
+  end
+
+  def self.locate!(slug_and_bibliotheca_id)
+    slug, bibliotheca_id = slug_and_bibliotheca_id
+    Guide.locate!(slug).locate_exercise! bibliotheca_id
+  end
+
+  def settings
+    guide.settings.deep_merge super
+  end
+
   private
 
   def evaluation_class

data/app/models/guide.rb

@@ -8,6 +8,8 @@ class Guide < Content
   numbered :exercises
   has_many :exercises, -> { order(number: :asc) }, dependent: :destroy
 
+  serialize :settings, Hash
+
   self.inheritance_column = nil
 
   enum type: [:learning, :practice]
@@ -57,6 +59,11 @@ class Guide < Content
     stats_for(user).done?
   end
 
+  # Finds an exercise by bibliotheca_id within this guide
+  def locate_exercise!(bibliotheca_id)
+    exercises.find_by!(bibliotheca_id: bibliotheca_id)
+  end
+
   def import_from_resource_h!(resource_h)
     self.assign_attributes whitelist_attributes(resource_h)
     self.language = Language.for_name(resource_h.dig(:language, :name))
@@ -80,7 +87,7 @@ class Guide < Content
   end
 
   def to_resource_h
-    as_json(only: %i(beta type id_format private expectations corollary teacher_info sources learn_more authors collaborators extra))
+    as_json(only: %i(beta type id_format private expectations corollary teacher_info sources learn_more authors collaborators extra settings))
       .symbolize_keys
       .merge(super)
       .merge(exercises: exercises.map(&:to_resource_h))

data/app/models/invitation.rb

@@ -41,7 +41,7 @@ class Invitation < ApplicationRecord
   end
 
   def unexpired
-    raise RecordNotFound, "This invitation has already expired" if expired?
+    raise Mumuki::Domain::GoneError, "This invitation has already expired" if expired?
     self
   end
 

data/app/models/message.rb

@@ -25,7 +25,7 @@ class Message < ApplicationRecord
   end
 
   def authorized?(user)
-    from_user?(user) || user&.moderator?
+    from_user?(user) || user&.moderator_here?
   end
 
   def authorize!(user)

data/app/models/organization.rb

@@ -95,12 +95,25 @@ class Organization < ApplicationRecord
     central? ? 'mumuki' : name
   end
 
-  def ask_for_help_enabled?
-    report_issue_enabled? || community_link.present? || forum_enabled?
+  # Tells if the given user can
+  # ask for help in this organization
+  #
+  # Warning: this method does not strictly check user's permission
+  def ask_for_help_enabled?(user)
+    report_issue_enabled? || community_link.present? || can_create_discussions?(user)
+  end
+
+  # Tells if the given user can
+  # create discussion in this organization
+  #
+  # This is true only when this organization has a forum and the user
+  # has the discusser pseudo-permission
+  def can_create_discussions?(user)
+    forum_enabled? && user.discusser_of?(self)
   end
 
   def import_from_resource_h!(resource_h)
-    attrs = Mumukit::Platform::Organization::Helpers.slice_platform_json resource_h
+    attrs = Mumukit::Platform::Organization::Helpers.slice_resource_h resource_h
     attrs[:book] = Book.locate! attrs[:book]
     update! attrs
   end

data/app/models/user.rb

@@ -98,7 +98,7 @@ class User < ApplicationRecord
   end
 
   def import_from_resource_h!(json)
-    update! Mumukit::Platform::User::Helpers.slice_platform_json json
+    update! Mumukit::Platform::User::Helpers.slice_resource_h json
   end
 
   def unsubscribe_from_reminders!

data/db/migrate/20190326152631_add_settings_to_content.rb

@@ -0,0 +1,6 @@
+class AddSettingsToContent < ActiveRecord::Migration[5.1]
+  def change
+    add_column :exercises, :settings, :text
+    add_column :guides, :settings, :text
+  end
+end

data/db/migrate/20190404181724_add_organization_to_discussion.rb

@@ -0,0 +1,5 @@
+class AddOrganizationToDiscussion < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :discussions, :organization, index: true
+  end
+end

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

@@ -27,11 +27,11 @@ module Mumuki::Domain::Status::Discussion
   end
 
   def should_be_shown?(count, user)
-    count > 0 || user&.moderator?
+    count > 0 || user&.moderator_here?
   end
 
   def reachable_statuses_for(user, discussion)
-    if user.moderator?
+    if user.moderator_here?
       reachable_statuses_for_moderator(discussion)
     else
       reachable_statuses_for_initiator(discussion)

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '6.5.1'
+    VERSION = '6.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 6.5.1
+  version: 6.6.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: mumukit-sync
   requirement: !ruby/object:Gem::Requirement
@@ -535,6 +535,8 @@ files:
 - db/migrate/20190123180139_add_sources_section.rb
 - db/migrate/20190123180147_add_learn_more_section.rb
 - db/migrate/20190312152901_add_content_fk.rb
+- db/migrate/20190326152631_add_settings_to_content.rb
+- db/migrate/20190404181724_add_organization_to_discussion.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/engine.rb
 - lib/mumuki/domain/evaluation.rb