mumuki-domain 6.1.3 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1015d1992dc8a0826caf33b125a04ad1a76e0f36
-  data.tar.gz: 68256c60ca438d64364fdc368c3e1de86d3e963e
+  metadata.gz: bb99fbaf15499ef0b00d1767fa05b708ad0c216c
+  data.tar.gz: a71ee03b993434f5a2e95d64036868aca0f06270
 SHA512:
-  metadata.gz: 6222785a7d4c84c2483d05175b72df0af34112356a041003cfe6fdb54b087106e1c7a1ae9673925298cd64e9f58ab9421b3fd6d1368d68be5a4f261bb9ab8dbb
-  data.tar.gz: 5f98506d27dfe6d713bdc19cfae00ec8558cb4db92e65966033e78f95e5dc4c2de5e75e6ae6b2b0864bcf6ebb1a5777925b606e8b1b58bf5611e23c32b49c5e3
+  metadata.gz: 522983d0523374e99da3cf410ff620cc3f6c570a7b7487d1ace5e4467c46f7144a34da2d4ecdf962cfbf1e394c1984ecdc9f37a3b3de2a44682a53a9989bfdd0
+  data.tar.gz: 11ab111e86471b8b777d8e0736fe5decf56102a612fcf13986c465e6dc8bae92f421d00c03e601b22c6aab2a7733ec7e9b81a95347713df160de3c9f59e3bc37

data/app/models/assignment.rb

@@ -65,7 +65,7 @@ class Assignment < ApplicationRecord
 
   def content=(content)
     if content.present?
-      self.solution = exercise.single_choice? ? exercise.choices.index(content) : content
+      self.solution = exercise.single_choice? ? exercise.choice_index_for(content) : content
     end
   end
 

data/app/models/concerns/with_editor.rb

@@ -15,7 +15,7 @@ module WithEditor
   end
 
   def pretty_choices
-    choices.each_with_index.map do |choice, index|
+    choice_values.each_with_index.map do |choice, index|
       struct id: "content_choice_#{index}",
              index: index,
              value: choice,

data/app/models/exercise.rb

@@ -19,6 +19,7 @@ class Exercise < ApplicationRecord
   belongs_to :guide
   defaults { self.submissions_count = 0 }
 
+  serialize :choices, Array
   validates_presence_of :submissions_count,
                         :guide, :bibliotheca_id
 
@@ -85,7 +86,7 @@ class Exercise < ApplicationRecord
     reset!
 
     attrs = whitelist_attributes(resource_h, except: [:type, :id])
-    attrs[:choices] = resource_h[:choices]&.map { |choice| choice[:value] }.to_a
+    attrs[:choices] = resource_h[:choices].to_a
     attrs[:bibliotheca_id] = resource_h[:id]
     attrs[:number] = number
     attrs[:manual_evaluation] ||= false
@@ -95,6 +96,14 @@ class Exercise < ApplicationRecord
     save!
   end
 
+  def choice_values
+    self[:choice_values].presence || choices.map { |it| it.indifferent_get(:value) }
+  end
+
+  def choice_index_for(value)
+    choice_values.index(value)
+  end
+
   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

data/db/migrate/20181121165956_rename_choices_column.rb

@@ -0,0 +1,6 @@
+class RenameChoicesColumn < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :exercises, :choices, :choice_values
+    add_column :exercises, :choices, :text
+  end
+end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '6.1.3'
+    VERSION = '6.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 6.1.4
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: mumukit-directives
   requirement: !ruby/object:Gem::Requirement
@@ -500,6 +500,7 @@ files:
 - db/migrate/20181113183935_rename_guide_contributors_to_collaborators.rb
 - db/migrate/20181114201620_add_test_template_to_languages.rb
 - db/migrate/20181117190241_add_feedback_to_language.rb
+- db/migrate/20181121165956_rename_choices_column.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/engine.rb
 - lib/mumuki/domain/evaluation.rb