moodle2cc 0.2.41 → 0.2.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa603c9e3f922b9707a0eea13a3f307ac8a4453d6fd252696c6363b36948a8d
-  data.tar.gz: 547291db25cdf930bef9b6a8f779426b269d67f844411fa9523618f604b2379d
+  metadata.gz: 00f4e9ab98639c0cfad6a74817e7658bcd09b6e8c7e5f6d344000321f3f226ae
+  data.tar.gz: f6ed3c60d489fc0949022feecf030cc8733b43294263da35844c866c63b3777c
 SHA512:
-  metadata.gz: 66d6a5bd829bf90b7fe3032bea94e069f692d9b0e709664cc7f16a73cd16685d4742ee890030fa650fd84e7b0de9533092c89d0dbd3b1919f82cd904497ba442
-  data.tar.gz: e1a9a228fab95550c39386a73baa2b03d90636e6b83884e7b91493001f3953b8111b7f3ebbea3a6e312e9cda0dc2dc8eef7e9b5366a656edc2d1ba67d66cab0d
+  metadata.gz: 90961bcb581bbb15314bce622dac900fca05a840e9c80f73602341759f69a00ce644299a9348015387067335d467549920f02d63ca147db503b6d3cbe441fba7
+  data.tar.gz: 3b8a6392926134b26847a2ada520eaff43698e27f9dcbd724acbd260a632c770775d15fea37786cf427527b1b81c65370e28aaebcc3038b74118e1f6eb6fc660

data/lib/moodle2cc/canvas/question.rb

@@ -148,9 +148,9 @@ module Moodle2CC::Canvas
         end
       end
 
-      if question.instance_id
-        @assessment_question_identifierref = create_key(question.id, "#{@identifier_prefix}question_")
-      end
+      # if question.instance_id
+      @assessment_question_identifierref = create_key(question.instance_id || question.id, "#{@identifier_prefix}question_")
+      # end
     end
 
     def create_item_xml(section_node)

data/lib/moodle2cc/canvas_cc/models/assessment.rb

@@ -1,12 +1,21 @@
+# frozen_string_literal: true
+
 module Moodle2CC::CanvasCC::Models
   class Assessment
-    META_ATTRIBUTES = [:title, :description, :allowed_attempts,
-                       :scoring_policy, :access_code, :ip_filter, :shuffle_answers, :time_limit, :quiz_type]
-    DATETIME_ATTRIBUTES = [:lock_at, :unlock_at]
-
-    ASSESSMENT_TYPE = 'imsqti_xmlv1p2/imscc_xmlv1p1/assessment'
-    LAR_TYPE = 'associatedcontent/imscc_xmlv1p1/learning-application-resource'
-    ASSESSMENT_NON_CC_FOLDER = 'non_cc_assessments'
+    META_ATTRIBUTES = %i[title
+                         description
+                         allowed_attempts
+                         scoring_policy
+                         access_code
+                         ip_filter
+                         shuffle_answers
+                         time_limit
+                         quiz_type].freeze
+    DATETIME_ATTRIBUTES = [:lock_at, :unlock_at].freeze
+
+    ASSESSMENT_TYPE = "imsqti_xmlv1p2/imscc_xmlv1p1/assessment"
+    LAR_TYPE = "associatedcontent/imscc_xmlv1p1/learning-application-resource"
+    ASSESSMENT_NON_CC_FOLDER = "non_cc_assessments"
 
     attr_accessor :identifier, :workflow_state, :question_references, :items, *META_ATTRIBUTES, *DATETIME_ATTRIBUTES
 
@@ -54,14 +63,15 @@ module Moodle2CC::CanvasCC::Models
         question = nil
         group = nil
         question_banks.each do |bank|
-          break if (question = bank.questions.detect{|q| q.original_identifier.to_s == ref[:question]}) ||
-            (group = bank.question_groups.detect{|g| g.identifier.to_s == ref[:question]})
+          break if (question = bank.questions.detect { |q| q.original_identifier.to_s == ref[:question] })
+          break if (question = bank.questions.detect { |q| q.bank_entry_id.to_s == ref[:bank_entry_id] })
+          break if (group = bank.question_groups.detect { |g| g.identifier.to_s == ref[:question] })
 
