mumuki-domain 6.2.2 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea320c239feb33a124423439523f74cacc6a96b3fe33af3675cef777eb915580
-  data.tar.gz: 066d47d6f4074663020d203984e2b48fd4882191a8984bd3b2f7e88e664b528a
+  metadata.gz: f3af22410021f5f748fe3b4662ba1703fc03211261181377dc3b10fcbcca24d9
+  data.tar.gz: 0e1b4ee077345dcfd7b22634f9f818ad5d70b24a923bb2a5d9617d27145c3ac2
 SHA512:
-  metadata.gz: b0e75aa069c6a953691c93b626af83fe7b061af7095c0b082e78061387233d936bcd60e50515663ce8df4411e5b2440e70822c4941b8941f8817e411a975816c
-  data.tar.gz: ba6e31a9d987788f7dc5b6422e9a1caa7897b870304d68e06bee4b1f5d82b247e30d8581dc68166892b5f22f61727029069c4e70d3bfc8b4b74268b38561f75a
+  metadata.gz: 388263f0fc37694d2cb4c15e5e5e867258dc421f2175d9f41845d9eba97a76ac26586a38e4a24da3a778ce7032be0e1141963a7766b319b3108fd0200cf3a899
+  data.tar.gz: 0ab961c7820e7c8ac9115b9a41340b0586122ce6a87fbc4f2be54cb5307f0947f7105f5563b6bbeb531fa41bae60ac59f5cc0fd790f603c7bb32f2802d5695ef

data/app/models/concerns/with_edition_mode.rb

@@ -0,0 +1,23 @@
+module WithEditionMode
+  extend ActiveSupport::Concern
+
+  attr_accessor :edition_mode
+
+  def edit!
+    self.edition_mode = true
+  end
+
+  module ClassMethods
+    def editable(*selectors)
+      selectors.each { |selector| editable_field selector }
+    end
+
+    private
+
+    def editable_field(selector)
+      patch selector do |*args, hyper|
+        edition_mode ? self[selector] : hyper.(*args)
+      end
+    end
+  end
+end

data/app/models/exercise.rb

@@ -1,6 +1,4 @@
 class Exercise < ApplicationRecord
-  RANDOMIZED_FIELDS = [:default_content, :description, :extra, :hint, :test]
-
   include WithDescription
   include WithLocale
   include WithNumber,
@@ -10,7 +8,8 @@ class Exercise < ApplicationRecord
           WithLanguage,
           Assistable,
           WithRandomizations,
-          WithDiscussions
+          WithDiscussions,
+          WithEditionMode
 
   include Submittable,
           Questionable
@@ -25,9 +24,11 @@ class Exercise < ApplicationRecord
   validates_presence_of :submissions_count,
                         :guide, :bibliotheca_id
 
-  randomize(*RANDOMIZED_FIELDS)
+  randomize :description, :hint, :extra, :test, :default_content
   delegate :timed?, to: :navigable_parent
 
+  editable :description, :hint, :test, :default_content
+
   def console?
     queriable?
   end
@@ -108,12 +109,10 @@ 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 corollary teacher_info manual_evaluation locale
-                     choices assistance_rules randomizations tag_list extra_visible goal
+    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
                      free_form_editor_source initial_state final_state))
       .merge(id: bibliotheca_id, language: language_resource_h, type: type.underscore)
-      .merge(expectations: self[:expectations])
-      .merge(RANDOMIZED_FIELDS.map { |it| [it, self[it]] }.to_h)
       .symbolize_keys
       .compact
   end
@@ -168,6 +167,10 @@ 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/exercise/challenge.rb

@@ -16,6 +16,8 @@ class Challenge < Exercise
       .ensure_newline
   end
 
+  editable :extra
+
   private
 
   def defaults

data/app/models/exercise/problem.rb

@@ -25,6 +25,8 @@ class Problem < QueriableChallenge
     own_expectations + guide_expectations
   end
 
+  editable :expectations
+
   def guide_expectations
     guide.expectations
   end

data/app/models/language.rb

@@ -75,7 +75,6 @@ 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.2'
+    VERSION = '6.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 6.2.2
+  version: 6.3.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -230,6 +230,7 @@ files:
 - app/models/concerns/with_discussion_creation/upvote.rb
 - app/models/concerns/with_discussion_status.rb
 - app/models/concerns/with_discussions.rb
+- app/models/concerns/with_edition_mode.rb
 - app/models/concerns/with_editor.rb
 - app/models/concerns/with_expectations.rb
 - app/models/concerns/with_language.rb
@@ -618,7 +619,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.0
 signing_key: 
 specification_version: 4
 summary: Mumuki Platform's Domain Model