canvas_link_migrator 1.0.13 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b5936b2c0b84390589696838b2f7409d71467a11b20f81c63176e8e99a54caa
-  data.tar.gz: 49c4a0df338db02c8b658c49249f2fb8c3f9a75d60790f6fd72a405242682fca
+  metadata.gz: 36b5ebb39673be4a7105bc459809c1faa333899c9d709d665cabd00f4242401d
+  data.tar.gz: 6702833e94aa9a7fd3bb3265199c2b7caf269e30fd0c82b5c15028d810d44c14
 SHA512:
-  metadata.gz: c3c0f69c22fd75d7f783fa017993c7803f7504aa2e4b353917b33ec730a2cf0577e3f8941b58472a6ab694ab92bd667be12c5d65300119d7febea6cca0b9d45f
-  data.tar.gz: 3e6158123ea5ad27bd55033865474133d9bdc7e663006c05eb3d8efb76bf7fe49a6041e0b37d19d1d0ca606aba4bbb329caa9cd4b92e13db8b97fc65dace5d24
+  metadata.gz: e8a5d21a3c0a74e5805163d724e42c64a0db4a6d2b18f85f637e401f6ca09089aab287e8afb88b22150cd7eadf90e51a1ba3e78d9bb7892968bbf57055554bfe
+  data.tar.gz: 1fd447f0548f8c84a2fdea0a6a791679eea31c6f4dede5502d4191dcf96b994d4072b303a6ba713151bc03aaddefe6ad003e556ffd4ce39880f8ce792a216522

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,

data/lib/canvas_link_migrator/link_resolver.rb

@@ -226,6 +226,7 @@ module CanvasLinkMigrator
             end
           end
           new_url += new_action.presence || "/preview"
+          new_url.chomp!("/")
           new_url += "?#{qs.join("&")}" if qs.present?
         end
         rel_path_parts.shift

data/lib/canvas_link_migrator/version.rb

@@ -1,3 +1,3 @@
 module CanvasLinkMigrator
-  VERSION = "1.0.13"
+  VERSION = "1.0.15"
 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", "")

data/spec/canvas_link_migrator/link_resolver_spec.rb

@@ -57,6 +57,17 @@ describe CanvasLinkMigrator::LinkResolver do
       expect(link[:new_value]).to eq("/courses/2/files/6?verifier=u6")
     end
 
+    it "does not leave a trailing slash on the url with a `canvas_` query param" do
+      link = {
+        link_type: :file,
+        migration_id: "F",
+        rel_path: "subfolder/with a space/test.png?canvas_=1&canvas_qs_wrap=1" }
+
+      resolver.resolve_link!(link)
+
+      expect(link[:new_value]).to eq("/courses/2/files/6?verifier=u6&wrap=1")
+    end
+
     it "converts attachment urls" do
       link = { link_type: :object, type: "attachments", migration_id: "E", query: "?foo=bar" }
       resolver.resolve_link!(link)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_link_migrator
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.15
 platform: ruby
 authors:
 - Mysti Lilla
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport