mumuki-domain 6.0.1 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8de38eb3b005bdc6be72a0f6b3cb4060a603e392
-  data.tar.gz: 68f6165be4f58de7385cede169282eddfef7c2a2
+  metadata.gz: 0fad2ecd67525418ebd21e6b6b7bb9e190aa0221
+  data.tar.gz: afb33d70f417502e0077083012e9ad6eb0cbb4b8
 SHA512:
-  metadata.gz: e6bab10083bbeb4c0fea8f7e06363bc72d475cbfab69c2d4356b6fbab1d3af6486144d9cdb5d78eb46d2c2351fd9f81bd5c637cd8d096c93fda63db3b8076d03
-  data.tar.gz: d9eed1ded3391f627f974d2156069617700263d58ed579ad573cded713b92fc44512688338ac4e0fb7ab70f3fab329961e377cbe0ac8ca80bd6b51e440a2778f
+  metadata.gz: e050c244b1937af8a0b78c18e0a69b0d2cf324b32bef213ea5dd0bd83cc657182605791e7927d43fc1f9ac6813b29915ed9cba2c2e15964bebf4bbe734223e53
+  data.tar.gz: 96c5eab7647489c35cc5b8d4e4f7d52b52a65c43aada24def22cc51477790147d997dcf0d55fa0a1af26c8b0c6f223fb4997488547f64df431ee70ebe47c2294

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.0.1'
+    VERSION = '6.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.3
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-11-22 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