-          if bank.random_question_references.any?{|r| r.to_s == ref[:question]}
-            random_bank_counts[bank] ||= 0
-            random_bank_counts[bank] += 1
-            break
-          end
+          next unless bank.random_question_references.any? { |r| r.to_s == ref[:question] }
+
+          random_bank_counts[bank] ||= 0
+          random_bank_counts[bank] += 1
+          break
         end
 
         if question
@@ -93,11 +103,11 @@ module Moodle2CC::CanvasCC::Models
         @items << new_group
       end
 
-      @items.select{|i| i.is_a?(Moodle2CC::CanvasCC::Models::QuestionGroup)}.each do |group|
+      @items.select { |i| i.is_a?(Moodle2CC::CanvasCC::Models::QuestionGroup) }.each do |group|
         group.questions.each do |q|
-          @items.delete_if{|i| i.respond_to?(:original_identifier) && i.original_identifier == q.original_identifier}
+          @items.delete_if { |i| i.respond_to?(:original_identifier) && i.original_identifier == q.original_identifier }
         end
       end
     end
   end
-end
+end

data/lib/moodle2cc/canvas_cc/models/question.rb

@@ -1,22 +1,28 @@
+# frozen_string_literal: true
+
 module Moodle2CC::CanvasCC::Models
   class Question
-    QTI_META_ATTRIBUTES = [:question_type, :points_possible, :assessment_question_identifierref]
-    STANDARD_QUESTION_TYPES = ['essay_question', 'fill_in_multiple_blanks_question',
-                               'multiple_choice_question', 'multiple_answers_question',
-                               'short_answer_question', 'text_only_question', 'true_false_question']
+    QTI_META_ATTRIBUTES = %i[question_type points_possible assessment_question_identifierref].freeze
+    STANDARD_QUESTION_TYPES = %w[essay_question
+                                 fill_in_multiple_blanks_question
+                                 multiple_choice_question
+                                 multiple_answers_question
+                                 short_answer_question
+                                 text_only_question
+                                 true_false_question].freeze
 
-    attr_accessor :identifier, :original_identifier, :title, :material, :answers, :general_feedback, *QTI_META_ATTRIBUTES
+    attr_accessor :identifier, :original_identifier, :bank_entry_id, :title, :material, :answers, :general_feedback, *QTI_META_ATTRIBUTES
 
     @@subclasses = {}
 
     def self.create(type)
       q = if STANDARD_QUESTION_TYPES.include?(type)
-        self.new
-      elsif c = @@subclasses[type]
-        c.new
-      else
-        raise "Unknown question type: #{type}"
-      end
+            new
+          elsif (c = @@subclasses[type])
+            c.new
+          else
+            raise "Unknown question type: #{type}"
+          end
       q.question_type = type
       q
     end
@@ -31,7 +37,7 @@ module Moodle2CC::CanvasCC::Models
   end
 end
 
-require_relative 'calculated_question'
-require_relative 'matching_question'
-require_relative 'multiple_dropdowns_question'
-require_relative 'numerical_question'
+require_relative "calculated_question"
+require_relative "matching_question"
+require_relative "multiple_dropdowns_question"
+require_relative "numerical_question"

data/lib/moodle2cc/moodle2/models/quizzes/question.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 module Moodle2CC::Moodle2::Models::Quizzes
   class Question
-
     @@subclasses = {}
 
-    STANDARD_TYPES = ['description', 'essay', 'random', 'shortanswer']
+    STANDARD_TYPES = %w[description essay random shortanswer].freeze
 
     def self.create(type)
-      if c = @@subclasses[type]
+      if (c = @@subclasses[type])
         q = c.new
         q.type = type
         q
       elsif STANDARD_TYPES.include?(type)
-        q = self.new
+        q = new
         q.type = type
         q
       else
@@ -23,11 +24,26 @@ module Moodle2CC::Moodle2::Models::Quizzes
       @@subclasses[name] = self
     end
 
-    attr_accessor :id, :parent, :name, :question_text, :question_text_format, :general_feedback, :default_mark, :max_mark,
-                  :penalty, :qtype, :length, :stamp, :version, :hidden, :answers, :type
+    attr_accessor :id,
+                  :bank_entry_id,
+                  :parent,
+                  :name,
+                  :question_text,
+                  :question_text_format,
+                  :general_feedback,
+                  :default_mark,
+                  :max_mark,
+                  :penalty,
+                  :qtype,
+                  :length,
+                  :stamp,
+                  :version,
+                  :hidden,
+                  :answers,
+                  :type
 
     def initialize
       @answers = []
     end
   end
-end
+end

data/lib/moodle2cc/moodle2/parsers/forum_parser.rb

@@ -22,8 +22,8 @@ module Moodle2CC::Moodle2::Parsers
       activity_dir = File.join(@backup_dir, forum_dir)
       File.open(File.join(activity_dir, xml_file)) do |f|
         forum_xml = Nokogiri::XML(f)
-        forum.id = forum_xml.at_xpath("/activity/#{module_name}/@id").value
-        forum.module_id = forum_xml.at_xpath("/activity/@moduleid").value
+        forum.id = forum_xml.at_xpath("/activity/#{module_name}/@id")&.value
+        forum.module_id = forum_xml.at_xpath("/activity/@moduleid")&.value
         forum.name = parse_text(forum_xml, "/activity/#{module_name}/name")
         forum.type = parse_text(forum_xml, "/activity/#{module_name}/type")
         forum.intro = parse_text(forum_xml, "/activity/#{module_name}/intro")

data/lib/moodle2cc/moodle2/parsers/question_category_parser.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Moodle2CC::Moodle2
   class Parsers::QuestionCategoryParser
     include Parsers::ParserHelper
 
-    QUESTIONS_XML = 'questions.xml'
+    QUESTIONS_XML = "questions.xml"
 
     def initialize(backup_dir)
       @backup_dir = backup_dir
@@ -11,7 +13,7 @@ module Moodle2CC::Moodle2
     def parse
       File.open(File.join(@backup_dir, QUESTIONS_XML)) do |f|
         root_xml = Nokogiri::XML(f)
-        root_xml.search('/question_categories/question_category').map { |node| question_category_parser(node) }
+        root_xml.search("/question_categories/question_category").map { |node| question_category_parser(node) }
       end
     end
 
@@ -19,30 +21,38 @@ module Moodle2CC::Moodle2
 
     def question_category_parser(node)
       category = Models::Quizzes::QuestionCategory.new
-      category.id = node.at_xpath('@id').value
-      category.name = parse_text(node, 'name')
-      category.context_id = parse_text(node, 'contextid')
-      category.context_level = parse_text(node, 'contextlevel')
-      category.context_instance_id = parse_text(node, 'contextinstanceid')
-      category.info = parse_text(node, 'info')
-      category.info_format = parse_text(node, 'infoformat')
-      category.stamp = parse_text(node, 'stamp')
-      category.parent = parse_text(node, 'parent')
-      category.sort_order = parse_text(node, 'sortorder')
-
-      category.questions += node.search('questions/question').map { |question_node| question_parser(question_node) }.compact
+      category.id = node.at_xpath("@id").value
+      category.name = parse_text(node, "name")
+      category.context_id = parse_text(node, "contextid")
+      category.context_level = parse_text(node, "contextlevel")
+      category.context_instance_id = parse_text(node, "contextinstanceid")
+      category.info = parse_text(node, "info")
+      category.info_format = parse_text(node, "infoformat")
+      category.stamp = parse_text(node, "stamp")
+      category.parent = parse_text(node, "parent")
+      category.sort_order = parse_text(node, "sortorder")
+
+      category.questions += node.search("questions/question").filter_map { |question_node| question_parser(question_node) }
+      category.questions += node.search("question_bank_entries/question_bank_entry").map do |question_bank_entry|
+        question_bank_entry.search("question_version/question_versions").map do |question_versions|
+          question_versions.search("questions/question").map do |question_node|
+            bank_entry_reference = Nokogiri::XML::DocumentFragment.parse("<bank_entry_id>#{question_bank_entry.at_xpath("@id").value}</bank_entry_id>")
+            question_node.add_child(bank_entry_reference)
+            question_parser(question_node)
+          end
+        end
+      end.flatten.compact
+
+      category.questions = category.questions.flatten
 
       category
     end
 
     def question_parser(node)
