mumuki-domain 6.2.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee36809b582014389c467d826cf8b882328db5ca64148dc86c61934de774cbb2
-  data.tar.gz: a015be5b71a6cb6be0b3b7f40704e5c7c0ff8391fc8e45d08db51420c71d9522
+  metadata.gz: 76ce31380b9bb9748fa7bb45e294758326fe416a7e23f653ccd7685687b52d9e
+  data.tar.gz: fb574a1ed0d64dfc987e32cdab66878d590b1245eaf8b5ff043ffa859de371bd
 SHA512:
-  metadata.gz: 9281ce11cfab651b7a7c2be4f4d528a7ac29278c19eff71116adcb376c21ec6059bb874412599398da47cbe4702f2ec0a8a55865cbe80decf21df85402ca442b
-  data.tar.gz: 1183e2aeed8d70f425f1cc9751f95f987bfd7a8d88d0268bc6fe83983725f4f45b8ef03095b1d666b773e8964ad234355b7de4ef11eb4ca4d229764028b20164
+  metadata.gz: 909546a44435e5fdd0d93961e96cff5b96d8c5306e1b4d4bff4ef3b91dcb0425e8a411ce101c3bf3345e968c08e697ab0c8bcae5f5cf6e5d711850bcebe8bcb8
+  data.tar.gz: 926e48d33c8ec6c2433fa6ceb9a9c7fa68297f0e7d3d8a2cb57346e5461b7c104125b689afda72bb818b5b998e876581a92f557283cc8c69a10be3c015901ee9

data/app/models/exercise.rb

@@ -1,4 +1,6 @@
 class Exercise < ApplicationRecord
+  RANDOMIZED_FIELDS = [:default_content, :description, :extra, :hint, :test]
+
   include WithDescription
   include WithLocale
   include WithNumber,
@@ -23,7 +25,7 @@ class Exercise < ApplicationRecord
   validates_presence_of :submissions_count,
                         :guide, :bibliotheca_id
 
-  randomize :description, :hint, :extra, :test, :default_content
+  randomize(*RANDOMIZED_FIELDS)
   delegate :timed?, to: :navigable_parent
 
   def console?
@@ -106,10 +108,12 @@ class Exercise < ApplicationRecord
 
   def to_resource_h
     language_resource_h = language.to_embedded_resource_h if language != guide.language
-    as_json(only: %i(name layout editor description corollary teacher_info hint test manual_evaluation locale extra
-                     choices expectations assistance_rules randomizations tag_list extra_visible goal default_content
+    as_json(only: %i(name layout editor corollary teacher_info manual_evaluation locale
+                     choices assistance_rules randomizations tag_list extra_visible goal
                      free_form_editor_source initial_state final_state))
       .merge(id: bibliotheca_id, language: language_resource_h, type: type.underscore)
+      .merge(expectations: own_expectations)
+      .merge(RANDOMIZED_FIELDS.map { |it| [it, self[it]] }.to_h)
       .symbolize_keys
       .compact
   end
@@ -164,10 +168,6 @@ class Exercise < ApplicationRecord
     {}
   end
 
-  def default_content
-    self[:default_content] || ''
-  end
-
   # Submits the user solution
   # only if the corresponding assignment has attemps left
   def try_submit_solution!(user, solution={})

data/app/models/language.rb

@@ -75,6 +75,7 @@ class Language < ApplicationRecord
 
   # TODO we should use Mumukit::Directives::Pipeline
   def interpolate(interpolee, *interpolations)
+    interpolee = interpolee || ''
     interpolations.inject(interpolee) { |content, interpolation| directives_interpolations.interpolate(content, interpolation).first }
   end
 

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '6.2.0'
+    VERSION = '6.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2018-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -618,7 +618,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Mumuki Platform's Domain Model