canvas_link_migrator 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b03a701351cd4f8484cd257bdbbb3e4437ada4d39988d97230e48093e6a8c2a9
-  data.tar.gz: 2fadff9dc0f3a7c0d07ef2d7e79bd20f2e8c9ee14ccf71e4951c89417aa35659
+  metadata.gz: 7d147093c7e6b397c3eb184aba4af1595f782e14735a50e9d4986be628af75f3
+  data.tar.gz: cb48c35f35dd333b02ff7dcba5e3bd79d1a1a7b736b7bb14c56de11b6c91565e
 SHA512:
-  metadata.gz: 12d6e3e37c9d8115ce1e47712b0f6192a9d4d6617ec038d8d1b94eb3ec27996f4062d60c75b0b1f26b25675be1738a3dbe121fdc5707c182ca78751f7b47010d
-  data.tar.gz: e9fb1a26ea2aa9b9a24e799f407a05792b26c5743cd919e221e32309d20c49e603a51ec967bf28de51aba60954842793196024d74cae26f232ded871bb55725e
+  metadata.gz: 4074cbb1bfa20b00f4843327d62ee0e1cf739f7450b46698ee1a6a240054f27acd34046605e2ae4f54bbdf02b529272ba165769352e10abff1f5950c08af6ad8
+  data.tar.gz: e1deecf7b1d6586c432234092e338c9d3059f26b744072eab1cb6e644c25dbcec9ffacfb53239b6c9ffc0610c210bf80399f097f2d7efa2265686caf314a8fee

data/lib/canvas_link_migrator/link_parser.rb

@@ -182,11 +182,13 @@ module CanvasLinkMigrator
 
     # returns a hash with resolution status and data to hold onto if unresolved
     def parse_url(url, node, attr)
-      url = Addressable::URI.parse(url)
-      query_values = url.query_values || {}
-      media_attachment = query_values.delete("media_attachment") == "true"
-      url.query_values = query_values.present? ? query_values : nil
-      url = url.to_s
+      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.present? ? query_values : nil
+        url = Addressable::URI.unencode(parsed_url)
+      end
 
       if url =~ /wiki_page_migration_id=(.*)/
         unresolved(:wiki_page, migration_id: $1)

data/lib/canvas_link_migrator/link_resolver.rb

@@ -122,15 +122,14 @@ module CanvasLinkMigrator
           # context prepended to the URL. This prevents
           # redirects to non cross-origin friendly urls
           # during a file fetch
-          link[:new_value] = if rest.include?("icon_maker_icon=1")
-                               "/files/#{file_id}#{rest}"
-                             elsif link[:in_media_iframe] && link[:media_attachment]
-                               "/media_attachments_iframe/#{file_id}#{rest}"
-                             elsif link[:in_media_iframe]
-                               "/media_objects_iframe?mediahref=#{link[:new_value]}"
-                             else
-                               "#{context_path}/files/#{file_id}#{rest}"
-                             end
+          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}"
+          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
         end
       else
         raise "unrecognized link_type (#{link[:link_type]}) in unresolved link"

data/spec/canvas_link_migrator/imported_html_converter_spec.rb

@@ -240,6 +240,12 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
       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>)
+      expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
+    end
+
     it "leaves source tags without data-media-id alone" do
       test_string = %(<video style="width: 400px; height: 225px; display: inline-block;" title="this is a non-canvas video" allowfullscreen="allowfullscreen" allow="fullscreen"><source src="http://www.example.com/video.mov"></video>)
       expect(@converter.convert_exported_html(test_string)).to eq([test_string, nil])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_link_migrator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mysti Lilla
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2023-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport