moodle2cc 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a600552337a2b45e2b9a0878149e3cb61d7a10c9
-  data.tar.gz: c3ac55a6630b19f53f7b3926ad5ae412cfc2de7f
+  metadata.gz: 822f9cffd3b238adb3b971d6bf64a300c520a1fd
+  data.tar.gz: 9da80263ebae391337993e9163650ea8b373a754
 SHA512:
-  metadata.gz: 30d47158a1782a2ab93acf4fba5e063e5012be0ca7b53aaeec106c2ebd7c766e3cf818dceca016a1425feb79ee9d725911ca0ee762d3b4c969bd1cc192890e1d
-  data.tar.gz: 6c45ffdd8a31f73d4768b21ca99795373c6dc10b86a3836cff475b1df1d023af31930b99a3ad33d129d307cff570cb07df84ea72ab0173bdea48e5e0e812760c
+  metadata.gz: e9047f2fab33dd05f09cdaa47681f03cedb883f544c355431a0c900ead6f343a7209bbf24c4d74e7d45a1b5d20be7f0d4827e7d7c78ab81d046e8b4351c5400d
+  data.tar.gz: 292b07a59bb7c6bc515039799a5bb37a7b5929c8f9af19d914dcaeccc4493adb6aaa5b50bbbd5e711f9050a6612f954b0de8db22eebc8f502c2252bac276f677

data/Changelog

@@ -1,3 +1,10 @@
+2014-04-16 Version 0.2.6
+  * Substituting more variables in urls/file paths
+	* Many quiz settings fixes and quiz question improvements
+	* Wiki activity converted to html pages
+	* Better handle duplicate page names
+	* Better handling of long titles
+
 2014-04-16 Version 0.2.5
   * Don't default to allowing url submissions for assignments
 	* Long labels are converted to html pages instead of being truncated

data/lib/moodle2cc.rb

@@ -82,6 +82,7 @@ module Moodle2CC
     autoload :MultipleAnswersQuestionWriter, 'moodle2cc/canvas_cc/multiple_answers_question_writer'
     autoload :MultipleBlanksQuestionWriter, 'moodle2cc/canvas_cc/multiple_blanks_question_writer'
     autoload :MultipleChoiceQuestionWriter, 'moodle2cc/canvas_cc/multiple_choice_question_writer'
+    autoload :MultipleDropdownsQuestionWriter, 'moodle2cc/canvas_cc/multiple_dropdowns_question_writer'
     autoload :NumericalQuestionWriter, 'moodle2cc/canvas_cc/numerical_question_writer'
     autoload :ShortAnswerQuestionWriter, 'moodle2cc/canvas_cc/short_answer_question_writer'
     autoload :TextOnlyQuestionWriter, 'moodle2cc/canvas_cc/text_only_question_writer'
@@ -96,6 +97,7 @@ module Moodle2CC
       autoload :Assessment, 'moodle2cc/canvas_cc/models/assessment'
       autoload :DiscussionTopic, 'moodle2cc/canvas_cc/models/discussion_topic'
       autoload :Question, 'moodle2cc/canvas_cc/models/question'
+      autoload :CalculatedQuestion, 'moodle2cc/canvas_cc/models/calculated_question'
       autoload :Answer, 'moodle2cc/canvas_cc/models/answer'
       autoload :QuestionBank, 'moodle2cc/canvas_cc/models/question_bank'
       autoload :QuestionGroup, 'moodle2cc/canvas_cc/models/question_group'
@@ -128,5 +130,6 @@ module Moodle2CC
     autoload :HomepageConverter, 'moodle2cc/moodle2converter/homepage_converter'
     autoload :GlossaryConverter, 'moodle2cc/moodle2converter/glossary_converter'
     autoload :LabelConverter, 'moodle2cc/moodle2converter/label_converter'
+    autoload :WikiConverter, 'moodle2cc/moodle2converter/wiki_converter'
   end
 end

data/lib/moodle2cc/canvas_cc/calculated_question_writer.rb

@@ -53,6 +53,17 @@ module Moodle2CC::CanvasCC
               end
             end
           end
+
+          calculated_node.var_sets do |var_sets_node|
+            question.var_sets.each do |var_set|
+              ident = var_set[:vars].sort.map { |k,v| v.to_s.split('.').join }.flatten.join
+              var_sets_node.var_set(:ident => ident) do |var_set_node|
+                var_set[:vars].each do |k, v|
+                  var_set_node.var(v, :name => k)
+                end
+              end
+            end
+          end
         end
       end
 

data/lib/moodle2cc/canvas_cc/matching_question_writer.rb

@@ -7,14 +7,15 @@ module Moodle2CC::CanvasCC
     def self.write_responses(presentation_node, question)
       question.matches.each do |match|
         presentation_node.response_lid(:ident => "response_#{match[:id]}") do |response_node|
+          next unless match[:question_text].length > 0
           response_node.material do |material_node|
-            material_node.mattext(match[:question_text], :texttype => 'text/html')
+            material_node.mattext(match[:question_text], :texttype => 'text/plain')
           end
           response_node.render_choice do |choice_node|
             question.matches.each do |possible_match|
               choice_node.response_label(:ident => possible_match[:id]) do |label_node|
                 label_node.material do |material_node|
-                  material_node.mattext possible_match[:answer_text]
+                  material_node.mattext(possible_match[:answer_text], :texttype => 'text/plain')
                 end
               end
             end
@@ -24,8 +25,9 @@ module Moodle2CC::CanvasCC
     end
 
     def self.write_response_conditions(processing_node, question)
-      score = 100.0 / question.matches.length.to_i
-      question.matches.each do |match|
+      real_matches = question.matches.select{|m| m[:question_text].length > 0}
+      score = 100.0 / real_matches.length.to_i
+      real_matches.each do |match|
         processing_node.respcondition do |condition_node|
           condition_node.conditionvar do |var_node|
             var_node.varequal match[:id], :respident => "response_#{match[:id]}"

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

@@ -44,7 +44,7 @@ module Moodle2CC::CanvasCC::Models
       "#{ASSESSMENT_NON_CC_FOLDER}/#{@identifier}.xml.qti"
     end
 
-    def resolve_question_references(question_banks)
+    def resolve_question_references!(question_banks)
       @items ||= []
       @question_references.each do |ref|
         question = nil

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

@@ -2,6 +2,18 @@ module Moodle2CC::CanvasCC::Models
   class CalculatedQuestion < Question
     register_question_type 'calculated_question'
 
-    attr_accessor :correct_answer_format, :correct_answer_length, :dataset_definitions, :tolerance
+    attr_accessor :correct_answer_format, :correct_answer_length, :dataset_definitions, :tolerance, :var_sets
+
+    def post_process!
+      @material.gsub!(/\{([\w\s]*?)\}/, '[\1]') if @material
+
+      return unless @answers
+      @answers.each do |answer|
+        if answer.answer_text
+          answer.answer_text.gsub!(/\{([\w\s]*?)\}/, '\1')
+          answer.answer_text = answer.answer_text.sub('=', '') if answer.answer_text.start_with?('=')
+        end
+      end
+    end
   end
 end

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

@@ -38,9 +38,9 @@ module Moodle2CC::CanvasCC::Models
       @settings[method.to_sym]
     end
 
-    def resolve_question_references
+    def resolve_question_references!
       return unless @assessments && @question_banks
-      @assessments.each{|a| a.resolve_question_references(@question_banks)}
+      @assessments.each{|a| a.resolve_question_references!(@question_banks)}
     end
 
     def mute_assignments!

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

@@ -0,0 +1,7 @@
+module Moodle2CC::CanvasCC::Models
+  class MultipleDropdownsQuestion < Question
+    register_question_type 'multiple_dropdowns_question'
+
+    attr_accessor :responses
+  end
+end

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

@@ -7,6 +7,8 @@ module Moodle2CC::CanvasCC::Models
 
     EDITING_ROLE_TEACHER = 'teachers'
 
+    MAX_URL_LENGTH = 80
+
     attr_accessor :workflow_state, :editing_roles, :body, :title
 
     def initialize
