moodle2cc 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3daa9082b4bd5b84e073f3f7df0aaa7bf2e6a41
-  data.tar.gz: 03628a247d0dac408fa3652352562cedd58364d9
+  metadata.gz: a600552337a2b45e2b9a0878149e3cb61d7a10c9
+  data.tar.gz: c3ac55a6630b19f53f7b3926ad5ae412cfc2de7f
 SHA512:
-  metadata.gz: fb774702ba2892c3bd20bff77f9b4b34f9a315934c1453918a6bd0576f266c0ade005f265240ad470264e71b6270f9ad6554e79960a45b5af6f9a957b56e7cdc
-  data.tar.gz: 530689ba43c0dd8b4d7a65065cc6019a54267d4524570e434d8da3d99837c31d0ab03ec5c2224e7985b5195b1bec04461b44a5ba9b9626a70078e91e94fd054c
+  metadata.gz: 30d47158a1782a2ab93acf4fba5e063e5012be0ca7b53aaeec106c2ebd7c766e3cf818dceca016a1425feb79ee9d725911ca0ee762d3b4c969bd1cc192890e1d
+  data.tar.gz: 6c45ffdd8a31f73d4768b21ca99795373c6dc10b86a3836cff475b1df1d023af31930b99a3ad33d129d307cff570cb07df84ea72ab0173bdea48e5e0e812760c

data/Changelog

@@ -1,71 +1,79 @@
+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
+	* Handle assessments, questionnaires, choice activities, and feedback activities
+	* Use definition lists for glossary
+	* Include folder descriptions
+	* Handle some visibility issues better
+
 2014-04-09 Version 0.2.4
-    * Fix Moodle book conversion for titles and order
+  * Fix Moodle book conversion for titles and order
 
 2014-04-09 Version 0.2.3
-    * Add converting of HSU forums
+  * Add converting of HSU forums
 
 2014-04-03 Version 0.2.2
-    * Fixed parse exception for quizzes with no configures attempt count
+  * Fixed parse exception for quizzes with no configures attempt count
 
 2014-04-02 Version 0.2.1
-    * Fixed true/false questions conversion for moodle 2
+  * Fixed true/false questions conversion for moodle 2
 
 2014-04-01 Version 0.2.0
-    * Add support for converting Moodle 2 exports to canvas
-		  flavored common cartridge
-		* TODO of adding better plain CC support for Moodle 2 conversions
+  * Add support for converting Moodle 2 exports to canvas
+    flavored common cartridge
+  * TODO of adding better plain CC support for Moodle 2 conversions
 
 2014-01-21 Version 0.1.11
-    * files with associated text/html content are now made into
-		  html pages with that text and a link to the file
+  * files with associated text/html content are now made into
+    html pages with that text and a link to the file
 
 2013-08-15 Version 0.1.10
-    * improve multiple dropdown question handling
+  * improve multiple dropdown question handling
 
 2013-08-01 Version 0.1.9
-    * fix whitespace handling issue with mod_type
+  * fix whitespace handling issue with mod_type
 
 2013-07-02 Version 0.1.8
-    * Improved question image conversion by putting it in its own p tag
-		* Added support for hsuforum content
+  * Improved question image conversion by putting it in its own p tag
+  * Added support for hsuforum content
 
 2013-06-27 Version 0.1.7
-    * Include question images when converting to QTI
-		* Added travis setup for happiness
+  * Include question images when converting to QTI
+  * Added travis setup for happiness
 
 2012-12-07 Version 0.1.6
-    * Added Changelog
-    * Don't error out when trying to reference non-existent quiz question
+  * Added Changelog
+  * Don't error out when trying to reference non-existent quiz question
 
 2012-08-20 Version 0.1.5
 
-    * Readme improvements
-        * Listed todo items for complete Common Cartridge conversion support
-    * Added assignment conversion to plain CC
-    * Added wiki page conversion to plain CC
+  * Readme improvements
+    * Listed todo items for complete Common Cartridge conversion support
+  * Added assignment conversion to plain CC
+  * Added wiki page conversion to plain CC
 
 2012-08-15 Version 0.1.4
 
-    * More robust URI parsing
+  * More robust URI parsing
 
 2012-08-06 Version 0.1.3
 
-    * Fix external link and attachment references
-    * Fix ordering of module items
+* Fix external link and attachment references
+  * Fix ordering of module items
 
 
 2012-08-03 Version 0.1.2
 
-    * Add quiz support
-    * Better handle wiki titles and summaries
+  * Add quiz support
+  * Better handle wiki titles and summaries
 
 
 2012-07-26 Version 0.1.1
 
