mumuki-domain 6.4.1 → 6.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd0b17031481425109c6fbbf0fef025f7fff815143258f8e1b78ef4c2756910
-  data.tar.gz: 82c30673baeb89cb25ad7ae603e181bab6ba13f9623b537f51a9c61d84217e55
+  metadata.gz: 2dc4b25b056ad48da30b2a2008ccd242e8585d0e7d41ecef6157eafb5ef10ad6
+  data.tar.gz: 741c3c4883cd6790f0cbe052282ccd85a54d0990beb58a8d4bc1d02a8397e62e
 SHA512:
-  metadata.gz: 5afd2f5a051eb74b7fcee1fc858078125efb6191ea390918a5f246276a25c429f8c48f84dd02c2028a63938c6835b0ca7930f543a122f73ed9e44c01e2ba94b8
-  data.tar.gz: 1bb1058a95394ae5a0ff3feb5f985e42fc0899305d2a354797debf3f9f15698be6f64a43c941883c1e65ce742cc4b82d1c8017c65a95bb3845455067592f6079
+  metadata.gz: f11f63a1716512dd667e9a184c2dc34ffaa1f72bb180d5f7a98e7be22e84320c797eef80ed272980274015b33388d02299d3f9a4e63e5d0102013740a3789440
+  data.tar.gz: e44584d34112d824cc584b14a266df1b55be8b40c774f9f482d1f12c6d93e501f3a323ce9b32fac043740c13bcfcbda861d6a720aef0f775de1fa2d80531472f

data/app/models/book.rb

@@ -48,6 +48,7 @@ class Book < Content
   end
 
   def index_usage!(organization)
+    organization.index_usage_of! self, self
     [chapters, complements].flatten.each { |item| item.index_usage! organization }
   end
 
@@ -57,12 +58,8 @@ class Book < Content
 
   ## Forking
 
-  def fork_to!(organization, syncer)
-    rebased_dup(organization).tap do |dup|
-      dup.chapters = chapters.map { |chapter| chapter.topic.fork_to!(organization, syncer).as_chapter_of(self) }
-      dup.complements = complements.map { |complement| complement.guide.fork_to!(organization, syncer).as_complement_of(self) }
-      dup.save!
-      syncer.export! dup
-    end
+  def fork_children_into!(dup, organization, syncer)
+    dup.chapters = chapters.map { |chapter| chapter.topic.fork_to!(organization, syncer, quiet: true).as_chapter_of(dup) }
+    dup.complements = complements.map { |complement| complement.guide.fork_to!(organization, syncer, quiet: true).as_complement_of(dup) }
   end
 end

data/app/models/content.rb

@@ -12,5 +12,15 @@ class Content < ApplicationRecord
     as_json(only: [:name, :slug, :description, :locale]).symbolize_keys
   end
 
-end
+  def fork_to!(organization, syncer, quiet: false)
+    rebased_dup(organization).tap do |dup|
+      self.class.find_by(slug: dup.slug).try { |it| return it } if quiet
+
+      dup.validate!
+      fork_children_into! dup, organization, syncer
+      dup.save validate: false
 
+      syncer.export! dup
+    end
+  end
+end

data/app/models/guide.rb

@@ -111,11 +111,9 @@ class Guide < Content
     usage_in_organization.resettable?
   end
 
-  def fork_to!(organization, syncer)
-    rebased_dup(organization).tap do |dup|
-      dup.exercises = exercises.map(&:dup)
-      dup.save!
-      syncer.export! dup
-    end
+  ## Forking
+
+  def fork_children_into!(dup, _organization, _syncer)
+    dup.exercises = exercises.map(&:dup)
   end
 end

data/app/models/organization.rb

@@ -6,6 +6,8 @@ class Organization < ApplicationRecord
   serialize :settings, Mumukit::Platform::Organization::Settings
   serialize :theme, Mumukit::Platform::Organization::Theme
 
+  markdown_on :description
+
   validate :ensure_consistent_public_login
 
   belongs_to :book
@@ -133,12 +135,12 @@ class Organization < ApplicationRecord
     # Answers organizations that have the given item
     # in their paths.
     #
+    # Warning: unlike `in_path?`, this method does only work with
+    # content - child - items instead of both kind of items - content and content containers.
+    #
     # See `Organization#in_path?`
-    def in_path(item)
-      joins(:usages)
-        .select('organizations.*, usages.item_id')
-        .where('usages.item_id = ?', item.id)
-        .distinct()
+    def in_path(content)
+      joins(:usages).where('usages.item': content).distinct
     end
   end
 end

data/app/models/topic.rb

@@ -47,12 +47,8 @@ class Topic < Content
 
   ## Forking
 
-  def fork_to!(organization, syncer)
-    rebased_dup(organization).tap do |dup|
-      dup.lessons = lessons.map { |lesson| lesson.guide.fork_to!(organization, syncer).as_lesson_of(self) }
-      dup.save!
-      syncer.export! dup
-    end
+  def fork_children_into!(dup, organization, syncer)
+    dup.lessons = lessons.map { |lesson| lesson.guide.fork_to!(organization, syncer, quiet: true).as_lesson_of(dup) }
   end
 
   private

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

@@ -7,10 +7,11 @@ FactoryBot.define do
     transient do
       lessons { [] }
       name { Faker::Lorem.sentence(3) }
+      slug { "mumuki/mumuki-test-topic-#{SecureRandom.uuid}" }
     end
 
     after(:build) do |chapter, evaluator|
-      chapter.topic = build(:topic, name: evaluator.name, lessons: evaluator.lessons) unless evaluator.topic
+      chapter.topic = build(:topic, name: evaluator.name, slug: evaluator.slug, lessons: evaluator.lessons) unless evaluator.topic
     end
   end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '6.4.1'
+    VERSION = '6.4.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 6.4.2
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails