mumuki-domain 7.0.6 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c111563c53bbd8b40ee80ea56f0d3dc90f8c8ac666ca1688fb8419745bc63cff
-  data.tar.gz: 298300bc4e45eda5c512c637b91e90f10cc13c80b6e7fa9155c485b4bfce56ad
+  metadata.gz: fe0f9389e1714c564320f373c82d35b3b84a3c27bd68af16584c68c4f38639f8
+  data.tar.gz: ca0b57c648127393d93ffab7c5beee55d6abdb31e80f37f33b787f33470ec171
 SHA512:
-  metadata.gz: f452c3d9383b0b59a458a88332e879351e342d63e574e512bb1c70adb9b3b3a11c24019ac86a86425910d72a19a8c9f686ee62bab4924add598c827df1843003
-  data.tar.gz: 8afb07a6b0ea3d070311fd70008f008059366889ee78509dff3f17b47a10713b4d30c4db04a5926bc3d439ce5a1183ca846057ddd80b39e620b3b39315b6fc9a
+  metadata.gz: 1cd397c42e1b6f16d4b903a5829087758eeb75ca190c2eb0902866a688a124f982e18fca28ca997d26b118eb8a0efa3a35f37b23b3e0a3ffab292fd7ee6c70ee
+  data.tar.gz: 49a329e6663553e44e6865e44224d9f27fa0befefd6bdcfb04fe460800a9b42a5f7aadd56c09793dbf7c8983531aae6a54f7a75659676e0eb3b9e23795590e7c

data/README.md

@@ -5,28 +5,32 @@
 ### `Language`
 
 ```
-  name
   comment_type
-  runner_url
-  output_content_type
-  prompt
-  extension
-  highlight_mode
-  visible_success_output
   devicon
-  triable
+  editor_css_urls
+  editor_html_urls
+  editor_js_urls
+  editor_shows_loading_content
+  expectations
+  extension
   feedback
-  queriable
+  highlight_mode
+  layout_css_urls
+  layout_html_urls
+  layout_js_urls
+  layout_shows_loading_content
   multifile
+  name
+  output_content_type
+  prompt
+  queriable
+  runner_url
+  settings
   stateful_console
   test_extension
   test_template
-  layout_js_urls
-  layout_html_urls
-  layout_css_urls
-  editor_js_urls
-  editor_html_urls
-  editor_css_urls
+  triable
+  visible_success_output
 ```
 
 _as defined in `Language#to_resource_h`_

data/app/models/application_record.rb

@@ -67,9 +67,9 @@ class ApplicationRecord < ActiveRecord::Base
 
   def self.aggregate_of(association)
     class_eval do
-      define_method(:rebuild!) do |children|
+      define_method("rebuild_#{association}!") do |children|
         transaction do
-          self.send(association).all_except(children).delete_all
+          self.send(association).all_except(children).destroy_all
           self.update! association => children
           children.each &:save!
         end

data/app/models/book.rb

@@ -1,8 +1,10 @@
 class Book < Content
   numbered :chapters
   aggregate_of :chapters
+  aggregate_of :complements
 
   has_many :chapters, -> { order(number: :asc) }, dependent: :destroy
+  has_many :topics, through: :chapters
   has_many :complements, dependent: :destroy
 
   has_many :exercises, through: :chapters
@@ -11,6 +13,8 @@ class Book < Content
 
   delegate :first_lesson, to: :first_chapter
 
+  alias_method :children, :topics
+
   def to_s
     slug
   end
@@ -23,13 +27,11 @@ class Book < Content
     user.try(:last_lesson)|| first_lesson
   end
 
-  after_save :reindex_usages!
-
   def import_from_resource_h!(resource_h)
     self.assign_attributes resource_h.except(:chapters, :complements, :id, :description)
     self.description = resource_h[:description]&.squeeze(' ')
 
-    rebuild! resource_h[:chapters].map { |it| Topic.find_by!(slug: it).as_chapter_of(self) }
+    rebuild_chapters! resource_h[:chapters].map { |it| Topic.find_by!(slug: it).as_chapter_of(self) }
     rebuild_complements! resource_h[:complements].to_a.map { |it| Guide.find_by(slug: it)&.as_complement_of(self) }.compact
   end
 
@@ -39,15 +41,6 @@ class Book < Content
       complements: complements.map(&:slug))
   end
 
-  def rebuild_complements!(complements) #FIXME use rebuild
-    transaction do
-      self.complements.all_except(complements).delete_all
-      self.update! :complements => complements
-      complements.each &:save!
-    end
-    reload
-  end
-
   def index_usage!(organization)
     organization.index_usage_of! self, self
     [chapters, complements].flatten.each { |item| item.index_usage! organization }

data/app/models/concerns/guide_container.rb

@@ -1,5 +1,6 @@
 module GuideContainer
   extend ActiveSupport::Concern
+  include WithContent
 
   included do
     validates_presence_of :guide

data/app/models/concerns/with_content.rb

@@ -0,0 +1,13 @@
+module WithContent
+  extend ActiveSupport::Concern
+
+  included do
+    before_destroy :destroy_usages!
+  end
+
+  private
+
+  def destroy_usages!
+    Usage.destroy_usages_for self
+  end
+end

