canvas_link_migrator 1.0.12 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7cbc11edecf38395bcf3dfda752a5a2946e9f691f86f95f35d80fe12a28f228
-  data.tar.gz: d55a7c3509ce6da3b423e20b119f17ad5dbfd61f32d8f4f6a926ae0e84da343f
+  metadata.gz: 404df3ac84fac220f5c7b18e89478b72a7a6cf03d1c41f7ed7d7390ec2da7ba2
+  data.tar.gz: a1833675b038c7b285d2589e52e0dd62df0ad77efc92aff8c64021b66d498996
 SHA512:
-  metadata.gz: 8f54e3e63f1a47b50f0568bfcfce57f2b15c59a7097e7ea4fde9a89433554cba0a24bc60a854e267d2efab49c4cceec532d2c3a99e2b2b779cadbcc379a0c349
-  data.tar.gz: 5b290e62a21a044efea17939e03ab3cd197e9acf7030fda2683b8f4c9a0033ef4ff72fa5f82b8dfe09affb1f3a86d8c4c55c21ef853768b93e16a6f19041a0ac
+  metadata.gz: 95b7dfbae704889c1d8b2301219c59123f49365d2093bdc426631d3fb45e63ff6813f811561372726ccf18eabe338b5ea056908c9a186b0fefc6d16ba3fe6dd6
+  data.tar.gz: 516747d2f7dc023d1a4dbeb49b5b8f51ed827eb9c2aa0486d9a65db1dab708d9f12e450f822d61f063f37bf5319318b9060e83ca4c954f6509a78995dd995401

data/lib/canvas_link_migrator/link_parser.rb

@@ -211,7 +211,7 @@ 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"])
+        in_media_iframe = (attr == "src" && ["iframe", "source"].include?(node.name) && (node["data-media-id"] || node["data-media-type"]))
         rest = in_media_iframe ? media_params(node["data-media-type"]) : $2
         unresolved(:file_ref,
                    migration_id: $1,
@@ -232,7 +232,7 @@ module CanvasLinkMigrator
       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))
+           (attr == "src" && ["iframe", "source"].include?(node.name) && (node["data-media-id"] || node["data-media-type"]))
           unresolved(:media_object, rel_path: rel_path)
         else
           unresolved(:file, rel_path: rel_path)

data/lib/canvas_link_migrator/version.rb

@@ -1,3 +1,3 @@
 module CanvasLinkMigrator
-  VERSION = "1.0.12"
+  VERSION = "1.0.14"
 end

data/spec/canvas_link_migrator/imported_html_converter_spec.rb

@@ -400,5 +400,16 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
       test_string = '<p><a href="#anchor_ref">ref</a></p>'
       expect(@converter.convert_exported_html(test_string)).to eq([test_string, nil])
     end
+
+    it "converts iframe srcs that point to non-media files" do
+      test_string = <<~HTML
+      <p><iframe style="width: 100%; height: 100vh; border: none;" src="$IMS-CC-FILEBASE$/subfolder/test.png?canvas_download=1"></iframe></p>
+      HTML
+      converted_string = <<~HTML
+      <p><iframe style="width: 100%; height: 100vh; border: none;" src="/courses/2/files/7/download?verifier=u7"></iframe></p>
+      HTML
+      html = @converter.convert_exported_html(test_string)
+      expect(html[0]).to eq converted_string
+    end
   end
 end

data/spec/canvas_link_migrator/link_parser_spec.rb

@@ -32,6 +32,12 @@ describe CanvasLinkMigrator::LinkParser do
       expect(parsed[:target_blank]).to be true
     end
 
+    it "checks data-media-type attribute to determine in_media_iframe" do
+      doc = Nokogiri::HTML5.fragment("<p><iframe data-media-type=\"video\" src=\"$CANVAS_COURSE_REFERENCE$/file_ref/whatevs\"></iframe></p>")
+      parsed = parser.parse_url("$CANVAS_COURSE_REFERENCE$/file_ref/whatevs", doc.at_css('iframe'), "src")
+      expect(parsed[:in_media_iframe]).to eq "video"
+    end
+
     it "converts inner html of anchor tags when appropriate" do
       doc = Nokogiri::HTML5.fragment("<a href=\"$WIKI_REFERENCE$/pages/1\">$WIKI_REFERENCE$/pages/1</a>")
       parser.convert_link(doc.at_css('a'), "href","wiki_page", "migrationid", "")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_link_migrator
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.14
 platform: ruby
 authors:
 - Mysti Lilla
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-14 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport