moodle2cc 0.2.27 → 0.2.28

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjcyYjEyNjE5MjdkYjJiMzdjZjVhMjk4Mjc2YjRjOTUwMTc3NmY2Nw==
+    ZDgzMGY2MjI2OGU3YmM4NDI5Mzg5MTRkNGYwMzM5OGU4YWU5MzBiNw==
   data.tar.gz: !binary |-
-    Y2YyNTg2OTU0ZDhhM2IwNDUzNDhlZjdjMDU0MmIzMTc3MjBmZDI3ZQ==
+    MzVhYjExMjAwODM0OTVkMjg0MTdmYTY1Njc0ZTI0ZWE0ZTFlZmYxMw==
 SHA512:
   metadata.gz: !binary |-
-    ZWI4MDBjMGQxMGI1OWIzNzg2YzIyMDExYmQ0Njc3YjQ0YTA0MmNjMjk0Mzg4
-    ZjE4MjU2MzYzYjJmNGZmOWFhNzhhODZjZjA2MzVmMjEwYzRlYzdkYjZmOTE2
-    MzYyZGMyNDFiZDU0MDhjZDE4ZmY1ZmE5YzAzMmFkMzkxNGIwZjM=
+    OTQ1MjhmYzI5NWE3NGFjYWVlZWY5NWI1NmEwZGYyNzJmMjQwOTNlYzUxZWFj
+    NzJjOTI2MjM2ZjE2MTNlOWE1N2UxMmQxNTRiM2QwODU2MzlhYTc3MzBiZjlh
+    N2U2MTQ5ZTFhYTBhMGU3YWMwMzVkMDE2MjI5MmFjNzU1YWIwNzA=
   data.tar.gz: !binary |-
-    NDc5ZGM4NTlmYzVmODVlMWEyMzg4MDM5NzA5NTM1NWQzNGZhOTQyZDYxOWVi
-    ZWI2OTQzYmE3OGRlYTNmZTNlNGZmNTA1ZWRkNGUyNmQ0YWFjYWE2YjY4ZTZm
-    MWFjOWU4N2RkMzVjYTE5ZmYwMmM4YzZiYmRiMTk4ZTcxOGJhMDg=
+    MjgyZDZlM2M4NGM1YWE5YmVjMjg5MDQ5Nzg5NDE1N2M4ZmYzNjMzZDlhY2Iy
+    ZmUyZDQwMTc5YzFhZTQyNWMxMWZiOTU0Njg1MDY3ZGNhMzYzZTM2MzNjYjA4
+    NzQzY2M4ZjJmZWZmMDRlMWJiNDc1NmViNzNmNjk3ZWFhZGE3YTg=

data/Changelog

@@ -1,3 +1,7 @@
+2015-11-18 Version 0.2.28
+  * Fixes module item reference resolution caused by 0.2.26
+  * Also distinguishes Announcement type discussion topics
+
 2015-10-21 Version 0.2.27
   * Handles duplicated wiki names better in Moodle 2 packages
 

data/lib/moodle2cc/canvas_cc/discussion_writer.rb

@@ -40,7 +40,7 @@ module Moodle2CC::CanvasCC
           xml.topic_id discussion_resource.identifier
           xml.title discussion.title
           xml.position
-          xml.type 'topic'
+          xml.type (discussion.is_announcement ? 'announcement' : 'topic')
           xml.discussion_type discussion.discussion_type
           xml.require_initial_post discussion.require_initial_post
           xml.workflow_state discussion.workflow_state

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

@@ -1,6 +1,6 @@
 module Moodle2CC::CanvasCC::Models
   class Discussion
-    attr_accessor :identifier, :title, :text, :discussion_type, :workflow_state, :require_initial_post, :points_possible
+    attr_accessor :identifier, :title, :text, :discussion_type, :workflow_state, :require_initial_post, :points_possible, :is_announcement
     DISCUSSION_ID_POSTFIX = '_DISCUSSION'
     DISCUSSION_META_POSTFIX = '_meta'
     IMSDT_TYPE = 'imsdt_xmlv1p1'

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

@@ -2,7 +2,7 @@ module Moodle2CC::Moodle2::Models
   class Forum
 
     attr_accessor :id, :module_id, :type, :name, :intro, :intro_format, :assessed, :assess_time_start, :assess_time_finish, :scale,
-                  :max_bytes, :max_attachments, :force_subsscribe, :tracking_type, :rss_type, :rss_articles,
+                  :max_bytes, :max_attachments, :force_subscribe, :tracking_type, :rss_type, :rss_articles,
                   :time_modified, :warn_after, :block_after, :block_period, :completion_discussions, :completion_replies,
                   :completion_posts, :visible, :points_possible
 

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

@@ -34,7 +34,7 @@ module Moodle2CC::Moodle2::Parsers
         forum.scale = parse_text(forum_xml, "/activity/#{module_name}/scale")
         forum.max_bytes = parse_text(forum_xml, "/activity/#{module_name}/maxbytes")
         forum.max_attachments = parse_text(forum_xml, "/activity/#{module_name}/maxattachments")
-        forum.force_subsscribe = parse_text(forum_xml, "/activity/#{module_name}/forcesubscribe")
+        forum.force_subscribe = parse_boolean(forum_xml, "/activity/#{module_name}/forcesubscribe")
         forum.tracking_type = parse_text(forum_xml, "/activity/#{module_name}/trackingtype")
         forum.rss_type = parse_text(forum_xml, "/activity/#{module_name}/rsstype")
         forum.rss_articles = parse_text(forum_xml, "/activity/#{module_name}/rssarticles")

data/lib/moodle2cc/moodle2converter/assessment_converter.rb

@@ -10,7 +10,7 @@ module Moodle2CC::Moodle2Converter
 
     def convert_quiz(moodle_quiz)
       canvas_assessment = Moodle2CC::CanvasCC::Models::Assessment.new
-      canvas_assessment.identifier = generate_unique_identifier_for(moodle_quiz.id, ASSESSMENT_SUFFIX)
+      canvas_assessment.identifier = generate_unique_identifier_for_activity(moodle_quiz)
       canvas_assessment.title = truncate_text(moodle_quiz.name)
       canvas_assessment.description = moodle_quiz.intro
       canvas_assessment.workflow_state = workflow_state(moodle_quiz.visible)
@@ -37,7 +37,7 @@ module Moodle2CC::Moodle2Converter
 
     def convert_choice(moodle_choice)
       canvas_assessment = Moodle2CC::CanvasCC::Models::Assessment.new
-      canvas_assessment.identifier = generate_unique_identifier_for(moodle_choice.id, CHOICE_ASSESSMENT_SUFFIX)
+      canvas_assessment.identifier = generate_unique_identifier_for_activity(moodle_choice)
       canvas_assessment.title = truncate_text(moodle_choice.name)
       canvas_assessment.description = ''
       canvas_assessment.workflow_state = workflow_state(moodle_choice.visible)

data/lib/moodle2cc/moodle2converter/assignment_converter.rb

@@ -5,7 +5,7 @@ module Moodle2CC::Moodle2Converter
     def convert(moodle_assignment, moodle_grading_scales)
 
       canvas_assignment = Moodle2CC::CanvasCC::Models::Assignment.new
-      canvas_assignment.identifier = generate_unique_identifier_for(moodle_assignment.id, ASSIGNMENT_SUFFIX)
+      canvas_assignment.identifier = generate_unique_identifier_for_activity(moodle_assignment)
       canvas_assignment.title = truncate_text(moodle_assignment.name)
       canvas_assignment.body = moodle_assignment.intro
       canvas_assignment.due_at = Time.at(Integer(moodle_assignment.due_date)) if moodle_assignment.due_date

data/lib/moodle2cc/moodle2converter/converter_helper.rb

@@ -48,9 +48,21 @@ module Moodle2CC
       "m2#{SecureRandom.uuid.gsub('-', '')}"
     end
 
+    def get_unique_identifier_for_activity(activity)
+      # use when we want to retrieve an existing id, not generate a new one
+      id = Moodle2Converter::Migrator.activity_id_map[activity.hash]
+      unless id
+        puts "could not find matching id for #{activity.inspect}"
+        id = generate_unique_identifier_for_activity(activity)
+      end
+      id
+    end
+
     def generate_unique_identifier_for_activity(activity)
       if lookup = ACTIVITY_LOOKUP[activity.class]
-        generate_unique_identifier_for(activity.id, lookup[:suffix])
+        unique_id = generate_unique_identifier_for(activity.id, lookup[:suffix])
+        Moodle2Converter::Migrator.activity_id_map[activity.hash] = unique_id
+        unique_id
       else
         raise "Unknown activity type: #{activity.class}"
       end

data/lib/moodle2cc/moodle2converter/discussion_converter.rb

@@ -5,9 +5,10 @@ module Moodle2CC::Moodle2Converter
 
     def convert(forum)
       discussion = Moodle2CC::CanvasCC::Models::Discussion.new
-      discussion.identifier = generate_unique_identifier_for(forum.id, DISCUSSION_SUFFIX)
+      discussion.identifier = generate_unique_identifier_for_activity(forum)
       discussion.title = truncate_text(forum.name)
       discussion.text = forum.intro
+      discussion.is_announcement = forum.force_subscribe
       discussion.discussion_type = 'threaded'
       discussion.workflow_state = workflow_state(forum.visible)
       discussion.require_initial_post = (forum.type == 'qanda')

data/lib/moodle2cc/moodle2converter/feedback_converter.rb

@@ -4,7 +4,7 @@ module Moodle2CC::Moodle2Converter
 
     def convert_feedback(moodle_feedback)
       canvas_assessment = Moodle2CC::CanvasCC::Models::Assessment.new
-      canvas_assessment.identifier = generate_unique_identifier_for(moodle_feedback.id, FEEDBACK_ASSESSMENT_SUFFIX)
+      canvas_assessment.identifier = generate_unique_identifier_for_activity(moodle_feedback)
       canvas_assessment.title = truncate_text(moodle_feedback.name)
       canvas_assessment.description = moodle_feedback.intro
       canvas_assessment.workflow_state = workflow_state(moodle_feedback.visible)

data/lib/moodle2cc/moodle2converter/folder_converter.rb

@@ -8,7 +8,7 @@ module Moodle2CC::Moodle2Converter
 
     def convert(moodle_folder)
       canvas_page = Moodle2CC::CanvasCC::Models::Page.new
-      canvas_page.identifier = generate_unique_identifier_for(moodle_folder.id) + FOLDER_SUFFIX
+      canvas_page.identifier = generate_unique_identifier_for_activity(moodle_folder)
       canvas_page.page_name = moodle_folder.name
       canvas_page.workflow_state = workflow_state(moodle_folder.visible)
       canvas_page.editing_roles = 'teachers'

data/lib/moodle2cc/moodle2converter/glossary_converter.rb

@@ -8,7 +8,7 @@ module Moodle2CC::Moodle2Converter
 
     def convert(moodle_glossary)
       canvas_page = Moodle2CC::CanvasCC::Models::Page.new
-      canvas_page.identifier = generate_unique_identifier_for(moodle_glossary.id) + GLOSSARY_SUFFIX
+      canvas_page.identifier = generate_unique_identifier_for_activity(moodle_glossary)
       canvas_page.page_name = moodle_glossary.name
       canvas_page.workflow_state = 'active'
       canvas_page.editing_roles = 'teachers,students'

data/lib/moodle2cc/moodle2converter/html_converter.rb

@@ -84,7 +84,7 @@ module Moodle2CC::Moodle2Converter
       case activity
         when 'assignment'
           if assignment = @moodle_course.assignments.find { |assignment| assignment.id == id }
-            "#{OBJECT_TOKEN}/assignments/#{generate_unique_identifier_for_activity(assignment)}#{anchor}"
+            "#{OBJECT_TOKEN}/assignments/#{get_unique_identifier_for_activity(assignment)}#{anchor}"
           end
         when 'page'
           if page = @moodle_course.pages.find { |page| page.id == id }
@@ -92,7 +92,7 @@ module Moodle2CC::Moodle2Converter
           end
         when 'forum'
           if forum = @moodle_course.forums.find { |forum| forum.id == id }
-            "#{OBJECT_TOKEN}/discussion_topics/#{generate_unique_identifier_for_activity(forum)}#{anchor}"
+            "#{OBJECT_TOKEN}/discussion_topics/#{get_unique_identifier_for_activity(forum)}#{anchor}"
           end
         else
           puts "unknown activity to replace link for. activity:#{activity} id:#{id}"

data/lib/moodle2cc/moodle2converter/label_converter.rb

@@ -11,7 +11,7 @@ module Moodle2CC
       module_item.indent = '0'
 
       if moodle_label.convert_to_page?
-        module_item.identifierref = generate_unique_identifier_for_activity(moodle_label)
+        module_item.identifierref = get_unique_identifier_for_activity(moodle_label)
         module_item.content_type = CanvasCC::Models::ModuleItem::CONTENT_TYPE_WIKI_PAGE
       elsif moodle_label.convert_to_header?
         module_item.content_type = CanvasCC::Models::ModuleItem::CONTENT_TYPE_CONTEXT_MODULE_SUB_HEADER

data/lib/moodle2cc/moodle2converter/migrator.rb

@@ -197,10 +197,15 @@ module Moodle2CC::Moodle2Converter
 
     def self.clear_unique_id_set!
       @unique_id_set = Set.new
+      @activity_id_map = {}
     end
 
     def self.unique_id_set
       @unique_id_set ||= Set.new
     end
+
+    def self.activity_id_map
+      @activity_id_map ||= {}
+    end
   end
 end

data/lib/moodle2cc/moodle2converter/page_converter.rb

@@ -4,7 +4,7 @@ module Moodle2CC::Moodle2Converter
 
     def convert(moodle_page)
       canvas_page = Moodle2CC::CanvasCC::Models::Page.new
-      canvas_page.identifier = generate_unique_identifier_for(moodle_page.id) + PAGE_SUFFIX
+      canvas_page.identifier = generate_unique_identifier_for_activity(moodle_page)
       canvas_page.page_name = moodle_page.name
       canvas_page.workflow_state = workflow_state(moodle_page.visible)
       canvas_page.editing_roles = 'teachers'

data/lib/moodle2cc/moodle2converter/questionnaire_converter.rb

@@ -4,7 +4,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.identifier = generate_unique_identifier_for_activity(moodle_questionnaire)
       canvas_assessment.title = truncate_text(moodle_questionnaire.name)
       canvas_assessment.description = moodle_questionnaire.intro
       canvas_assessment.workflow_state = workflow_state(moodle_questionnaire.visible)

data/lib/moodle2cc/moodle2converter/section_converter.rb

@@ -54,7 +54,7 @@ module Moodle2CC
         elsif moodle_activity.is_a? Moodle2::Models::Resource
           module_item.identifierref = moodle_activity.file.content_hash if moodle_activity.file
         else
-          module_item.identifierref = generate_unique_identifier_for_activity(moodle_activity)
+          module_item.identifierref = get_unique_identifier_for_activity(moodle_activity)
         end
       end
       module_item.content_type = activity_content_type(moodle_activity)

data/lib/moodle2cc/moodle2converter/wiki_converter.rb

@@ -17,12 +17,12 @@ module Moodle2CC::Moodle2Converter
 
       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.identifier = generate_unique_identifier_for_activity(moodle_wiki)
         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.identifier = generate_unique_identifier_for_activity(moodle_wiki)
         first_page.body = moodle_wiki.intro
         first_page.workflow_state = workflow_state(moodle_wiki.visible)
         first_page.editing_roles = 'teachers'

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.27"
+  VERSION = "0.2.28"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.2.28
 platform: ruby
 authors:
 - Christopher Durtschi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip