mumuki-domain 6.0.4 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed9e82dd56783101526c2b4dcd7366d5a4ab2a9f
-  data.tar.gz: a1a3a1838c41c06aa54502563cf87be6a2713f9b
+  metadata.gz: da368dc621be6d44c8beaf3911eddc67d17ef8fd
+  data.tar.gz: 63ccade9f6c8c2a5f738f89b968d1ee24bddb942
 SHA512:
-  metadata.gz: 8ffaf2b407569be9c41a7535b9b9d66903d20c4a5c8e51a151d5438db7c3f74935942de081df520706872cb9b83cfd169f234d6abf3fe8dbdaa5beeaae3b6613
-  data.tar.gz: 69295d1103a34b7914f0cdd3d7538f7b1b6594b667f510f83c36dcc71e4badefa475c9bba083e8b2322834c5d4508535e760a1567d06ff33526f9f64cba28142
+  metadata.gz: fd459b117c863d10d1cea2b547005c8b1d8a136e1ec35bd630bc7d5e3c2d3f8d52a41a0c3c1d6abe77518a136189348b73aff3b78e1c31beb921bc94b92c4b52
+  data.tar.gz: b97af1e26758a4d4af5cb5459191e5b8d2f0159699a5e42fd0aa509666ddafeb469b3c1ba5d297e9a88b28d0aaac6e43ee420d097e2fcd8624810dd5556c5f57

data/app/models/assignment.rb

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

data/app/models/concerns/with_editor.rb

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

data/app/models/exercise.rb

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

@@ -96,16 +96,6 @@ class Organization < ApplicationRecord
     report_issue_enabled? || community_link.present? || forum_enabled?
   end
 
-  def self.import_from_resource_h!(resource_h)
-    find_or_initialize_by(name: resource_h[:name]).tap { |it| it.import_from_resource_h! resource_h }
-  end
-
-  def import_from_resource_h!(resource_h)
-    attrs = Mumukit::Platform::Organization::Helpers.slice_platform_json resource_h
-    attrs[:book] = Book.locate_resource attrs[:book]
-    update! attrs
-  end
-
   private
 
   def ensure_consistent_public_login

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '6.0.4'
+    VERSION = '6.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.1.2
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: mumukit-content-type
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: mumukit-directives
   requirement: !ruby/object:Gem::Requirement
@@ -500,7 +500,6 @@ 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

data/db/migrate/20181121165956_rename_choices_column.rb

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