-    * Fix extra whitespace errors
-    * Add ability to inject logger during conversion process 
+  * Fix extra whitespace errors
+  * Add ability to inject logger during conversion process 
 
 
 2012-7-24 Version 0.1.0
 
-    * Initial release
+  * Initial release

data/lib/moodle2cc.rb

@@ -79,6 +79,7 @@ module Moodle2CC
     autoload :CalculatedQuestionWriter, 'moodle2cc/canvas_cc/calculated_question_writer'
     autoload :EssayQuestionWriter, 'moodle2cc/canvas_cc/essay_question_writer'
     autoload :MatchingQuestionWriter, 'moodle2cc/canvas_cc/matching_question_writer'
+    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 :NumericalQuestionWriter, 'moodle2cc/canvas_cc/numerical_question_writer'
@@ -126,5 +127,6 @@ module Moodle2CC
     autoload :HtmlConverter, 'moodle2cc/moodle2converter/html_converter'
     autoload :HomepageConverter, 'moodle2cc/moodle2converter/homepage_converter'
     autoload :GlossaryConverter, 'moodle2cc/moodle2converter/glossary_converter'
+    autoload :LabelConverter, 'moodle2cc/moodle2converter/label_converter'
   end
 end

data/lib/moodle2cc/canvas_cc/assignment_writer.rb

@@ -42,6 +42,7 @@ module Moodle2CC::CanvasCC
           xml.peer_reviews assignment.peer_reviews unless assignment.peer_reviews.nil?
           xml.automatic_peer_reviews assignment.automatic_peer_reviews unless assignment.automatic_peer_reviews.nil?
           xml.grade_group_students_individually assignment.grade_group_students_individually unless assignment.grade_group_students_individually.nil?
+          xml.muted assignment.muted unless assignment.muted.nil?
         }
       end.to_xml
       File.open(File.join(assignment_dir, Moodle2CC::CanvasCC::Models::Assignment::ASSIGNMENT_SETTINGS_FILE), 'w') { |f| f.write(xml) }
@@ -64,4 +65,4 @@ module Moodle2CC::CanvasCC
     end
 
   end
-end
+end

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

@@ -4,6 +4,7 @@ module Moodle2CC::CanvasCC::Models
                        :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'
 
@@ -14,12 +15,21 @@ module Moodle2CC::CanvasCC::Models
     end
 
     def resources
-      [assessment_resource]
+      [cc_assessment_resource, canvas_assessment_resource]
     end
 
-    def assessment_resource
+    def cc_assessment_resource
       resource = Moodle2CC::CanvasCC::Models::Resource.new
       resource.identifier = @identifier
+      resource.type = ASSESSMENT_TYPE
+      resource.dependencies = ["#{@identifier}_meta"]
+      resource.files = [] # TODO: export cc qti file
+      resource
+    end
+
+    def canvas_assessment_resource
+      resource = Moodle2CC::CanvasCC::Models::Resource.new
+      resource.identifier = "#{@identifier}_meta"
       resource.href = meta_file_path
       resource.type = LAR_TYPE
       resource.files = [meta_file_path, qti_file_path]
@@ -40,7 +50,7 @@ module Moodle2CC::CanvasCC::Models
         question = nil
         group = nil
         question_banks.each do |bank|
-          break if (question = bank.questions.detect{|q| q.identifier.to_s == ref[:question]}) ||
+          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]})
         end
 
@@ -60,7 +70,7 @@ module Moodle2CC::CanvasCC::Models
 
       @items.select{|i| i.is_a?(Moodle2CC::CanvasCC::Models::QuestionGroup)}.each do |group|
         group.questions.each do |q|
-          @items.delete_if{|i| i.identifier.to_s == q.identifier}
+          @items.delete_if{|i| i.respond_to?(:original_identifier) && i.original_identifier == q.original_identifier}
         end
       end
     end

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

@@ -3,7 +3,7 @@ module Moodle2CC::CanvasCC::Models
     attr_accessor :identifier, :title, :body, :due_at, :lock_at, :unlock_at, :all_day_date, :peer_reviews_due_at,
                   :assignment_group_identifier_ref, :workflow_state, :points_possible, :grading_type, :all_day,
                   :submission_types, :position, :peer_review_count, :peer_reviews_assigned, :peer_reviews,
-                  :automatic_peer_reviews, :grade_group_students_individually
+                  :automatic_peer_reviews, :grade_group_students_individually, :muted
 
     LAR_TYPE = 'associatedcontent/imscc_xmlv1p1/learning-application-resource'
     ASSIGNMENT_SETTINGS_FILE = 'assignment_settings.xml'

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

@@ -26,7 +26,7 @@ module Moodle2CC::CanvasCC::Models
     end
 
     def all_resources
-      @resources + @files + @pages + @discussions.map(&:resources).flatten + @assignments.map(&:resources).flatten
+      @resources + @files + @pages + @discussions.map(&:resources).flatten + @assignments.map(&:resources).flatten + @assessments.map(&:resources).flatten
     end
 
     def method_missing(m, *args, &block)
@@ -42,5 +42,11 @@ module Moodle2CC::CanvasCC::Models
       return unless @assessments && @question_banks
       @assessments.each{|a| a.resolve_question_references(@question_banks)}
     end
+
+    def mute_assignments!
+      @assignments.each do |assignment|
+        assignment.muted = true
+      end
+    end
   end
 end

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

@@ -24,7 +24,11 @@ module Moodle2CC::CanvasCC::Models
 
     def page_name= name
       @title = name
-      @href = "#{WIKI_CONTENT}/#{CGI::escape(name.downcase.gsub(/\s/, '-'))}.html"
+      @href = "#{WIKI_CONTENT}/#{self.class.convert_name_to_url(name)}.html"
+    end
+
+    def self.convert_name_to_url(name)
+      CGI::escape(name.downcase.gsub(/\s/, '-').gsub('.', 'dot'))
     end
 
   end

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

@@ -2,10 +2,10 @@ 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', 'short_answer_question',
-                               'text_only_question', 'true_false_question']
+                               'multiple_choice_question', 'multiple_answers_question',
+                               'short_answer_question', 'text_only_question', 'true_false_question']
 
-    attr_accessor :identifier, :title, :material, :answers, :general_feedback, *QTI_META_ATTRIBUTES
+    attr_accessor :identifier, :original_identifier, :title, :material, :answers, :general_feedback, *QTI_META_ATTRIBUTES
 
     @@subclasses = {}
 

data/lib/moodle2cc/canvas_cc/multiple_answers_question_writer.rb

@@ -0,0 +1,40 @@
+module Moodle2CC::CanvasCC
+  class MultipleAnswersQuestionWriter < QuestionWriter
+    register_writer_type 'multiple_answers_question'
+
+    private
+
+    def self.write_responses(presentation_node, question)
+      presentation_node.response_lid(:ident => 'response1', :rcardinality => 'Multiple') do |response_node|
+        response_node.render_choice do |choice_node|
+          question.answers.each do |answer|
+            choice_node.response_label(:ident => answer.id) do |label_node|
+              label_node.material do |material_node|
+                material_node.mattext answer.answer_text, :texttype => 'text/html'
+              end
+            end
+          end
+        end
+      end
+    end
+
+    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'
+              end
+            end
+          end
+        end
+        condition_node.setvar('100', :varname => 'SCORE', :action => 'Set')
+      end
+    end
+  end
+end

data/lib/moodle2cc/canvas_cc/question_writer.rb

@@ -119,6 +119,7 @@ end
 require_relative 'calculated_question_writer'
 require_relative 'essay_question_writer'
 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 'numerical_question_writer'

data/lib/moodle2cc/moodle2/extractor.rb

@@ -21,7 +21,12 @@ module Moodle2CC::Moodle2
         parse_books(work_dir, course)
         parse_folders(work_dir, course)
         parse_question_categories(work_dir, course)
+
         parse_quizzes(work_dir, course)
+        parse_choices(work_dir, course)
+        parse_feedbacks(work_dir, course)
+        parse_questionnaires(work_dir, course)
+
         parse_glossaries(work_dir, course)
         parse_labels(work_dir, course)
         parse_external_urls(work_dir, course)
@@ -99,6 +104,24 @@ module Moodle2CC::Moodle2
       end
     end
 
+    def parse_choices(work_dir, course)
+      if choices = Moodle2CC::Moodle2::Parsers::ChoiceParser.new(work_dir).parse
+        course.choices += choices
+      end
+    end
+
+    def parse_feedbacks(work_dir, course)
+      if feedbacks = Moodle2CC::Moodle2::Parsers::FeedbackParser.new(work_dir).parse
+        course.feedbacks += feedbacks
+      end
+    end
+
+    def parse_questionnaires(work_dir, course)
+      if questionnaires = Moodle2CC::Moodle2::Parsers::QuestionnaireParser.new(work_dir).parse
+        course.questionnaires += questionnaires
+      end
+    end
+
     def parse_glossaries(work_dir, course)
       if glossaries = Moodle2CC::Moodle2::Parsers::GlossaryParser.new(work_dir).parse
         course.glossaries += glossaries

data/lib/moodle2cc/moodle2/models.rb

@@ -3,7 +3,10 @@ module Moodle2CC::Moodle2::Models
   require_relative 'models/assignment'
   require_relative 'models/book'
   require_relative 'models/book_chapter'
+  require_relative 'models/choice'
   require_relative 'models/course'
+  require_relative 'models/external_url'
+  require_relative 'models/feedback'
   require_relative 'models/folder'
   require_relative 'models/forum'
   require_relative 'models/moodle2_file'
@@ -12,6 +15,7 @@ module Moodle2CC::Moodle2::Models
   require_relative 'models/glossary'
   require_relative 'models/glossary_entry'
   require_relative 'models/label'
+  require_relative 'models/questionnaire'
   require_relative 'models/resource'
-  require_relative 'models/external_url'
+
 end

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

@@ -0,0 +1,12 @@
+module Moodle2CC::Moodle2::Models
+  class Choice
+
+    attr_accessor :id, :module_id, :name, :intro, :intro_format, :time_open, :time_close,
+                  :time_modified, :publish, :show_results, :display, :allow_update, :show_unanswered,
+                  :limit_answers, :completion_submit, :options, :visible
+
+    def initialize
+      @options = []
+    end
+  end
+end

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

@@ -1,9 +1,10 @@
 module Moodle2CC::Moodle2::Models
   class Course
     attr_accessor :id_number, :fullname, :shortname, :startdate, :summary,
-                  :course_id, :sections, :files, :pages, :forums, :assignments,
+                  :course_id, :show_grades, :sections, :files, :pages, :forums, :assignments,
                   :books, :folders, :question_categories, :quizzes, :glossaries,
-                  :labels, :resources, :external_urls
+                  :labels, :resources, :external_urls, :choices, :questionnaires,
+                  :feedbacks
 
     def initialize
       @sections = []
@@ -15,6 +16,9 @@ module Moodle2CC::Moodle2::Models
       @folders = []
       @question_categories = []
       @quizzes = []
+      @choices = []
+      @feedbacks = []
+      @questionnaires = []
       @glossaries = []
       @labels = []
       @resources = []
@@ -22,7 +26,8 @@ module Moodle2CC::Moodle2::Models
     end
 
     def activities
-      pages + forums + assignments + books + folders + quizzes + labels + resources + glossaries + external_urls
+      pages + forums + assignments + books + folders + quizzes + labels + resources + glossaries +
+        external_urls + choices + questionnaires + feedbacks
     end
 
   end

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

@@ -0,0 +1,15 @@
+module Moodle2CC::Moodle2::Models
+  class Feedback
+
+    attr_accessor :id, :module_id, :name, :intro, :intro_format, :time_open, :time_close,
+                  :time_modified, :items, :visible
+
+    def initialize
+      @items = []
+    end
+
+    class Question
+      attr_accessor :id, :name, :label, :type, :position, :presentation
+    end
+  end
+end

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

@@ -2,5 +2,71 @@ module Moodle2CC::Moodle2::Models
   class Label
     attr_accessor :id, :module_id, :name, :intro, :intro_format, :visible
 
+    DEFAULT_PAGE_TITLE = "Untitled Page"
+
+    def name_text
+      @name_text ||= (Nokogiri::HTML(@name.to_s).text.strip rescue "")
+    end
+
+    def intro_html
+      @intro_html ||= (Nokogiri::HTML(@intro.to_s) rescue Nokogiri::HTML(''))
+    end
+
+    def intro_text
+      @intro_text ||= (intro_html.text.strip rescue "")
+    end
+
+    def converted_title
+      process_for_conversion!
+      @converted_title
+    end
+
+    def convert_to_page?
+      process_for_conversion!
+      @convert_to_page
+    end
+
+    def convert_to_header?
+      process_for_conversion!
+      @convert_to_header
+    end
+
+
+    def process_for_conversion!
+      return unless @converted_title.nil? || @convert_to_page.nil? || @convert_to_header.nil?
+
+      @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] + "..."
+          @convert_to_page = true
+        else
+          if intro_text.length > 0
+            @converted_title = intro_text
+          else
+            @converted_title = DEFAULT_PAGE_TITLE
+            @convert_to_header = false # if we're not going to convert it to a page, don't convert it at all
+          end
+        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
+        @convert_to_page = intro_html.search('img[src]').length > 0 ||
+            intro_html.search('a[href]').length > 0 ||
+            intro_html.search('iframe[src]').length > 0
+      elsif intro_text.length > 0
+        @convert_to_page = true
+      else
+        @convert_to_page = false
+      end
+
+      # do the opposite if we haven't already explicitly decided not to convert to a header
+      if @convert_to_header.nil?
+        @convert_to_header = !@convert_to_page
+      end
+    end
   end
 end