moodle2cc 0.2.5 → 0.2.6

data/lib/moodle2cc/moodle2converter/question_bank_converter.rb

@@ -6,7 +6,7 @@ module Moodle2CC::Moodle2Converter
       canvas_bank = Moodle2CC::CanvasCC::Models::QuestionBank.new
 
       canvas_bank.identifier = generate_unique_identifier_for(moodle_category.id, QUESTION_BANK_SUFFIX)
-      canvas_bank.title = moodle_category.name
+      canvas_bank.title = truncate_text(moodle_category.name)
 
       question_converter = Moodle2CC::Moodle2Converter::QuestionConverters::QuestionConverter.new
       moodle_category.questions.each do |moodle_question|

data/lib/moodle2cc/moodle2converter/question_converters.rb

@@ -3,6 +3,7 @@ module Moodle2CC::Moodle2Converter
     require_relative 'question_converters/question_converter'
     require_relative 'question_converters/calculated_converter'
     require_relative 'question_converters/matching_converter'
+    require_relative 'question_converters/multichoice_converter'
     require_relative 'question_converters/multiple_blanks_converter'
     require_relative 'question_converters/numerical_converter'
     require_relative 'question_converters/random_sa_converter'

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

@@ -9,6 +9,7 @@ module Moodle2CC::Moodle2Converter
         canvas_question.correct_answer_format = moodle_question.correct_answer_format
         canvas_question.correct_answer_length = moodle_question.correct_answer_length
         canvas_question.dataset_definitions = moodle_question.dataset_definitions
+        canvas_question.var_sets = moodle_question.var_sets
         canvas_question.tolerance = moodle_question.tolerance
         canvas_question
       end

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

@@ -13,6 +13,9 @@ module Moodle2CC::Moodle2Converter
           copy[:question_text] ||= ''
           copy[:question_text].gsub(/\{(.*?)\}/, '[\1]')
           copy[:question_text] = RDiscount.new(copy[:question_text]).to_html if copy[:question_text_format].to_i == 4 # markdown
+          copy[:question_text] = Nokogiri::HTML(copy[:question_text]).text
+          copy[:answer_text] = Nokogiri::HTML(copy[:answer_text]).text
+
           canvas_question.matches << copy
         end
         canvas_question

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

@@ -0,0 +1,15 @@
+module Moodle2CC::Moodle2Converter
+  module QuestionConverters
+    class MultichoiceConverter < QuestionConverter
+      register_converter_type 'multichoice'
+
+      def create_canvas_question(question_type, moodle_question)
+        if moodle_question.single
+          Moodle2CC::CanvasCC::Models::Question.create('multiple_choice_question')
+        else
+          Moodle2CC::CanvasCC::Models::Question.create('multiple_answers_question')
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Moodle2CC::Moodle2Converter
       def convert_question(moodle_question)
         canvas_question = super
 
-        canvas_question.material.gsub!(/\[\#(\d+)\]/) do |match|
+        canvas_question.material.gsub!(/\{\#(\d+)\}/) do |match|
           "[response#{$1}]"
         end
 

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

@@ -15,7 +15,6 @@ module Moodle2CC::Moodle2Converter
       STANDARD_CONVERSIONS = {
         'description' => 'text_only_question',
         'essay' => 'essay_question',
-        'multichoice' => 'multiple_choice_question',
         'shortanswer' => 'short_answer_question'
       }
 
@@ -31,10 +30,10 @@ module Moodle2CC::Moodle2Converter
       end
 
       def convert_question(moodle_question, question_type = nil)
-        canvas_question = create_canvas_question(question_type)
+        canvas_question = create_canvas_question(question_type, moodle_question)
         canvas_question.identifier = generate_unique_identifier_for(moodle_question.id, '_quiz_question')
         canvas_question.original_identifier = moodle_question.id
-        canvas_question.title = moodle_question.name
+        canvas_question.title = truncate_text(moodle_question.name)
         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)
@@ -45,12 +44,11 @@ module Moodle2CC::Moodle2Converter
 
       def convert_question_text(moodle_question)
         material = moodle_question.question_text || ''
-        material = material.gsub(/\{(.*?)\}/, '[\1]')
         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)
+      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
         Moodle2CC::CanvasCC::Models::Question.create(question_type)

data/lib/moodle2cc/moodle2converter/questionnaire_converter.rb

@@ -5,7 +5,7 @@ module Moodle2CC::Moodle2Converter
     def convert_questionnaire(moodle_questionnaire)
       canvas_assessment = Moodle2CC::CanvasCC::Models::Assessment.new
       canvas_assessment.identifier = generate_unique_identifier_for(moodle_questionnaire.id, QUESTIONNAIRE_ASSESSMENT_SUFFIX)
-      canvas_assessment.title = moodle_questionnaire.name
+      canvas_assessment.title = truncate_text(moodle_questionnaire.name)
       canvas_assessment.description = moodle_questionnaire.intro
       canvas_assessment.workflow_state = workflow_state(moodle_questionnaire.visible)
 
@@ -17,6 +17,7 @@ module Moodle2CC::Moodle2Converter
 
       canvas_assessment.items = []
       moodle_questionnaire.questions.each do |question|
+        next if question.deleted
         if canvas_question = convert_questionnaire_question(question)
           canvas_assessment.items << canvas_question
         end
@@ -32,7 +33,7 @@ module Moodle2CC::Moodle2Converter
         4 =>  'multiple_choice_question', # radio buttons question
         5 =>  'multiple_answers_question', # check boxes question
         6 =>  'multiple_choice_question', # dropdown box question
-        8 =>  'multiple_choice_question', # rate 1..5 question
+        8 =>  'multiple_dropdowns_question', # rate 1..5 question
         9 =>  'essay_question', # date question
         10 =>  'numerical_question', # numeric question
         100 =>  'text_only_question', # label question
@@ -43,16 +44,51 @@ module Moodle2CC::Moodle2Converter
 
       canvas_question = Moodle2CC::CanvasCC::Models::Question.create(canvas_type)
       canvas_question.identifier = generate_unique_identifier_for(moodle_question.id, "_questionnaire_question")
-      canvas_question.title = moodle_question.name
+      canvas_question.title = truncate_text(moodle_question.name)
       canvas_question.material = moodle_question.content
       canvas_question.answers = []
-      moodle_question.choices.each do |choice|
-        answer = Moodle2CC::CanvasCC::Models::Answer.new
-        answer.id = choice[:id]
-        answer.answer_text = choice[:content]
-        canvas_question.answers << answer
+
+      if canvas_type == 'multiple_dropdowns_question'
+        # rating scale question
+        convert_rating_question(moodle_question, canvas_question)
+      else
+        moodle_question.choices.each do |choice|
+          answer = Moodle2CC::CanvasCC::Models::Answer.new
+          answer.id = choice[:id]
+          answer.answer_text = choice[:content]
+          canvas_question.answers << answer
+        end
       end
+
       canvas_question
     end
+
+    # For l..x rating questions
+    def convert_rating_question(moodle_question, canvas_question)
+      choices = create_rating_choices(moodle_question)
+      canvas_question.responses = []
+
+      moodle_question.choices.each_with_index do |answer, answer_idx|
+        response = {:id => "response#{answer_idx + 1}", :choices => []}
+
+        # add dropdown to the question text
+        canvas_question.material = canvas_question.material.to_s + "<p>#{answer[:content]} [#{response[:id]}]</p>"
+
+        choices.each_with_index do |choice, choice_idx|
+          response[:choices] << {:id => "#{moodle_question.id}_choice_#{answer_idx}_#{choice_idx}", :text => choice}
+        end
+
+        canvas_question.responses << response
+      end
+    end
+
+    def create_rating_choices(moodle_question)
+      scale = (moodle_question.length || 5).to_i
+      choices = (1..scale).map(&:to_s)
+      if moodle_question.precise.to_i == 1
+        choices << "N/A"
+      end
+      choices
+    end
   end
 end

data/lib/moodle2cc/moodle2converter/section_converter.rb

@@ -14,7 +14,7 @@ module Moodle2CC
     def convert(moodle_section)
       canvas_module = CanvasCC::Models::CanvasModule.new
       canvas_module.identifier = generate_unique_identifier_for(moodle_section.id, MODULE_SUFFIX)
-      canvas_module.title = moodle_section.name
+      canvas_module.title = truncate_text(moodle_section.name)
       canvas_module.workflow_state = workflow_state(moodle_section.visible)
 
       canvas_module.module_items += convert_activity(moodle_section) if moodle_section.summary && !moodle_section.summary.strip.empty?
@@ -27,7 +27,7 @@ module Moodle2CC
     def convert_to_summary_page(moodle_section)
       canvas_page = CanvasCC::Models::Page.new
       canvas_page.identifier = generate_unique_identifier_for_activity(moodle_section)
-      canvas_page.title = moodle_section.name
+      canvas_page.title = truncate_text(moodle_section.name)
       canvas_page.workflow_state = workflow_state(moodle_section.visible)
       canvas_page.editing_roles = CanvasCC::Models::Page::EDITING_ROLE_TEACHER
       canvas_page.body = moodle_section.summary
@@ -48,7 +48,7 @@ module Moodle2CC
       module_item = CanvasCC::Models::ModuleItem.new
       module_item.identifier = generate_unique_identifier
       module_item.workflow_state = workflow_state(moodle_activity.visible)
-      module_item.title = moodle_activity.name
+      module_item.title = truncate_text(moodle_activity.name)
       unless moodle_activity.is_a? Moodle2::Models::Label
         if moodle_activity.is_a? Moodle2::Models::ExternalUrl
           module_item.identifierref = module_item.identifier

data/lib/moodle2cc/moodle2converter/wiki_converter.rb

@@ -0,0 +1,37 @@
+module Moodle2CC::Moodle2Converter
+  class WikiConverter
+    include ConverterHelper
+
+    def convert(moodle_wiki)
+      canvas_pages = []
+
+      moodle_wiki.pages.each do |moodle_page|
+        canvas_page = Moodle2CC::CanvasCC::Models::Page.new
+        canvas_page.identifier = generate_unique_identifier_for("#{moodle_wiki.id}#{moodle_page[:id]}") + PAGE_SUFFIX
+        canvas_page.page_name = truncate_text(moodle_page[:title])
+        canvas_page.workflow_state = workflow_state(moodle_wiki.visible)
+        canvas_page.editing_roles = 'teachers'
+        canvas_page.body = moodle_page[:content]
+        canvas_pages << canvas_page
+      end
+
+      if moodle_wiki.first_page_title.to_s.strip.length > 0 &&
+        (first_page = canvas_pages.detect{|page| page.title.to_s.strip == moodle_wiki.first_page_title.to_s.strip})
+        first_page.identifier = generate_unique_identifier_for("#{moodle_wiki.id}") + PAGE_SUFFIX
+        first_page.body = moodle_wiki.intro.to_s + first_page.body.to_s
+        first_page.page_name = moodle_wiki.name
+      else
+        first_page = Moodle2CC::CanvasCC::Models::Page.new
+        first_page.identifier = generate_unique_identifier_for("#{moodle_wiki.id}") + PAGE_SUFFIX
+        first_page.body = moodle_wiki.intro
+        first_page.workflow_state = workflow_state(moodle_wiki.visible)
+        first_page.editing_roles = 'teachers'
+        first_page.page_name = moodle_wiki.name
+        canvas_pages << first_page
+      end
+
+      canvas_pages
+    end
+
+  end
+end

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/moodle2cc/canvas_cc/calculated_question_writer_spec.rb

@@ -31,6 +31,8 @@ module Moodle2CC::CanvasCC
         }
       ]
 
+      question.var_sets = [{:ident => '1', :vars => {'A' => '3.6', 'B' => '3.1'}}]
+
       xml = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |node|
         QuestionWriter.write_question(node, question)
       end.doc
@@ -76,6 +78,11 @@ module Moodle2CC::CanvasCC
       b_var = calculated.at_xpath('vars/var[@scale="1"][@name="B"]')
       expect(b_var.at_xpath('min').text).to eq '10.0'
       expect(b_var.at_xpath('max').text).to eq '20.0'
+
+      # Var sets
+      var_set = calculated.at_xpath('var_sets/var_set[@ident="3631"]')
+      expect(var_set.at_xpath('var[@name="A"]').text).to eq "3.6"
+      expect(var_set.at_xpath('var[@name="B"]').text).to eq "3.1"
     end
   end
 end

data/spec/moodle2cc/canvas_cc/matching_question_writer_spec.rb

@@ -24,12 +24,12 @@ module Moodle2CC::CanvasCC
       expect(xml.at_xpath("item/itemmetadata/qtimetadata/qtimetadatafield[fieldlabel=\"question_type\" and fieldentry=\"#{question.question_type}\"]")).to_not be_nil
 
       response = xml.at_xpath("item/presentation/response_lid[@ident=\"response_#{match1[:id]}\"]")
-      expect(response.at_xpath('material/mattext[@texttype="text/html"]').text).to eq match1[:question_text]
+      expect(response.at_xpath('material/mattext[@texttype="text/plain"]').text).to eq match1[:question_text]
       expect(response.at_xpath("render_choice/response_label[@ident=\"#{match1[:id]}\"]/material/mattext").text).to eq match1[:answer_text]
       expect(response.at_xpath("render_choice/response_label[@ident=\"#{match2[:id]}\"]/material/mattext").text).to eq match2[:answer_text]
 
       response = xml.at_xpath("item/presentation/response_lid[@ident=\"response_#{match2[:id]}\"]")
-      expect(response.at_xpath('material/mattext[@texttype="text/html"]').text).to eq match2[:question_text]
+      expect(response.at_xpath('material/mattext[@texttype="text/plain"]').text).to eq match2[:question_text]
       expect(response.at_xpath("render_choice/response_label[@ident=\"#{match1[:id]}\"]/material/mattext").text).to eq match1[:answer_text]
       expect(response.at_xpath("render_choice/response_label[@ident=\"#{match2[:id]}\"]/material/mattext").text).to eq match2[:answer_text]
 

data/spec/moodle2cc/canvas_cc/models/assessment_spec.rb

@@ -72,7 +72,7 @@ describe Moodle2CC::CanvasCC::Models::Assessment do
     group.questions = [q2]
     qb2.question_groups = [group]
 
-    subject.resolve_question_references([qb1, qb2])
+    subject.resolve_question_references!([qb1, qb2])
 
     expect(subject.items.count).to eq 3
     expect(subject.items[0].points_possible).to eq '2'

data/spec/moodle2cc/canvas_cc/models/calculated_question_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Moodle2CC::CanvasCC::Models::CalculatedQuestion do
+
+  context '#post_process!' do
+    it 'should replace {variables} with [variables] in material' do
+      subject.material = "{varname} {not * s valid var name and stuff}"
+
+      subject.post_process!
+
+      expect(subject.material).to eq "[varname] {not * s valid var name and stuff}"
+    end
+
+    it 'should replace {variables} with variables in formulae (and strip =)' do
+      answer = Moodle2CC::CanvasCC::Models::Answer.new
+      answer.answer_text = "={A}*{B}"
+      subject.answers = [answer]
+
+      subject.post_process!
+
+      expect(subject.answers.first.answer_text).to eq "A*B"
+    end
+  end
+
+end

data/spec/moodle2cc/canvas_cc/models/page_spec.rb

@@ -24,5 +24,11 @@ module Moodle2CC::CanvasCC::Models
       expect(page.title).to eq 'My Page Name'
     end
 
+    it "truncates urls that are too long" do
+      page.page_name = 'a' * 500
+      expected = "wiki_content/#{'a' * Moodle2CC::CanvasCC::Models::Page::MAX_URL_LENGTH}.html"
+      expect(page.href).to eq expected
+    end
+
   end
 end

data/spec/moodle2cc/canvas_cc/multiple_answers_question_writer_spec.rb

@@ -14,12 +14,15 @@ module Moodle2CC::CanvasCC
       answer1 = Moodle2CC::CanvasCC::Models::Answer.new
       answer1.id = '1'
       answer1.answer_text = 'something'
+      answer1.fraction = '0.5'
       answer2 = Moodle2CC::CanvasCC::Models::Answer.new
       answer2.id = '2'
       answer2.answer_text = 'something else'
+      answer2.fraction = '0'
       answer3 = Moodle2CC::CanvasCC::Models::Answer.new
       answer3.id = '3'
       answer3.answer_text = 'something something else'
+      answer3.fraction = '0.5'
       question.answers = [answer1, answer2, answer3]
 
       xml = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |node|
@@ -41,7 +44,7 @@ module Moodle2CC::CanvasCC
       condition = xml.at_xpath("item/resprocessing/respcondition[@continue=\"No\"]")
       expect(condition.at_xpath("conditionvar/and/varequal[@respident=\"response1\" and text()=\"#{answer1.id}\"]")).not_to be_nil
       expect(condition.at_xpath("conditionvar/and/not/varequal[@respident=\"response1\" and text()=\"#{answer2.id}\"]")).not_to be_nil
-      expect(condition.at_xpath("conditionvar/and/not/varequal[@respident=\"response1\" and text()=\"#{answer3.id}\"]")).not_to be_nil
+      expect(condition.at_xpath("conditionvar/and/varequal[@respident=\"response1\" and text()=\"#{answer3.id}\"]")).not_to be_nil
     end
   end
 end

data/spec/moodle2cc/canvas_cc/multiple_blanks_question_writer_spec.rb

@@ -5,7 +5,7 @@ module Moodle2CC::CanvasCC
 
     let(:question) { Moodle2CC::CanvasCC::Models::Question.create('fill_in_multiple_blanks_question')}
 
-    it 'creates the question item xml for a multiple_choice_question' do
+    it 'creates the question item xml for a multiple blanks question' do
       question.identifier = 4200
       question.title = 'hello'
       question.general_feedback = 'feedbacks'

data/spec/moodle2cc/canvas_cc/multiple_dropdowns_question_writer_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+module Moodle2CC::CanvasCC
+  describe MultipleDropdownsQuestionWriter do
+
+    let(:question) { Moodle2CC::CanvasCC::Models::Question.create('multiple_dropdowns_question')}
+
+    it 'creates the question item xml for a multiple_dropdowns_question' do
+      question.identifier = 4200
+      question.title = 'hello'
+      question.general_feedback = 'feedbacks'
+      question.material = 'the first question is [response1] and the second is [response2]'
+      question.answers = []
+      question.responses = [
+        {:id => "response1", :choices => [
+          {:id => "3_choice_0_0", :text => "1"},
+          {:id => "3_choice_0_1", :text => "2"}
+        ]},
+        {:id => "response2", :choices => [
+          {:id => "3_choice_1_0", :text => "1"},
+          {:id => "3_choice_1_1", :text => "2"}
+        ]}
+      ]
+
+      xml = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |node|
+        QuestionWriter.write_question(node, question)
+      end.doc
+
+      expect(xml.at_xpath('item/@ident').value).to eq question.identifier.to_s
+      expect(xml.at_xpath('item/@title').value).to eq question.title
+      expect(xml.at_xpath("item/itemmetadata/qtimetadata/qtimetadatafield[fieldlabel=\"question_type\" and fieldentry=\"#{question.question_type}\"]")).to_not be_nil
+
+      # first response
+      response = xml.xpath('item/presentation/response_lid')[0]
+      expect(response.attributes['ident'].value).to eq 'response_response1'
+      expect(response.at_xpath("render_choice/response_label[@ident=\"3_choice_0_0\"]/material/mattext[@texttype=\"text/plain\" and text()=\"1\"]")).not_to be_nil
+      expect(response.at_xpath("render_choice/response_label[@ident=\"3_choice_0_1\"]/material/mattext[@texttype=\"text/plain\" and text()=\"2\"]")).not_to be_nil
+
+      # second response
+      response = xml.xpath('item/presentation/response_lid')[1]
+      expect(response.attributes['ident'].value).to eq 'response_response2'
+      expect(response.at_xpath("render_choice/response_label[@ident=\"3_choice_1_0\"]/material/mattext[@texttype=\"text/plain\" and text()=\"1\"]")).not_to be_nil
+      expect(response.at_xpath("render_choice/response_label[@ident=\"3_choice_1_1\"]/material/mattext[@texttype=\"text/plain\" and text()=\"2\"]")).not_to be_nil
+    end
+  end
+end

data/spec/moodle2cc/moodle2/extractor_spec.rb

@@ -11,6 +11,7 @@ module Moodle2CC::Moodle2
       Parsers::SectionParser.any_instance.stub(:parse)
       Parsers::FileParser.any_instance.stub(:parse)
       Parsers::PageParser.any_instance.stub(:parse)
+      Parsers::WikiParser.any_instance.stub(:parse)
       Parsers::ForumParser.any_instance.stub(:parse)
       Parsers::AssignmentParser.any_instance.stub(:parse)
       Parsers::BookParser.any_instance.stub(:parse)
@@ -103,6 +104,13 @@ module Moodle2CC::Moodle2
       expect(course.pages).to eq [page]
     end
 
+    it 'parses wikis' do
+      wiki = Models::Wiki.new
+      Parsers::WikiParser.any_instance.stub(:parse).and_return([wiki])
+      extractor.extract {}
+      expect(course.wikis).to eq [wiki]
+    end
+
     it 'parses forums' do
       forum = Models::Forum.new
       Parsers::ForumParser.any_instance.stub(:parse).and_return([forum])