-      begin
-        Parsers::QuestionParsers::QuestionParser.parse(node)
-      rescue Exception => e
-        Moodle2CC::OutputLogger.logger.info e.message
-        nil
-      end
+      Parsers::QuestionParsers::QuestionParser.parse(node)
+    rescue Exception => e
+      Moodle2CC::OutputLogger.logger.info e.message
+      nil
     end
-
   end
 end

data/lib/moodle2cc/moodle2/parsers/question_parsers/question_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moodle2CC::Moodle2
   class Parsers::QuestionParsers::QuestionParser
     include Parsers::ParserHelper
@@ -5,8 +7,8 @@ module Moodle2CC::Moodle2
     @@subclasses = {}
 
     def self.parse(node)
-      type = node.%('qtype').text
-      if c = @@subclasses[type]
+      type = node.%("qtype").text
+      if (c = @@subclasses[type])
         c.new.parse_question(node)
       else
         raise "Unknown parser type: #{type}"
@@ -18,37 +20,34 @@ module Moodle2CC::Moodle2
     end
 
     # simple question types
-    register_parser_type('description')
-    register_parser_type('essay')
-    register_parser_type('random')
+    register_parser_type("description")
+    register_parser_type("essay")
+    register_parser_type("random")
 
     def parse_question(node, question_type = nil)
-      begin
-        question_type ||= parse_text(node, 'qtype')
-        question = Models::Quizzes::Question.create question_type
-
-        question.id = node.at_xpath('@id').value
-        question.parent = parse_text(node, 'parent')
-        question.name = parse_text(node, 'name')
-        question.question_text = parse_text(node, 'questiontext')
-        question.question_text_format = parse_text(node, 'questiontextformat')
-        question.general_feedback = parse_text(node, 'generalfeedback')
-        question.default_mark = parse_text(node, 'defaultmark')
-        question.max_mark = parse_text(node, 'maxmark')
-        question.penalty = parse_text(node, 'penalty')
-        question.qtype = parse_text(node, 'qtype')
-        question.length = parse_text(node, 'length')
-        question.stamp = parse_text(node, 'stamp')
-        question.version = parse_text(node, 'version')
-        question.hidden = parse_boolean(node, 'hidden')
-
-        question
-      rescue Exception => e
-        Moodle2CC::OutputLogger.logger.info e.message
-        nil
-      end
+      question_type ||= parse_text(node, "qtype")
+      question = Models::Quizzes::Question.create question_type
+
+      question.id = node.at_xpath("@id").value
+      question.bank_entry_id = parse_text(node, "bank_entry_id")
+      question.parent = parse_text(node, "parent")
+      question.name = parse_text(node, "name")
+      question.question_text = parse_text(node, "questiontext")
+      question.question_text_format = parse_text(node, "questiontextformat")
+      question.general_feedback = parse_text(node, "generalfeedback")
+      question.default_mark = parse_text(node, "defaultmark")
+      question.max_mark = parse_text(node, "maxmark")
+      question.penalty = parse_text(node, "penalty")
+      question.qtype = parse_text(node, "qtype")
+      question.length = parse_text(node, "length")
+      question.stamp = parse_text(node, "stamp")
+      question.version = parse_text(node, "version")
+      question.hidden = parse_boolean(node, "hidden")
+
+      question
+    rescue Exception => e
+      Moodle2CC::OutputLogger.logger.info e.message
+      nil
     end
-
-
   end
 end

data/lib/moodle2cc/moodle2/parsers/quiz_parser.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Moodle2CC::Moodle2::Parsers
   class QuizParser
     include ParserHelper
 
-    QUIZ_XML = 'quiz.xml'
-    QUIZ_MODULE_NAME = 'quiz'
+    QUIZ_XML = "quiz.xml"
+    QUIZ_MODULE_NAME = "quiz"
 
     def initialize(backup_dir)
       @backup_dir = backup_dir
@@ -21,65 +23,66 @@ module Moodle2CC::Moodle2::Parsers
       activity_dir = File.join(@backup_dir, dir)
       File.open(File.join(activity_dir, QUIZ_XML)) do |f|
         xml = Nokogiri::XML(f)
-        quiz.id = xml.at_xpath('/activity/quiz/@id').value
-        quiz.module_id = xml.at_xpath('/activity/@moduleid').value
-        quiz.name = parse_text(xml, '/activity/quiz/name')
-        quiz.intro = parse_text(xml, '/activity/quiz/intro')
-        quiz.intro_format = parse_text(xml, '/activity/quiz/introformat')
-        quiz.time_open = parse_text(xml, '/activity/quiz/timeopen')
-        quiz.time_close = parse_text(xml, '/activity/quiz/timeclose')
-        quiz.time_limit = parse_text(xml, '/activity/quiz/timelimit')
-        quiz.overdue_handling = parse_text(xml, '/activity/quiz/overduehandling')
-        quiz.grace_period = parse_text(xml, '/activity/quiz/graceperiod')
-        quiz.preferred_behavior = parse_text(xml, '/activity/quiz/preferredbehaviour')
-        quiz.attempts_number = parse_text(xml, '/activity/quiz/attempts_number')
-        quiz.attempt_on_last = parse_text(xml, '/activity/quiz/attemptonlast')
-        quiz.grade_method = parse_text(xml, '/activity/quiz/grademethod')
-        quiz.decimal_points = parse_text(xml, '/activity/quiz/decimalpoints')
-        quiz.question_decimal_points = parse_text(xml, '/activity/quiz/questiondecimalpoints')
-        quiz.review_attempt = parse_text(xml, '/activity/quiz/reviewattempt')
-        quiz.review_correctness = parse_text(xml, '/activity/quiz/reviewcorrectness')
-        quiz.review_marks = parse_text(xml, '/activity/quiz/reviewmarks')
-        quiz.review_specific_feedback = parse_text(xml, '/activity/quiz/reviewspecificfeedback')
-        quiz.review_general_feedback = parse_text(xml, '/activity/quiz/reviewgeneralfeedback')
-        quiz.review_right_answer = parse_text(xml, '/activity/quiz/reviewrightanswer')
-        quiz.review_overall_feedback = parse_text(xml, '/activity/quiz/reviewoverallfeedback')
-        quiz.questions_per_page = parse_text(xml, '/activity/quiz/questionsperpage')
-        quiz.nav_method = parse_text(xml, '/activity/quiz/navmethod')
+        quiz.id = xml.at_xpath("/activity/quiz/@id").value
+        quiz.module_id = xml.at_xpath("/activity/@moduleid").value
+        quiz.name = parse_text(xml, "/activity/quiz/name")
+        quiz.intro = parse_text(xml, "/activity/quiz/intro")
+        quiz.intro_format = parse_text(xml, "/activity/quiz/introformat")
+        quiz.time_open = parse_text(xml, "/activity/quiz/timeopen")
+        quiz.time_close = parse_text(xml, "/activity/quiz/timeclose")
+        quiz.time_limit = parse_text(xml, "/activity/quiz/timelimit")
+        quiz.overdue_handling = parse_text(xml, "/activity/quiz/overduehandling")
+        quiz.grace_period = parse_text(xml, "/activity/quiz/graceperiod")
+        quiz.preferred_behavior = parse_text(xml, "/activity/quiz/preferredbehaviour")
+        quiz.attempts_number = parse_text(xml, "/activity/quiz/attempts_number")
+        quiz.attempt_on_last = parse_text(xml, "/activity/quiz/attemptonlast")
+        quiz.grade_method = parse_text(xml, "/activity/quiz/grademethod")
+        quiz.decimal_points = parse_text(xml, "/activity/quiz/decimalpoints")
+        quiz.question_decimal_points = parse_text(xml, "/activity/quiz/questiondecimalpoints")
+        quiz.review_attempt = parse_text(xml, "/activity/quiz/reviewattempt")
+        quiz.review_correctness = parse_text(xml, "/activity/quiz/reviewcorrectness")
+        quiz.review_marks = parse_text(xml, "/activity/quiz/reviewmarks")
+        quiz.review_specific_feedback = parse_text(xml, "/activity/quiz/reviewspecificfeedback")
+        quiz.review_general_feedback = parse_text(xml, "/activity/quiz/reviewgeneralfeedback")
+        quiz.review_right_answer = parse_text(xml, "/activity/quiz/reviewrightanswer")
+        quiz.review_overall_feedback = parse_text(xml, "/activity/quiz/reviewoverallfeedback")
+        quiz.questions_per_page = parse_text(xml, "/activity/quiz/questionsperpage")
+        quiz.nav_method = parse_text(xml, "/activity/quiz/navmethod")
 