@@ -28,7 +30,11 @@ module Moodle2CC::CanvasCC::Models
     end
 
     def self.convert_name_to_url(name)
-      CGI::escape(name.downcase.gsub(/\s/, '-').gsub('.', 'dot'))
+      url = CGI::escape(name.downcase.gsub(/\s/, '-').gsub('.', 'dot'))
+      if url.length > MAX_URL_LENGTH
+        url = url[0,MAX_URL_LENGTH][/.{0,#{MAX_URL_LENGTH}}/mu]
+      end
+      url
     end
 
   end

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

@@ -33,4 +33,5 @@ end
 
 require_relative 'calculated_question'
 require_relative 'matching_question'
+require_relative 'multiple_dropdowns_question'
 require_relative 'numerical_question'

data/lib/moodle2cc/canvas_cc/multiple_answers_question_writer.rb

@@ -21,14 +21,15 @@ module Moodle2CC::CanvasCC
     def self.write_response_conditions(processing_node, question)
       return unless question.answers.count > 0
       processing_node.respcondition(:continue => 'No') do |condition_node|
-        first = question.answers.first
-        rest = question.answers[1..-1]
         condition_node.conditionvar do |var_node|
           var_node.and do |and_node|
-            and_node.varequal first.id, :respident => 'response1'
-            rest.each do |answer|
-              and_node.not do |not_node|
-                not_node.varequal answer.id, :respident => 'response1'
+            question.answers.each do |answer|
+              if answer.fraction.to_f > 0
+                and_node.varequal answer.id, :respident => 'response1'
+              else
+                and_node.not do |not_node|
+                  not_node.varequal answer.id, :respident => 'response1'
+                end
               end
             end
           end

data/lib/moodle2cc/canvas_cc/multiple_dropdowns_question_writer.rb

@@ -0,0 +1,30 @@
+module Moodle2CC::CanvasCC
+  class MultipleDropdownsQuestionWriter < QuestionWriter
+    register_writer_type 'multiple_dropdowns_question'
+
+    private
+
+    def self.write_responses(presentation_node, question)
+      question.responses.each do |response|
+        presentation_node.response_lid(:ident => "response_#{response[:id]}") do |response_node|
+          response_node.material do |material_node|
+            material_node.mattext(response[:id], :texttype => 'text/plain')
+          end
+          response_node.render_choice do |choice_node|
+            response[:choices].each do |choice|
+              choice_node.response_label(:ident => choice[:id]) do |label_node|
+                label_node.material do |material_node|
+                  material_node.mattext(choice[:text], :texttype => 'text/plain')
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    def self.write_response_conditions(processing_node, question)
+      # this is always an answerless questionnaire question (for now), so no response conditions are necessary
+    end
+  end
+end

data/lib/moodle2cc/canvas_cc/question_writer.rb

@@ -79,7 +79,7 @@ module Moodle2CC::CanvasCC
     end
 
     def self.write_general_feedback(item_node, question)
-      if question.general_feedback
+      if question.general_feedback && question.general_feedback.length > 0
         item_node.itemfeedback(:ident => 'general_fb') do |fb_node|
           fb_node.flow_mat do |flow_node|
             flow_node.material do |material_node|
@@ -122,6 +122,7 @@ require_relative 'matching_question_writer'
 require_relative 'multiple_answers_question_writer'
 require_relative 'multiple_blanks_question_writer'
 require_relative 'multiple_choice_question_writer'
+require_relative 'multiple_dropdowns_question_writer'
 require_relative 'numerical_question_writer'
 require_relative 'short_answer_question_writer'
 require_relative 'text_only_question_writer'

data/lib/moodle2cc/moodle2/extractor.rb

@@ -20,6 +20,7 @@ module Moodle2CC::Moodle2
         parse_assignments(work_dir, course)
         parse_books(work_dir, course)
         parse_folders(work_dir, course)
+        parse_wikis(work_dir, course)
         parse_question_categories(work_dir, course)
 
         parse_quizzes(work_dir, course)
@@ -67,6 +68,12 @@ module Moodle2CC::Moodle2
       end
     end
 
+    def parse_wikis(work_dir, course)
+      if wikis = Moodle2CC::Moodle2::Parsers::WikiParser.new(work_dir).parse
+        course.wikis += wikis
+      end
+    end
+
     def parse_forums(work_dir, course)
       if forums = Moodle2CC::Moodle2::Parsers::ForumParser.new(work_dir).parse
         course.forums += forums

data/lib/moodle2cc/moodle2/models.rb

@@ -17,5 +17,5 @@ module Moodle2CC::Moodle2::Models
   require_relative 'models/label'
   require_relative 'models/questionnaire'
   require_relative 'models/resource'
-
+  require_relative 'models/wiki'
 end

data/lib/moodle2cc/moodle2/models/course.rb

@@ -4,7 +4,7 @@ module Moodle2CC::Moodle2::Models
                   :course_id, :show_grades, :sections, :files, :pages, :forums, :assignments,
                   :books, :folders, :question_categories, :quizzes, :glossaries,
                   :labels, :resources, :external_urls, :choices, :questionnaires,
-                  :feedbacks
+                  :feedbacks, :wikis
 
     def initialize
       @sections = []
@@ -23,11 +23,12 @@ module Moodle2CC::Moodle2::Models
       @labels = []
       @resources = []
       @external_urls = []
+      @wikis = []
     end
 
     def activities
       pages + forums + assignments + books + folders + quizzes + labels + resources + glossaries +
-        external_urls + choices + questionnaires + feedbacks
+        external_urls + choices + questionnaires + feedbacks + wikis
     end
 
   end

data/lib/moodle2cc/moodle2/models/label.rb

@@ -38,9 +38,9 @@ module Moodle2CC::Moodle2::Models
       @converted_title = name_text
 
       if @converted_title == "Label" || @converted_title.end_with?("...") || @converted_title.length == 0
-        if intro_text.length > 80
-
-          @converted_title = intro_text[0..79] + "..."
+        if intro_text.length > Moodle2CC::Moodle2Converter::ConverterHelper::MAX_TITLE_LENGTH
+          @truncate = true
+          @converted_title = intro_text # we will truncate in the label_converter
           @convert_to_page = true
         else
           if intro_text.length > 0
@@ -52,8 +52,8 @@ module Moodle2CC::Moodle2::Models
         end
       end
 
-      # if the intro has no text or the text is identical, then convert to page if it has tags
-      if @converted_title == intro_text || intro_text.length == 0
+      # if the intro has no text or the text is identical, then convert to page only if it has tags
+      if (@converted_title == intro_text && !@truncate) || intro_text.length == 0
         @convert_to_page = intro_html.search('img[src]').length > 0 ||
             intro_html.search('a[href]').length > 0 ||
             intro_html.search('iframe[src]').length > 0

data/lib/moodle2cc/moodle2/models/questionnaire.rb

@@ -9,7 +9,7 @@ module Moodle2CC::Moodle2::Models
     end
 
     class Question
-      attr_accessor :id, :name, :type_id, :content, :position, :deleted, :choices
+      attr_accessor :id, :name, :type_id, :content, :position, :deleted, :choices, :precise, :length
 
       def initialize
         @choices = []

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

@@ -6,6 +6,7 @@ module Moodle2CC::Moodle2::Models::Quizzes
   require_relative 'quizzes/calculated_question'
   require_relative 'quizzes/match_question'
   require_relative 'quizzes/multianswer_question'
+  require_relative 'quizzes/multichoice_question'
   require_relative 'quizzes/numerical_question'
   require_relative 'quizzes/random_sa_question'
   require_relative 'quizzes/true_false_question'

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

@@ -1,11 +1,12 @@
 module Moodle2CC::Moodle2::Models::Quizzes
   class CalculatedQuestion < Question
     register_question_type 'calculated'
-    attr_accessor :correct_answer_format, :correct_answer_length, :dataset_definitions, :tolerance
+    attr_accessor :correct_answer_format, :correct_answer_length, :dataset_definitions, :tolerance, :var_sets
 
     def initialize
       super
       @dataset_definitions = []
+      @var_sets = []
     end
   end
 end

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

@@ -0,0 +1,6 @@
+module Moodle2CC::Moodle2::Models::Quizzes
+  class MultichoiceQuestion < Question
+    register_question_type 'multichoice'
+    attr_accessor :single
+  end
+end

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

@@ -3,7 +3,7 @@ module Moodle2CC::Moodle2::Models::Quizzes
 
     @@subclasses = {}
 
-    STANDARD_TYPES = ['description', 'essay', 'multichoice', 'shortanswer']
+    STANDARD_TYPES = ['description', 'essay', 'shortanswer']
 
     def self.create(type)
       if c = @@subclasses[type]

data/lib/moodle2cc/moodle2/models/wiki.rb

@@ -0,0 +1,10 @@
+module Moodle2CC::Moodle2::Models
+  class Wiki
+
+    attr_accessor :id, :module_id, :name, :intro, :intro_format, :visible, :first_page_title, :pages
+
+    def initialize
+      @pages = []
+    end
+  end
+end

data/lib/moodle2cc/moodle2/parsers.rb

@@ -19,4 +19,5 @@ module Moodle2CC::Moodle2::Parsers
   require_relative 'parsers/label_parser'
   require_relative 'parsers/external_url_parser'
   require_relative 'parsers/resource_parser'
+  require_relative 'parsers/wiki_parser'
 end

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

@@ -13,12 +13,12 @@ module Moodle2CC::Moodle2::Parsers
       File.open(File.join(@backup_folder, COURSE_XML_PATH)) do |f|
         course_doc = Nokogiri::XML(f)
         course.course_id = course_doc.at_xpath('/course/@id').value
-        course.id_number = course_doc.at_xpath('/course/idnumber').text
-        course.fullname = course_doc.at_xpath('/course/fullname').text
-        course.shortname = course_doc.at_xpath('/course/shortname').text
-        course.summary = course_doc.at_xpath('/course/summary').text
+        course.id_number = parse_text(course_doc, '/course/idnumber')
+        course.fullname = parse_text(course_doc, '/course/fullname')
+        course.shortname = parse_text(course_doc, '/course/shortname')
+        course.summary = parse_text(course_doc, '/course/summary')
         course.show_grades = parse_boolean(course_doc, '/course/showgrades')
-        if unix_start_date = course_doc.at_xpath('/course/startdate').text
+        if unix_start_date = parse_text(course_doc, '/course/startdate')
           course.startdate = Time.at(unix_start_date.to_i)
         end
 

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

@@ -5,6 +5,10 @@ module Moodle2CC::Moodle2::Parsers
     XML_NULL_VALUE = '$@NULL@$'
     MODULE_XML = 'module.xml'
 
+    MOODLE_FILEBASE_TOKEN = '$@FILEPHP@$'
+    IMS_FILEBASE_TOKEN = '$IMS_CC_FILEBASE$'
+    SLASH_TOKEN = '$@SLASH@$'
+
     def activity_directories(work_dir, activity_types)
       File.open(File.join(work_dir, Moodle2CC::Moodle2::Extractor::MOODLE_BACKUP_XML)) do |f|
         moodle_backup_xml = Nokogiri::XML(f)
@@ -16,13 +20,14 @@ module Moodle2CC::Moodle2::Parsers
     def parse_text(node, xpath, use_xpath=false)
       if v_node = (use_xpath && node.at_xpath(xpath)) || (!use_xpath && node.%(xpath))
         value = v_node.text
-        value unless value == XML_NULL_VALUE
+        return nil if value == XML_NULL_VALUE
+        value.to_s.gsub(MOODLE_FILEBASE_TOKEN, IMS_FILEBASE_TOKEN).gsub(SLASH_TOKEN, '/')
       end
     end
 
     def parse_boolean(node, xpath)
       value = parse_text(node, xpath)
-      value && (value == '1' || value.downcase == 'true') ? true : false
+      value && (value == '1' || value.downcase == 'true' || value.downcase == 'y') ? true : false
     end
 
     def parse_module(activity_dir, activity)