canvas_link_migrator 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3b1e71c22b8899f6fe7b5986ee5569fbb9525c0d4cb9e6eb25c9f6ef1804435
-  data.tar.gz: ba9a4fc3a6ce17be40afab0814818fa7b62603e2aee6d6e5e784110c3fb975c0
+  metadata.gz: bb741be0946fbad43cb23efadcbeb87d1338485b475cc2c3e699cfef07599263
+  data.tar.gz: f98e804aa56242fe5f08e123166f776b0f8f911b1590f541818ae6b70675395e
 SHA512:
-  metadata.gz: 191de3ba56873baa45d3f922f7276edcdc0f84eda77fc6627cb9d55e4058b00ec792785b08ad4ef666dd4c0efe95b9cdde289320293466dc598d9a703c3532a8
-  data.tar.gz: 4462eb3f2b424ac381ba35a0f9369c2a671d47efdcb7ac9698ebfeeedccaed397e0736f4d321ba366d9620f7734a9aa69621aba128c47a5a317c6559476ae86d
+  metadata.gz: 3d88c62ed1c8db1c690599ed7f5640a5b516a701c1ee8cd18765a80f1860db104107c8b2135357d5f205a5d176e95fedd3090a9c0dc9c84641bf2f6163d356f2
+  data.tar.gz: 1a9439977136930dfd3b6ea3fdff6d767c772c3ea9107348f4ba51253b1a04710885b141dbb1764cca5c6985213a1131c42bb1bad8676227d9c04a0ef00423fa

data/lib/canvas_link_migrator/link_parser.rb

@@ -210,7 +210,9 @@ module CanvasLinkMigrator
                    migration_id: $1,
                    rest: $2,
                    in_media_iframe: attr == "src" && ["iframe", "source"].include?(node.name) && node["data-media-id"],
-                   media_attachment: media_attachment)
+                   media_attachment: media_attachment,
+                   target_blank: node['target'] == "_blank" && node.name == "a" && attr == "href"
+        )
       elsif url =~ %r{(?:\$CANVAS_OBJECT_REFERENCE\$|\$WIKI_REFERENCE\$)/([^/]*)/([^?]*)(\?.*)?}
         if KNOWN_REFERENCE_TYPES.include?($1)
           unresolved(:object, type: $1, migration_id: $2, query: $3)

data/lib/canvas_link_migrator/link_resolver.rb

@@ -108,6 +108,8 @@ module CanvasLinkMigrator
       when :file
         rel_path = link[:rel_path]
         new_url = resolve_relative_file_url(rel_path)
+        # leave user urls alone
+        new_url ||= rel_path if is_relative_user_url(rel_path)
         unless new_url
           new_url = missing_relative_file_url(rel_path)
           link[:missing_url] = new_url
@@ -116,13 +118,14 @@ module CanvasLinkMigrator
       when :file_ref
         file_id = @migration_id_converter.convert_attachment_migration_id(link[:migration_id])
         if file_id
-          rest = link[:rest].presence || "/preview"
+          rest = link[:rest].presence
+          rest ||= "/preview" unless link[:target_blank]
 
           # Icon Maker files should not have the course
           # context prepended to the URL. This prevents
           # redirects to non cross-origin friendly urls
           # during a file fetch
-          if rest.include?("icon_maker_icon=1")
+          if rest&.include?("icon_maker_icon=1")
             link[:new_value] = "/files/#{file_id}#{rest}"
           elsif link[:in_media_iframe] && link[:media_attachment]
             link[:new_value] = "/media_attachments_iframe/#{file_id}#{rest}"
@@ -254,5 +257,9 @@ module CanvasLinkMigrator
         nil
       end
     end
+
+    def is_relative_user_url(rel_path)
+      rel_path.start_with?("/users/")
+    end
   end
 end

data/lib/canvas_link_migrator/version.rb

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

data/spec/canvas_link_migrator/imported_html_converter_spec.rb

@@ -86,6 +86,16 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
         expect(@converter.convert_exported_html(test_string)).to eq([%{<p>This is an image: <br><img src="#{@path}files/6/preview" alt=":("></p>}, nil])
       end
 
+      it "leaves relative user attachments alone" do
+        test_string = %{<p> This is an image: <img src="/users/1/files/1/preview?verifier=someVerifier" alt="some_image"></p>}
+        expect(@converter.convert_exported_html(test_string)).to eq([test_string, nil])
+      end
+
+      it "leaves absolute user attachments alone" do
+        test_string = %{<p> This is an image: <img src="http://mycanvas.com/users/1/files/1/preview?verifier=someVerifier" alt="some_image"></p>}
+        expect(@converter.convert_exported_html(test_string)).to eq([test_string, nil])
+      end
+
       it "finds an attachment by path" do
         test_string = %{<p>This is an image: <br /><img src="%24IMS_CC_FILEBASE%24/test.png" alt=":(" /></p>}
 

data/spec/canvas_link_migrator/link_parser_spec.rb

@@ -29,6 +29,12 @@ describe CanvasLinkMigrator::LinkParser do
   end
 
   describe "convert_link" do
+    it "marks target=_blank anchor tags" do
+      doc = Nokogiri::HTML5.fragment("<a target=\"_blank\"></a>")
+      parsed = parser.parse_url("$CANVAS_COURSE_REFERENCE$/file_ref/whatevs", doc.at_css('a'), "href")
+      expect(parsed[:target_blank]).to be true
+    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

@@ -51,6 +51,12 @@ describe CanvasLinkMigrator::LinkResolver do
       expect(link[:new_value]).to eq("/courses/2/files/6/preview")
     end
 
+    it "does not suffix /preview to target blank links" do
+      link = { link_type: :file_ref, target_blank: true, migration_id: "F" }
+      resolver.resolve_link!(link)
+      expect(link[:new_value]).to eq("/courses/2/files/6")
+    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.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Mysti Lilla
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-01 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -152,7 +152,8 @@ files:
 - test.sh
 homepage: 
 licenses: []
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/instructure/canvas_link_migrator
 post_install_message: 
 rdoc_options: []
 require_paths: