mumuki-domain 7.0.2 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d28ad86997ca94c1d5a301bb2ffb5729a1ea8b7d345a701668dc6bb76a3b9d4
-  data.tar.gz: 951bef6f687690e25ceb89fedfb34c23f2dfee1fa0c649a04a36c1dcd7b47e44
+  metadata.gz: 110d08769d6933a1f24050a84a55cfbd52635f6f51c6a0bd0c100b5278048bac
+  data.tar.gz: 72080c8736a0b180bf1a00b1299a357ab49b889084cdac6038967d32e44f750f
 SHA512:
-  metadata.gz: 5f709598d00fed3cdaf355123f16b80dc192cb484c6a2860e1b402ecef517ccad5d6a846783a4b2af2de5c07d4336fb7526f68e8084a7a6224df02b711aeaa60
-  data.tar.gz: a0dc2166520edb45ff6ef2cc6907c01818ffca73cfdb16518dda08d19e46eb3b98ab01a3d5ab054b5265c25ea447a99e3690c6cebdbdf923be0c5798dc644af8
+  metadata.gz: 78522ae785959966a37a4ccb091253a0652cbd0da35108a11cbdb1d2a9ae7f4af6750d32749aa429d736d5057ad6233045119cc0ac7a2f19c1480b3fbd8df0f8
+  data.tar.gz: 89d0b2c8e21b779d1ffb46c6623cb7e91e7abd8a1b57c711d33043ef9748a0b1b8cf29c844f5414c88b479ce3e4b6a075617fa0c20c11c552a55b0fbd57ef4fa

data/app/models/content.rb

@@ -8,11 +8,11 @@ class Content < ApplicationRecord
   include WithUsages
   include WithName
 
-  def to_resource_h
-    to_expanded_resource_h.compact
+  def to_resource_h(*args)
+    to_expanded_resource_h(*args).compact
   end
 
-  def to_expanded_resource_h
+  def to_expanded_resource_h(*)
     as_json(only: [:name, :slug, :description, :locale]).symbolize_keys
   end
 

data/app/models/exercise.rb

@@ -115,13 +115,13 @@ class Exercise < ApplicationRecord
     choice_values.index(value)
   end
 
-  def to_resource_h
-    to_expanded_resource_h.compact
+  def to_resource_h(*args)
+    to_expanded_resource_h(*args).compact
   end
 
   # Keep this list up to date with
-  # Mumuki::Domain::Store::ExerciseSchema
-  def to_expanded_resource_h
+  # Mumuki::Domain::Store::Github::ExerciseSchema
+  def to_expanded_resource_h(options={})
     language_resource_h = language.to_embedded_resource_h if language != guide.language
     as_json(only: BASIC_RESOURCE_FIELDS)
       .merge(id: bibliotheca_id, language: language_resource_h, type: type.underscore)
@@ -130,6 +130,7 @@ class Exercise < ApplicationRecord
       .merge(settings: self[:settings])
       .merge(RANDOMIZED_FIELDS.map { |it| [it, self[it]] }.to_h)
       .symbolize_keys
+      .tap { |it| it.markdownify!(:hint, :corollary, :description, :teacher_info) if options[:markdownified] }
   end
 
   def reset!

data/app/models/guide.rb

@@ -93,23 +93,17 @@ class Guide < Content
 
   # Keep this list up to date with
   # Mumuki::Domain::Store::Github::GuideSchema
-  def to_expanded_resource_h
+  def to_expanded_resource_h(options={})
     as_json(only: BASIC_RESOURCE_FIELDS)
       .symbolize_keys
       .merge(super)
-      .merge(exercises: exercises.map(&:to_resource_h))
+      .merge(exercises: exercises.map { |it| it.to_resource_h(options) })
       .merge(language: language.to_embedded_resource_h)
+      .tap { |it| it.markdownify!(:corollary, :description, :teacher_info) if options[:markdownified] }
   end
 
   def to_markdownified_resource_h
-    to_resource_h.tap do |guide|
-      %i(corollary description teacher_info).each do |it|
-        guide[it] = Mumukit::ContentType::Markdown.to_html(guide[it])
-      end
-      %i(hint corollary description teacher_info).each do |it|
-        guide[:exercises].each { |exercise| exercise[it] = Mumukit::ContentType::Markdown.to_html(exercise[it]) }
-      end
-    end
+    to_resource_h(markdownified: true)
   end
 
   def as_lesson_of(topic)

data/lib/mumuki/domain.rb

@@ -50,7 +50,7 @@ end
 
 Mumukit::Sync::Store::Github.configure do |config|
   config.guide_schema = Mumuki::Domain::Store::Github::GuideSchema
-  config.exercise_schema = Mumuki::Domain::Store::Thesaurus
+  config.exercise_schema = Mumuki::Domain::Store::Github::ExerciseSchema
 end
 
 Mulang::Inspection.register_extension! Mumukit::Inspection::Css

data/lib/mumuki/domain/extensions.rb

@@ -1,3 +1,4 @@
 require_relative './extensions/string'
 require_relative './extensions/array'
 require_relative './extensions/module'
+require_relative './extensions/hash'

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

@@ -0,0 +1,5 @@
+class Hash
+  def markdownify!(*keys)
+    keys.each { |it| self[it] = Mumukit::ContentType::Markdown.to_html(self[it]) }
+  end
+end

data/lib/mumuki/domain/seed.rb

@@ -15,15 +15,19 @@ module Mumuki::Domain::Seed
     flbulgarelli
   )
 
+  def self.contents_syncer
+    Mumukit::Sync::Syncer.new(Mumuki::Domain::Store::Bibliotheca.new(Mumukit::Platform.bibliotheca_bridge))
+  end
+
+  def self.languages_syncer
+    Mumukit::Sync::Syncer.new(Mumuki::Domain::Store::Thesaurus.new(Mumukit::Platform.thesaurus_bridge))
+  end
+
   def self.import_main_contents!
-    Mumukit::Sync::Syncer.new(
-      Mumuki::Domain::Store::Bibliotheca.new(
-        Mumukit::Platform.bibliotheca_bridge)).import_all! /^#{MAIN_CONTENT_ORGANIZATIONS.join('|')}\/.*$/i
+    self.contents_syncer.import_all! /^#{MAIN_CONTENT_ORGANIZATIONS.join('|')}\/.*$/i
   end
 
   def self.import_languages!
-    Mumukit::Sync::Syncer.new(
-      Mumuki::Domain::Store::Thesaurus.new(
-        Mumukit::Platform.thesaurus_bridge)).import_all!
+    self.languages_syncer.import_all!
   end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.0.2'
+    VERSION = '7.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.3
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -600,6 +600,7 @@ files:
 - lib/mumuki/domain/exceptions/unauthorized_error.rb
 - lib/mumuki/domain/extensions.rb
 - lib/mumuki/domain/extensions/array.rb
+- lib/mumuki/domain/extensions/hash.rb
 - lib/mumuki/domain/extensions/module.rb
 - lib/mumuki/domain/extensions/string.rb
 - lib/mumuki/domain/factories.rb