mumuki-domain 8.1.2 → 8.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d712b0423cb797044b5a152a3b5bf64e6d81dea496582fb25327e5e991e0b095
-  data.tar.gz: 23713d6d62039d41dbc7afa5fc24c539adcca97096f4715fe0b0085a0a05509b
+  metadata.gz: 9495d00fe4f85bdc27f5cf67b94e5f09de465a31a795e9e3d56b3f4cd91433e1
+  data.tar.gz: 209256d417ff7c98c309b517cd7076a9743ea00de79124b6bec3e735a49a5238
 SHA512:
-  metadata.gz: a6371b30ee3e79073e4659645960433008657ed84d8e483417985cf4f69ea99a86567e4a7f609aa2717d56a7941f81287bde7c371e2ef578c50cda142fd3a8bf
-  data.tar.gz: b3bb549da8ba32b9b870afe4e438d2cc7cfb84f15cca3d7e3ac83be7938f5f7126d68a18fb48ce42f34cbc6e80d70872cae7267c2617af88bc5956765b0e8474
+  metadata.gz: 88ccf91cbccb01f15ec513e232d48832e69a0ec9f5153992e91eab56c44183f10a10dc2a4bcd894509708ab97461b4698ecb73485da8d7dfa8826196837e0c3d
+  data.tar.gz: 80b0c3ec21c9444dedb05c1c1060035cdd0d5f0f731635ae79e4738c0a0d23c6fbf4ac67d48c6bb0ea70a76ee7e825a05a2afaaad95e8d2be54096636e0e2af0

data/app/models/assignment.rb

@@ -126,7 +126,7 @@ class Assignment < Progress
   end
 
   def content=(content)
-    if content.present?
+    if exercise.solvable?
       self.solution = exercise.single_choice? ? exercise.choice_index_for(content) : content
     end
   end

data/app/models/concerns/with_expectations.rb

@@ -18,16 +18,12 @@ module WithExpectations
     self[:expectations] = expectations.map(&:stringify_keys)
   end
 
-  def own_expectations
+  def raw_expectations
     self[:expectations]
   end
 
-  def own_custom_expectations
-    self[:custom_expectations]
-  end
-
   def ensure_expectations_format
-    errors.add :own_expectations,
-               :invalid_format unless own_expectations.to_a.all? { |it| Mulang::Expectation.valid? it }
+    errors.add :raw_expectations,
+               :invalid_format unless raw_expectations.to_a.all? { |it| Mulang::Expectation.valid? it }
   end
 end

data/app/models/concerns/with_randomizations.rb

@@ -35,8 +35,7 @@ module WithRandomizations
 
     def randomize_field(selector)
       define_method(selector) do |*args|
-        return unless super(*args)
-        randomizer.randomize!(super(*args), seed)
+        super(*args).randomize_with randomizer, seed
       end
     end
   end

data/app/models/exercise.rb

@@ -1,5 +1,5 @@
 class Exercise < ApplicationRecord
-  RANDOMIZED_FIELDS = [:default_content, :description, :extra, :hint, :test]
+  RANDOMIZED_FIELDS = [:default_content, :description, :extra, :hint, :test, :expectations, :custom_expectations]
   BASIC_RESOURCE_FIELDS = %i(
     name layout editor corollary teacher_info manual_evaluation locale
     choices assistance_rules randomizations tag_list extra_visible goal
@@ -135,8 +135,6 @@ class Exercise < ApplicationRecord
     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)
-      .merge(expectations: self[:expectations])
-      .merge(custom_expectations: self[:custom_expectations])
       .merge(settings: self[:settings])
       .merge(RANDOMIZED_FIELDS.map { |it| [it, self[it]] }.to_h)
       .symbolize_keys
@@ -239,8 +237,8 @@ class Exercise < ApplicationRecord
     guide.pending_exercises(user)
   end
 
-  def reading?
-    is_a? ::Reading
+  def solvable?
+    is_a? ::Problem
   end
 
   private

data/app/models/exercise/challenge.rb

@@ -8,8 +8,10 @@ class Challenge < Exercise
     self.layout = self.class.default_layout
   end
 
-  def extra(*)
-    [guide.extra, super]
+  alias_method :own_extra, :extra
+
+  def extra
+    [guide.extra, own_extra]
       .compact
       .join("\n")
       .strip

data/app/models/exercise/problem.rb

@@ -21,20 +21,15 @@ class Problem < QueriableChallenge
     self.expectations = []
   end
 
+  alias_method :own_expectations, :expectations
+  alias_method :own_custom_expectations, :custom_expectations
+
   def expectations
-    own_expectations + guide_expectations
+    own_expectations + guide.expectations
   end
 
   def custom_expectations
-    "#{own_custom_expectations}\n#{guide_custom_expectations}"
-  end
-
-  def guide_expectations
-    guide.expectations
-  end
-
-  def guide_custom_expectations
-    guide.custom_expectations
+    "#{own_custom_expectations}\n#{guide.custom_expectations}"
   end
 
   def evaluation_criteria?

data/lib/mumuki/domain/extensions.rb

@@ -1,5 +1,7 @@
 require_relative './extensions/string'
+require_relative './extensions/symbol'
 require_relative './extensions/array'
 require_relative './extensions/module'
 require_relative './extensions/hash'
+require_relative './extensions/nil'
 require_relative './extensions/time'

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

@@ -19,10 +19,8 @@ class Array
   def multiple?
     size > 1
   end
-end
 
-class NilClass
-  def insert_last(element)
-    [element]
+  def randomize_with(randomizer, seed)
+    map { |it| it.randomize_with randomizer, seed }
   end
 end

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

@@ -11,4 +11,8 @@ class Hash
   def markdownified(*keys, **options)
     map { |k, v| key.in?(keys) ? v.markdownified(options) : v }.to_h
   end
+
+  def randomize_with(randomizer, seed)
+    transform_values { |v| v.randomize_with randomizer, seed }
+  end
 end

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

@@ -0,0 +1,17 @@
+class NilClass
+  def affable
+  end
+
+  def markdownified(**options)
+  end
+
+  def sanitized
+  end
+
+  def randomize_with(randomizer, seed)
+  end
+
+  def insert_last(element)
+    [element]
+  end
+end

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

@@ -59,15 +59,8 @@ class String
   def sanitized
     Mumukit::ContentType::Sanitizer.sanitize self
   end
-end
-
-class NilClass
-  def affable
-  end
 
-  def markdownified(**options)
-  end
-
-  def sanitized
+  def randomize_with(randomizer, seed)
+    randomizer.randomize!(self, seed)
   end
 end

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

@@ -0,0 +1,5 @@
+class Symbol
+  def randomize_with(randomizer, seed)
+    self.to_s.randomize_with(randomizer, seed).to_sym
+  end
+end

data/lib/mumuki/domain/locales/activerecord/en.yml

@@ -15,7 +15,7 @@ en:
           attributes:
             randomizations:
               invalid_format: 'format is invalid'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'format is invalid'
             assistance_rules:
               invalid_format: 'format is invalid'

data/lib/mumuki/domain/locales/activerecord/es-CL.yml

@@ -32,7 +32,7 @@ es-CL:
           attributes:
             randomizations:
               invalid_format: 'formato inválido'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'formato inválido'
             assistance_rules:
               invalid_format: 'formato inválido'

data/lib/mumuki/domain/locales/activerecord/es.yml

@@ -32,7 +32,7 @@ es:
           attributes:
             randomizations:
               invalid_format: 'formato inválido'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'formato inválido'
             assistance_rules:
               invalid_format: 'formato inválido'

data/lib/mumuki/domain/locales/activerecord/pt.yml

@@ -15,7 +15,7 @@ pt:
           attributes:
             randomizations:
               invalid_format: 'o formato é inválido'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'o formato é inválido'
             assistance_rules:
               invalid_format: 'o formato é inválido'

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '8.1.2'
+    VERSION = '8.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 8.1.2
+  version: 8.1.3
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -656,7 +656,9 @@ files:
 - lib/mumuki/domain/extensions/array.rb
 - lib/mumuki/domain/extensions/hash.rb
 - lib/mumuki/domain/extensions/module.rb
+- lib/mumuki/domain/extensions/nil.rb
 - lib/mumuki/domain/extensions/string.rb
+- lib/mumuki/domain/extensions/symbol.rb
 - lib/mumuki/domain/extensions/time.rb
 - lib/mumuki/domain/factories.rb
 - lib/mumuki/domain/factories/api_client_factory.rb