-        quiz.shuffle_questions = parse_boolean(xml, '/activity/quiz/shufflequestions')
-        quiz.shuffle_answers = parse_boolean(xml, '/activity/quiz/shuffleanswers')
+        quiz.shuffle_questions = parse_boolean(xml, "/activity/quiz/shufflequestions")
+        quiz.shuffle_answers = parse_boolean(xml, "/activity/quiz/shuffleanswers")
 
-        quiz.sum_grades = parse_text(xml, '/activity/quiz/sumgrades')
-        quiz.grade = parse_text(xml, '/activity/quiz/grade')
-        quiz.time_created = parse_text(xml, '/activity/quiz/timecreated')
-        quiz.time_modified = parse_text(xml, '/activity/quiz/timemodified')
-        quiz.password = parse_text(xml, '/activity/quiz/password')
-        quiz.subnet = parse_text(xml, '/activity/quiz/subnet')
-        quiz.browser_security = parse_text(xml, '/activity/quiz/browsersecurity')
-        quiz.delay1 = parse_text(xml, '/activity/quiz/delay1')
-        quiz.delay2 = parse_text(xml, '/activity/quiz/delay2')
-        quiz.show_user_picture = parse_text(xml, '/activity/quiz/showuserpicture')
-        quiz.show_blocks = parse_text(xml, '/activity/quiz/showblocks')
+        quiz.sum_grades = parse_text(xml, "/activity/quiz/sumgrades")
+        quiz.grade = parse_text(xml, "/activity/quiz/grade")
+        quiz.time_created = parse_text(xml, "/activity/quiz/timecreated")
+        quiz.time_modified = parse_text(xml, "/activity/quiz/timemodified")
+        quiz.password = parse_text(xml, "/activity/quiz/password")
+        quiz.subnet = parse_text(xml, "/activity/quiz/subnet")
+        quiz.browser_security = parse_text(xml, "/activity/quiz/browsersecurity")
+        quiz.delay1 = parse_text(xml, "/activity/quiz/delay1")
+        quiz.delay2 = parse_text(xml, "/activity/quiz/delay2")
+        quiz.show_user_picture = parse_text(xml, "/activity/quiz/showuserpicture")
+        quiz.show_blocks = parse_text(xml, "/activity/quiz/showblocks")
 
-        xml.search('/activity/quiz/question_instances/question_instance').each do |node|
+        xml.search("/activity/quiz/question_instances/question_instance").each do |node|
           quiz.question_instances << {
-            :question => parse_text(node, 'question') || parse_text(node, 'questionid'),
-            :grade => parse_text(node, 'grade') || parse_text(node, 'maxmark')
+            question: parse_text(node, "question") || parse_text(node, "questionid"),
+            bank_entry_id: parse_text(node, "question_reference/questionbankentryid"),
+            grade: parse_text(node, "grade") || parse_text(node, "maxmark")
           }
         end
 
-        question_order = parse_text(xml, '/activity/quiz/questions').to_s.split(',')
+        question_order = parse_text(xml, "/activity/quiz/questions").to_s.split(",")
         unless question_order.empty?
-          quiz.question_instances.sort_by!{|qi| question_order.index(qi[:question])}
+          quiz.question_instances.sort_by! { |qi| question_order.index(qi[:question]) || 0 }
         end
 
-        xml.search('/activity/quiz/feedbacks/feedback').each do |node|
+        xml.search("/activity/quiz/feedbacks/feedback").each do |node|
           quiz.feedbacks << {
-            :text => parse_text(node, 'feedbacktext'),
-            :format => parse_text(node, 'feedbacktextformat'),
-            :min_grade => parse_text(node, 'mingrade'),
-            :max_grade => parse_text(node, 'maxgrade')
+            text: parse_text(node, "feedbacktext"),
+            format: parse_text(node, "feedbacktextformat"),
+            min_grade: parse_text(node, "mingrade"),
+            max_grade: parse_text(node, "maxgrade")
           }
         end
       end
@@ -87,6 +90,5 @@ module Moodle2CC::Moodle2::Parsers
 
       quiz
     end
-
   end
-end
+end

data/lib/moodle2cc/moodle2converter/question_converters/question_converter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moodle2CC::Moodle2Converter
   module QuestionConverters
     class QuestionConverter
@@ -13,17 +15,17 @@ module Moodle2CC::Moodle2Converter
       end
 
       STANDARD_CONVERSIONS = {
-        'description' => 'text_only_question',
-        'essay' => 'essay_question',
-        'shortanswer' => 'short_answer_question'
-      }
+        "description" => "text_only_question",
+        "essay" => "essay_question",
+        "shortanswer" => "short_answer_question"
+      }.freeze
 
       def convert(moodle_question)
         type = moodle_question.type
-        if type && c = @@subclasses[type]
+        if type && (c = @@subclasses[type])
           c.new.convert_question(moodle_question)
-        elsif type && question_type = STANDARD_CONVERSIONS[type]
-          self.convert_question(moodle_question, question_type)
+        elsif type && (question_type = STANDARD_CONVERSIONS[type])
+          convert_question(moodle_question, question_type)
         else
           raise "Unknown converter type: #{type}"
         end
@@ -31,29 +33,31 @@ module Moodle2CC::Moodle2Converter
 
       def convert_question(moodle_question, question_type = nil)
         canvas_question = create_canvas_question(question_type, moodle_question)
-        canvas_question.identifier = generate_unique_identifier_for(moodle_question.id, '_quiz_question')
+        canvas_question.identifier = generate_unique_identifier_for(moodle_question.id, "_quiz_question")
         canvas_question.original_identifier = moodle_question.id
+        canvas_question.bank_entry_id = moodle_question.bank_entry_id
         canvas_question.title = truncate_text(moodle_question.name)
         canvas_question.points_possible = moodle_question.max_mark
         canvas_question.general_feedback = moodle_question.general_feedback
         canvas_question.answers = moodle_question.answers.map do |moodle_answer|
-           Moodle2CC::CanvasCC::Models::Answer.new(moodle_answer)
+          Moodle2CC::CanvasCC::Models::Answer.new(moodle_answer)
         end
         canvas_question.material = convert_question_text(moodle_question)
         canvas_question
       end
 
       def convert_question_text(moodle_question)
-        material = moodle_question.question_text || ''
+        material = moodle_question.question_text || ""
         material = RDiscount.new(material).to_html if moodle_question.question_text_format.to_i == 4 # markdown
         material
       end
 
       def create_canvas_question(question_type = nil, question = nil)
         question_type ||= self.class.canvas_question_type
-        raise 'set canvas_question_type in question converter subclasses' unless question_type
+        raise "set canvas_question_type in question converter subclasses" unless question_type
+
         Moodle2CC::CanvasCC::Models::Question.create(question_type)
       end
     end
   end
-end
+end

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.41"
+  VERSION = "0.2.43"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.41
+  version: 0.2.43
 platform: ruby
 authors:
 - Christopher Durtschi
 - Kevin Carter
 - Instructure
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -409,7 +409,7 @@ homepage: https://github.com/instructure/moodle2cc
 licenses:
 - AGPLv3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -424,9 +424,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Migrates Moodle backup ZIP to IMS Common Cartridge package
 test_files: []