data/app/models/concerns/with_usages.rb

@@ -16,6 +16,21 @@ module WithUsages
     item.is_a?(type) ? item : nil
   end
 
+  class_methods do
+    def aggregate_of(association)
+      super
+
+      revamp "rebuild_#{association}!" do |_, this, children, hyper|
+        old_children = this.send association
+        added_children = children - old_children
+        hyper.(children)
+        this.usages.each { |it| it.index_children!(added_children) }
+
+        this
+      end
+    end
+  end
+
   private
 
   def ensure_unused!

data/app/models/exercise.rb

@@ -108,7 +108,7 @@ class Exercise < ApplicationRecord
   end
 
   def choice_values
-    self[:choice_values].presence || choices.map { |it| it.indifferent_get(:value) }
+    choices.map { |it| it.indifferent_get(:value) }
   end
 
   def choice_index_for(value)

data/app/models/guide.rb

@@ -19,6 +19,8 @@ class Guide < Content
 
   enum type: [:learning, :practice]
 
+  alias_method :children, :exercises
+
   def clear_progress!(user, organization=Organization.current)
     transaction do
       exercises.each do |exercise|

data/app/models/topic.rb

@@ -9,7 +9,7 @@ class Topic < Content
 
   markdown_on :appendix
 
-  after_save :reindex_usages!
+  alias_method :children, :guides
 
   def pending_lessons(user)
     guides.
@@ -30,7 +30,7 @@ class Topic < Content
   def import_from_resource_h!(resource_h)
     self.assign_attributes resource_h.except(:lessons, :description)
     self.description = resource_h[:description].squeeze(' ')
-    rebuild! resource_h[:lessons].to_a.map { |it| lesson_for(it) }
+    rebuild_lessons! resource_h[:lessons].to_a.map { |it| lesson_for(it) }
   end
 
   def to_expanded_resource_h

data/app/models/topic_container.rb

@@ -1,5 +1,7 @@
 module TopicContainer
   extend ActiveSupport::Concern
+  include WithContent
+
   included do
     validates_presence_of :topic
 
@@ -10,7 +12,7 @@ module TopicContainer
              :description,
              :description_html,
              :description_teaser_html,
-             :rebuild!,
+             :rebuild_lessons!,
              :lessons,
              :guides,
              :pending_guides,

data/app/models/usage.rb

@@ -7,9 +7,22 @@ class Usage < ApplicationRecord
   scope :in_organization, ->(organization = Organization.current) { where(organization_id: organization.id) }
 
   before_save :set_slug
+  before_destroy :destroy_children_usages!
+
+  def self.destroy_all_where(query)
+    where(query).destroy_all
+  end
 
   def self.destroy_usages_for(record)
-    Usage.where(parent_item: record).destroy_all
+    destroy_all_where(parent_item: record)
+  end
+
+  def destroy_children_usages!
+    item.children.each { |child| Usage.destroy_all_where(item: child, organization: organization) }
+  end
+
+  def index_children!(children)
+    children.each { |it| it.index_usage! organization }
   end
 
   private

data/db/migrate/20191022180238_remove_choice_values_from_exercises.rb

@@ -0,0 +1,5 @@
+class RemoveChoiceValuesFromExercises < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :exercises, :choice_values, :string, array: true, default: [], null: false
+  end
+end

data/lib/mumuki/domain/factories/exercise_factory.rb

@@ -65,6 +65,10 @@ FactoryBot.define do
 
   factory :exercise, parent: :problem
 
+  factory :indexed_exercise, parent: :exercise do
+    guide { create(:indexed_guide) }
+  end
+
   factory :x_equal_5_exercise, parent: :exercise do
     test { 'describe "x" $ do
              it "should be equal 5" $ do

data/lib/mumuki/domain/factories/guide_factory.rb

@@ -27,4 +27,11 @@ FactoryBot.define do
     end
   end
 
+  factory :indexed_guide, parent: :guide do
+    after(:build) do |guide|
+      create(:lesson, guide: guide, topic: create(:indexed_topic))
+
+      reindex_current_organization!
+    end
+  end
 end

data/lib/mumuki/domain/factories/topic_factory.rb

@@ -6,4 +6,10 @@ FactoryBot.define do
     slug { "mumuki/mumuki-sample-topic-#{SecureRandom.uuid}" }
     locale { :en }
   end
+
+  factory :indexed_topic, parent: :topic do
+    after(:build) do |topic|
+      create(:chapter, topic: topic)
+    end
+  end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.0.6'
+    VERSION = '7.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.0.6
+  version: 7.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -265,6 +265,7 @@ files:
 - app/models/concerns/submittable/triable.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
@@ -587,6 +588,7 @@ files:
 - db/migrate/20190918134321_remove_new_expectations.rb
 - db/migrate/20190918140026_add_custom_expectations.rb
 - db/migrate/20190929180601_add_expectations_to_language.rb
+- db/migrate/20191022180238_remove_choice_values_from_exercises.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/engine.rb
 - lib/mumuki/domain/evaluation.rb