canvas_link_migrator 1.0.7 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e74a62a030858ee5785138c032c6a03e38f75d05acac287dbded691fa642c593
-  data.tar.gz: d380a8f3b556d0da9d18e198483e48590e767b481415dd417d808da70d12f5fe
+  metadata.gz: db94154546720e46dbc316e28fd6b42ee03c51ee13df32d1601924fd78d158d6
+  data.tar.gz: f4a71b858889356c765fcce8360d6266b1b4cd43648cd99eed291287a5229dcb
 SHA512:
-  metadata.gz: a8b6f64385cfa820b655f009a327bb207320ffb673ea4228b69f13584550b9da18cb5d79abdf0f3c7c861249ad2a49c20c5fcec0d9372d6299dd832dfe2e18f9
-  data.tar.gz: 442098e04f4bd979f6c64eb6a83060cd8635f8c1cc7dc28e4688b0516cd9dc4215877352e9c3dde7c55798aa88059987ca1578bfb612e844222099940608ecde
+  metadata.gz: f2499b2e3764c0bf76ae4f840345104cae6187e970c4bd8f8965254836387221ae84c96041527824fd27edeff602587afb21f629b062c6e83b74e80defd14997
+  data.tar.gz: 49c3e7eb354ea51183ad44706002bb3c92dbc2c98db12371fc420f00eb2616e19fd4b6a8c3e01345d69c7d8b2b81ba71b79341f7ea2802ee8b738b3c56c3a349

data/lib/canvas_link_migrator/link_parser.rb

@@ -96,12 +96,15 @@ module CanvasLinkMigrator
 
       # Replace old style media anchor tags with iframes
       doc.search("a[id*='media_comment_']").each do |media_node|
+        next unless media_node["class"].match('instructure_inline_media_comment')
+
         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_type = media_node["class"].match(/(audio|video)/)&.[](1)
+        media_node["data-media-type"] = media_type if media_type
         media_node["src"] = media_node["href"]
         media_node.delete("href")
         media_node["allowfullscreen"] = "allowfullscreen"

data/lib/canvas_link_migrator/link_resolver.rb

@@ -228,6 +228,9 @@ module CanvasLinkMigrator
         media_id = file.try(:media_object)&.media_id || file["media_entry_id"]
         node["data-media-id"] = media_id # safe to delete?
         media_attachment_iframe_url(file["id"], node["data-media-type"])
+      elsif rel_path&.match(/\/media_attachments_iframe\/\d+/)
+        # media attachment from another course or something
+        rel_path
       elsif node["data-media-id"].present?
         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

data/lib/canvas_link_migrator/version.rb

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

data/spec/canvas_link_migrator/imported_html_converter_spec.rb

@@ -311,6 +311,16 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
     end
 
+    it "converts source tags to RCE media attachment iframes when link is an unknown media attachment reference (link from a public file in another course)" 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="0_l4l5n0wt"><source src="/media_attachments_iframe/18?type=video" data-media-id="0_l4l5n0wt" 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="0_l4l5n0wt" src="/media_attachments_iframe/18?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="0_l4l5n0wu"><source src="/media_attachments_iframe/19?type=audio" data-media-id="0_l4l5n0wu" 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="0_l4l5n0wu" src="/media_attachments_iframe/19?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&embedded=true"></iframe>)

data/spec/canvas_link_migrator/link_parser_spec.rb

@@ -51,4 +51,17 @@ describe CanvasLinkMigrator::LinkParser do
       expect{ parser.convert_link(doc.at_css('a'), "href", "wiki_page", "migrationid", "") }.not_to raise_error
     end
   end
+
+  describe "convert" do
+    it "does not change media anchor tags into iframes if they don't have inline_media_comment in the class" do
+      doc = Nokogiri::HTML5.fragment(%Q(<p><a id="media_comment_m-5HHT5LqZqPf7qhEJ7PbKtehCiunxM4BB" class=" instructure_video_link instructure_file_link" title="00-Personal Intro.m4v" href="https://xu.instructure.com/courses/83206/files/12176377/download?wrap=1" target="" data-api-endpoint="https://xu.instructure.com/api/v1/courses/83206/files/12176377" data-api-returntype="File">Click here to watch personal introduction</a></p>))
+      parser.convert(doc.to_html, "type", "lookup_id", "field")
+      expect(doc.to_html).to match(%Q(<p><a id="media_comment_m-5HHT5LqZqPf7qhEJ7PbKtehCiunxM4BB" class=" instructure_video_link instructure_file_link" title="00-Personal Intro.m4v" href="https://xu.instructure.com/courses/83206/files/12176377/download?wrap=1" target="" data-api-endpoint="https://xu.instructure.com/api/v1/courses/83206/files/12176377" data-api-returntype="File">Click here to watch personal introduction</a></p>))
+    end
+
+    it "does not crash if it can't find a video/audio_comment class name" do
+      doc = Nokogiri::HTML5.fragment(%Q(<a id="media_comment_m-4uoGqVdEqXhpqu2ZMytHSy9XMV73aQ7E" class="instructure_inline_media_comment" data-media_comment_type="video" data-alt=""></a>))
+      expect{ parser.convert(doc.to_html, "type", "lookup_id", "field") }.not_to raise_error
+    end
+  end
 end

metadata

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