canvas_link_migrator 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb741be0946fbad43cb23efadcbeb87d1338485b475cc2c3e699cfef07599263
-  data.tar.gz: f98e804aa56242fe5f08e123166f776b0f8f911b1590f541818ae6b70675395e
+  metadata.gz: e74a62a030858ee5785138c032c6a03e38f75d05acac287dbded691fa642c593
+  data.tar.gz: d380a8f3b556d0da9d18e198483e48590e767b481415dd417d808da70d12f5fe
 SHA512:
-  metadata.gz: 3d88c62ed1c8db1c690599ed7f5640a5b516a701c1ee8cd18765a80f1860db104107c8b2135357d5f205a5d176e95fedd3090a9c0dc9c84641bf2f6163d356f2
-  data.tar.gz: 1a9439977136930dfd3b6ea3fdff6d767c772c3ea9107348f4ba51253b1a04710885b141dbb1764cca5c6985213a1131c42bb1bad8676227d9c04a0ef00423fa
+  metadata.gz: a8b6f64385cfa820b655f009a327bb207320ffb673ea4228b69f13584550b9da18cb5d79abdf0f3c7c861249ad2a49c20c5fcec0d9372d6299dd832dfe2e18f9
+  data.tar.gz: 442098e04f4bd979f6c64eb6a83060cd8635f8c1cc7dc28e4688b0516cd9dc4215877352e9c3dde7c55798aa88059987ca1578bfb612e844222099940608ecde

data/lib/canvas_link_migrator/link_parser.rb

@@ -82,7 +82,7 @@ module CanvasLinkMigrator
 
     def convert(html, item_type, mig_id, field, remove_outer_nodes_if_one_child: nil)
       mig_id = mig_id.to_s
-      doc = Nokogiri::HTML5(html || "")
+      doc = Nokogiri::HTML5.fragment(html || "")
 
       # Replace source tags with iframes
       doc.search("source[data-media-id]").each do |source|
@@ -94,24 +94,36 @@ module CanvasLinkMigrator
         source.remove
       end
 
+      # Replace old style media anchor tags with iframes
+      doc.search("a[id*='media_comment_']").each do |media_node|
+        media_node.name = "iframe"
+        # smallest accepted size for iframe since we don't have the size available for these
+        media_node["style"] = "width: 320px; height: 240px; display: inline-block;"
+        media_node["title"] = media_node.text
+        media_node.child&.remove
+        media_node["data-media-type"] = media_node["class"].match(/(audio|video)_comment/)[1]
+        media_node["src"] = media_node["href"]
+        media_node.delete("href")
+        media_node["allowfullscreen"] = "allowfullscreen"
+        media_node["allow"] = "fullscreen"
+        media_node["data-media-id"] = media_node["id"].sub("media_comment_", "")
+      end
+
       doc.search("*").each do |node|
         LINK_ATTRS.each do |attr|
           convert_link(node, attr, item_type, mig_id, field)
         end
       end
 
-      node = doc.at_css("body")
-      return "" unless node
-
       if remove_outer_nodes_if_one_child
-        while node.children.size == 1 && node.child.child
-          break unless CONTAINER_TYPES.member?(node.child.name) && node.child.attributes.blank?
+        while doc.children.size == 1 && doc.child.child
+          break unless CONTAINER_TYPES.member?(doc.child.name) && doc.child.attributes.blank?
 
-          node = node.child
+          doc = doc.child
         end
       end
 
-      node.inner_html
+      doc.inner_html
     rescue Nokogiri::SyntaxError
       ""
     end
@@ -189,16 +201,12 @@ module CanvasLinkMigrator
       { resolved: true, new_url: new_url}
     end
 
+    def media_params(type)
+      "?type=#{type}&embedded=true"
+    end
+
     # returns a hash with resolution status and data to hold onto if unresolved
     def parse_url(url, node, attr)
-      parsed_url = Addressable::URI.parse(url)
-      query_values = parsed_url.query_values
-      media_attachment = query_values.try(:delete, "media_attachment") == "true"
-      if media_attachment
-        parsed_url.query_values = query_values.presence || nil
-        url = Addressable::URI.unencode(parsed_url)
-      end
-
       if url =~ /wiki_page_migration_id=(.*)/
         unresolved(:wiki_page, migration_id: $1)
       elsif url =~ /discussion_topic_migration_id=(.*)/
@@ -206,11 +214,12 @@ module CanvasLinkMigrator
       elsif url =~ %r{\$CANVAS_COURSE_REFERENCE\$/modules/items/([^?]*)(\?.*)?}
         unresolved(:module_item, migration_id: $1, query: $2)
       elsif url =~ %r{\$CANVAS_COURSE_REFERENCE\$/file_ref/([^/?#]+)(.*)}
+        in_media_iframe = (attr == "src" && ["iframe", "source"].include?(node.name) && node["data-media-id"])
+        rest = in_media_iframe ? media_params(node["data-media-type"]) : $2
         unresolved(:file_ref,
                    migration_id: $1,
-                   rest: $2,
-                   in_media_iframe: attr == "src" && ["iframe", "source"].include?(node.name) && node["data-media-id"],
-                   media_attachment: media_attachment,
+                   rest: rest,
+                   in_media_iframe: in_media_iframe,
                    target_blank: node['target'] == "_blank" && node.name == "a" && attr == "href"
         )
       elsif url =~ %r{(?:\$CANVAS_OBJECT_REFERENCE\$|\$WIKI_REFERENCE\$)/([^/]*)/([^?]*)(\?.*)?}
@@ -223,19 +232,17 @@ module CanvasLinkMigrator
         end
       elsif url =~ %r{\$CANVAS_COURSE_REFERENCE\$/(.*)}
         resolved("#{@migration_query_service.context_path}/#{$1}")
-
       elsif url =~ %r{\$IMS(?:-|_)CC(?:-|_)FILEBASE\$/(.*)}
         rel_path = URI::DEFAULT_PARSER.unescape($1)
         if (attr == "href" && node["class"]&.include?("instructure_inline_media_comment")) ||
            (attr == "src" && ["iframe", "source"].include?(node.name) && node["data-media-id"])
-          unresolved(:media_object, rel_path: rel_path, media_attachment: media_attachment)
+          unresolved(:media_object, rel_path: rel_path)
         else
           unresolved(:file, rel_path: rel_path)
         end
-      elsif (attr == "href" && node["class"]&.include?("instructure_inline_media_comment")) ||
-            (attr == "src" && ["iframe", "source"].include?(node.name) && node["data-media-id"])
-        # Course copy media reference, leave it alone
-        resolved
+      elsif (attr == "src" && ["iframe", "source"].include?(node.name) && node["data-media-id"])
+        # media_objects_iframe course copy reference without an attachment id, change to media_attachments_iframe
+        unresolved(:media_object, rel_path: node["src"])
       elsif @migration_query_service.supports_embedded_images && attr == "src" && (info_match = url.match(%r{\Adata:(?<mime_type>[-\w]+/[-\w+.]+)?;base64,(?<image>.*)}m))
         result = @migration_query_service.link_embedded_image(info_match)
         if result[:resolved]

data/lib/canvas_link_migrator/link_resolver.rb

@@ -92,11 +92,11 @@ module CanvasLinkMigrator
         # see LinkParser for details
         rel_path = link[:rel_path]
         node = Nokogiri::HTML5.fragment(link[:old_value]).children.first
-        new_url = resolve_media_comment_data(node, rel_path, link[:media_attachment])
+        new_url = resolve_media_data(node, rel_path)
         new_url ||= resolve_relative_file_url(rel_path)
 
         unless new_url
-          new_url ||= missing_relative_file_url(rel_path)
+          new_url = rel_path.include?("#{context_path}/file_contents") ? rel_path : missing_relative_file_url(rel_path)
           link[:missing_url] = new_url
         end
         if ["iframe", "source"].include?(node.name)
@@ -127,12 +127,13 @@ module CanvasLinkMigrator
           # during a file fetch
           if rest&.include?("icon_maker_icon=1")
             link[:new_value] = "/files/#{file_id}#{rest}"
-          elsif link[:in_media_iframe] && link[:media_attachment]
+          elsif link[:in_media_iframe]
             link[:new_value] = "/media_attachments_iframe/#{file_id}#{rest}"
           else
             link[:new_value] = "#{context_path}/files/#{file_id}#{rest}"
-            link[:new_value] = "/media_objects_iframe?mediahref=#{link[:new_value]}" if link[:in_media_iframe]
           end
+        else
+          link[:missing_url] = link[:old_value].partition("$CANVAS_COURSE_REFERENCE$").last
         end
       else
         raise "unrecognized link_type (#{link[:link_type]}) in unresolved link"
@@ -216,40 +217,20 @@ module CanvasLinkMigrator
       new_url
     end
 
-    def media_iframe_url(media_id, media_type = nil)
-      url = "/media_objects_iframe/#{media_id}"
-      url += "?type=#{media_type}" if media_type.present?
-      url
-    end
-
     def media_attachment_iframe_url(file_id, media_type = nil)
-      url = "/media_attachments_iframe/#{file_id}"
-      url += "?type=#{media_type}" if media_type.present?
+      url = "/media_attachments_iframe/#{file_id}?embedded=true"
+      url += "&type=#{media_type}" if media_type.present?
       url
     end
 
-    def resolve_media_comment_data(node, rel_path, media_attachment)
-      if (file = find_file_in_context(rel_path[/^[^?]+/])) # strip query string for this search
+    def resolve_media_data(node, rel_path)
+      if rel_path && (file = find_file_in_context(rel_path[/^[^?]+/])) # strip query string for this search
         media_id = file.try(:media_object)&.media_id || file["media_entry_id"]
-        if media_id && media_id != "maybe"
-          if ["iframe", "source"].include?(node.name)
-            node["data-media-id"] = media_id
-            if media_attachment
-              return media_attachment_iframe_url(file["id"], node["data-media-type"])
-            else
-              return media_iframe_url(media_id, node["data-media-type"])
-            end
-          else
-            node["id"] = "media_comment_#{media_id}"
-            return "/media_objects/#{media_id}"
-          end
-        end
-      end
-
-      if node["id"] && node["id"] =~ /\Amedia_comment_(.+)\z/
-        "/media_objects/#{$1}"
+        node["data-media-id"] = media_id # safe to delete?
+        media_attachment_iframe_url(file["id"], node["data-media-type"])
       elsif node["data-media-id"].present?
-        media_iframe_url(node["data-media-id"], node["data-media-type"])
+        file = @migration_id_converter.lookup_attachment_by_media_id(node["data-media-id"])
+        file ? media_attachment_iframe_url(file["id"], node["data-media-type"]) : nil
       else
         node.delete("class")
         node.delete("id")

data/lib/canvas_link_migrator/resource_map_service.rb

@@ -106,5 +106,17 @@ module CanvasLinkMigrator
     def lookup_attachment_by_migration_id(migration_id)
       resources.dig("files", migration_id, "destination")
     end
+
+    def media_map
+      @media_map ||= resources["files"].each_with_object({}) do |(_mig_id, file), map|
+        media_id = file.dig("destination", "media_entry_id")
+        next unless media_id
+        map[media_id] = file
+      end
+    end
+
+    def lookup_attachment_by_media_id(media_id)
+      media_map.dig(media_id, "destination")
+    end
   end
 end

data/lib/canvas_link_migrator/version.rb

@@ -1,3 +1,3 @@
 module CanvasLinkMigrator
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/spec/canvas_link_migrator/imported_html_converter_spec.rb

@@ -210,67 +210,114 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
       expect(bad_links[0]).to include({ link_type: :file, missing_url: "/courses/2/file_contents/course%20files/relative/path/to/file%20with%20space.html" })
     end
 
-    it "preserves media comment links" do
+    it "changes old media URL types into media_attachments_iframe" do
       test_string = <<~HTML.strip
         <p>
           with media object url: <a id="media_comment_m-stuff" class="instructure_inline_media_comment video_comment" href="/media_objects/m-stuff">this is a media comment</a>
           with file content url: <a id="media_comment_0_bq09qam2" class="instructure_inline_media_comment video_comment" href="/courses/2/file_contents/course%20files/media_objects/0_bq09qam2">this is a media comment</a>
+          with mediahref url: <iframe data-media-type="video" src="/media_objects_iframe?mediahref=$CANVAS_COURSE_REFERENCE$/file_ref/I/download" data-media-id="m-yodawg"></iframe>
         </p>
       HTML
 
-      expect(@converter.convert_exported_html(test_string)).to eq([test_string, nil])
+      expected_string = <<~HTML.strip
+        <p>
+          with media object url: <iframe id="media_comment_m-stuff" class="instructure_inline_media_comment video_comment" style="width: 320px; height: 240px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/5?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"></iframe>
+          with file content url: <iframe id="media_comment_0_bq09qam2" class="instructure_inline_media_comment video_comment" style="width: 320px; height: 240px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/6?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="0_bq09qam2"></iframe>
+          with mediahref url: <iframe data-media-type="video" src="/media_attachments_iframe/9?type=video&embedded=true" data-media-id="m-yodawg"></iframe>
+        </p>
+      HTML
+
+      expect(@converter.convert_exported_html(test_string)).to eq([expected_string, nil])
     end
 
-    it "handles and repair half broken media links" do
-      test_string = %(<p><a href="/courses/2/file_contents/%24IMS_CC_FILEBASE%24/#" class="instructure_inline_media_comment video_comment" id="media_comment_m-stuff">this is a media comment</a><br><br></p>)
+    it "handles old media types where we can't find the file" do
+      test_string = <<~HTML.strip
+        <p>
+          with media object url: <a id="media_comment_m-stuff1" class="instructure_inline_media_comment video_comment" href="/media_objects/m-stuff1">this is a media comment</a>
+          with file content url: <a id="media_comment_0_bq09qam3" class="instructure_inline_media_comment video_comment" href="/courses/2/file_contents/course%20files/media_objects/0_bq09qam3">this is a media comment</a>
+          with mediahref url: <iframe data-media-type="video" src="/media_objects_iframe?mediahref=$CANVAS_COURSE_REFERENCE$/file_ref/yarg/download" data-media-id="m-yodawg"></iframe>
+        </p>
+      HTML
+
+      expected_string = <<~HTML.strip
+        <p>
+          with media object url: <iframe id="media_comment_m-stuff1" class="instructure_inline_media_comment video_comment" style="width: 320px; height: 240px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/courses/2/file_contents/course%20files/media_objects/m-stuff1" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff1"></iframe>
+          with file content url: <iframe id="media_comment_0_bq09qam3" class="instructure_inline_media_comment video_comment" style="width: 320px; height: 240px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/courses/2/file_contents/course%20files/media_objects/0_bq09qam3" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="0_bq09qam3"></iframe>
+          with mediahref url: <iframe data-media-type="video" src="/media_objects_iframe?mediahref=$CANVAS_COURSE_REFERENCE$/file_ref/yarg/download" data-media-id="m-yodawg"></iframe>
+        </p>
+      HTML
 
-      expect(@converter.convert_exported_html(test_string)).to eq([%(<p><a href="/media_objects/m-stuff" class="instructure_inline_media_comment video_comment" id="media_comment_m-stuff">this is a media comment</a><br><br></p>), nil])
+      expected_errors = [
+        {
+          link_type: :media_object,
+          missing_url: "/courses/2/file_contents/course%20files/media_objects/m-stuff1"
+        },
+        {
+          link_type: :media_object,
+          missing_url: "/courses/2/file_contents/course%20files/media_objects/0_bq09qam3"
+        },
+        {
+          link_type: :file_ref, missing_url: "/file_ref/yarg/download"
+        }
+      ]
+      expect(@converter.convert_exported_html(test_string)).to eq([expected_string, expected_errors])
     end
 
-    it "preserves new RCE media iframes" do
-      test_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_objects_iframe/m-stuff?type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"></iframe>)
-      expect(@converter.convert_exported_html(test_string)).to eq([test_string, nil])
+    it "handles and repair half broken media links" do
+      test_string = <<~HTML.strip
+        <p>
+          with wrong file in href: <a href="/courses/2/file_contents/%24IMS_CC_FILEBASE%24/#" class="instructure_inline_media_comment video_comment" id="media_comment_m-stuff">this is a media comment</a><br><br>
+          with no href: <a class="instructure_inline_media_comment video_comment" id="media_comment_m-stuff" href="#"></a><br><br>
+        </p>
+      HTML
+      expected_string = <<~HTML.strip
+        <p>
+          with wrong file in href: <iframe class="instructure_inline_media_comment video_comment" id="media_comment_m-stuff" style="width: 320px; height: 240px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/5?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"></iframe><br><br>
+          with no href: <iframe class="instructure_inline_media_comment video_comment" id="media_comment_m-stuff" style="width: 320px; height: 240px; display: inline-block;" title="" data-media-type="video" src="/media_attachments_iframe/5?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"></iframe><br><br>
+        </p>
+      HTML
+      expect(@converter.convert_exported_html(test_string)).to eq([expected_string, nil])
+    end
+
+    it "converts old RCE media object iframes" do
+      test_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_objects_iframe/m-lolcat?type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"></iframe>)
+      replacement_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/8?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"></iframe>)
+      expect(@converter.convert_exported_html(test_string)).to eq([replacement_string, nil])
     end
 
     it "handles and repair half broken new RCE media iframes" do
-      test_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="%24IMS_CC_FILEBASE%24/#" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-abcde"></iframe>)
-      repaired_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_objects_iframe/m-abcde?type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-abcde"></iframe>)
+      test_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="%24IMS_CC_FILEBASE%24/#" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"></iframe>)
+      repaired_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/8?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([repaired_string, nil])
     end
 
     it "converts source tags to RCE media iframes" do
-      test_string = %(<video style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"><source src="/media_objects_iframe/m-stuff?type=video" data-media-id="m-stuff" data-media-type="video"></video>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff" src="/media_objects_iframe/m-stuff?type=video"></iframe>)
+      test_string = %(<video style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"><source src="/media_objects_iframe/m-lolcat?type=video" data-media-id="m-lolcat" data-media-type="video"></video>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat" src="/media_attachments_iframe/8?embedded=true&amp;type=video"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
 
-      test_string = %(<audio style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-stuff"><source src="/media_objects_iframe/m-stuff?type=audio" data-media-id="m-stuff" data-media-type="audio"></audio>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-stuff" src="/media_objects_iframe/m-stuff?type=audio"></iframe>)
+      test_string = %(<audio style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-yodawg"><source src="/media_objects_iframe/m-yodawg?type=audio" data-media-id="m-yodawg" data-media-type="audio"></audio>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-yodawg" src="/media_attachments_iframe/9?embedded=true&amp;type=audio"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
     end
 
     it "converts source tags to RCE media attachment iframes" do
       test_string = %(<video style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"><source src="$IMS-CC-FILEBASE$/subfolder/with a space/yodawg.mov?canvas_=1&canvas_qs_type=video&canvas_qs_amp=&canvas_qs_embedded=true&media_attachment=true" data-media-id="m-stuff" data-media-type="video"></video>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-yodawg" src="/media_attachments_iframe/9?type=video"></iframe>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-yodawg" src="/media_attachments_iframe/9?embedded=true&amp;type=video"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
 
       test_string = %(<audio style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-stuff"><source src="$IMS-CC-FILEBASE$/lolcat.mp3?canvas_=1&canvas_qs_type=audio&canvas_qs_amp=&canvas_qs_embedded=true&media_attachment=true" data-media-id="m-stuff" data-media-type="audio"></video>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-lolcat" src="/media_attachments_iframe/8?type=audio"></iframe>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-lolcat" src="/media_attachments_iframe/8?embedded=true&amp;type=audio"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
     end
 
     it "converts course copy style media attachmet iframe links" do
       test_string = %(<video style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-yodawg"><source src="$CANVAS_COURSE_REFERENCE$/file_ref/I?media_attachment=true&type=video" data-media-id="m-yodawg" data-media-type="video"></video>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-yodawg" src="/media_attachments_iframe/9?type=video"></iframe>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-yodawg" src="/media_attachments_iframe/9?type=video&embedded=true"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
 
       test_string = %(<audio style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-lolcat"><source src="$CANVAS_COURSE_REFERENCE$/file_ref/H?media_attachment=true&type=audio" data-media-id="m-lolcat" data-media-type="audio"></audio>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-lolcat" src="/media_attachments_iframe/8?type=audio"></iframe>)
-      expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
-    end
-
-    it "converts mediahref iframes" do
-      test_string = %(<iframe data-media-type="video" src="/media_objects_iframe?mediahref=$CANVAS_COURSE_REFERENCE$/file_ref/I/download" data-media-id="m-yodawg"></iframe>)
-      converted_string = %(<iframe data-media-type="video" src="/media_objects_iframe?mediahref=/courses/2/files/9/download" data-media-id="m-yodawg"></iframe>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-lolcat" src="/media_attachments_iframe/8?type=audio&embedded=true"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
     end
 

data/spec/canvas_link_migrator/link_parser_spec.rb

@@ -21,11 +21,8 @@
 require "spec_helper"
 
 describe CanvasLinkMigrator::LinkParser do
-  def parser
-    migration_query_service_mock = double()
-    allow(migration_query_service_mock).to receive(:supports_embedded_images).and_return(true)
-    allow(migration_query_service_mock).to receive(:fix_relative_urls?).and_return(true)
-    CanvasLinkMigrator::LinkParser.new(migration_query_service_mock)
+  def parser(assets = JSON.parse(File.read("spec/fixtures/canvas_resource_map.json")))
+    CanvasLinkMigrator::LinkParser.new(CanvasLinkMigrator::ResourceMapService.new(assets))
   end
 
   describe "convert_link" do

data/spec/fixtures/canvas_resource_map.json

@@ -5,7 +5,8 @@
     "subfolder/with a space/yodawg.mov": "I",
     "subfolder/withCapital/test.png": "migration_id!",
     "lolcat.mp3": "H",
-    "test.png": "E"
+    "test.png": "E",
+    "media_objects/0_bq09qam2": "F"
   },
   "contains_migration_ids": true,
   "destination_course": "2",
@@ -59,11 +60,11 @@
       "F": {
         "destination": {
           "id": "6",
-          "media_entry_id": "m-stuff"
+          "media_entry_id": "0_bq09qam2"
         },
         "source": {
           "id": "4",
-          "media_entry_id": "m-stuff"
+          "media_entry_id": "0_bq09qam2"
         }
       },
       "G": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_link_migrator
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Mysti Lilla
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport