canvas_link_migrator 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c077949f9cef706c71bff4537a9df6a3e53cb5306dadab87fb0281c79754a16
-  data.tar.gz: d1f6d129570271a82b293f6422b00cb1b6533233713adaf1479fd5d7efda47cb
+  metadata.gz: c3b1e71c22b8899f6fe7b5986ee5569fbb9525c0d4cb9e6eb25c9f6ef1804435
+  data.tar.gz: ba9a4fc3a6ce17be40afab0814818fa7b62603e2aee6d6e5e784110c3fb975c0
 SHA512:
-  metadata.gz: b07d22a498fbb5188874aa67a6702be9ee349ed2be2efb5c4f42050d45b7914afb0edeae7d2f2127dae44531631f371cb1d8df62923133f8a88b96bcbe8f997f
-  data.tar.gz: f1c6fa682fc28072571d3841d4418e14bc1240b453618ec19be98df2d09ab8a217c3638310bc0383e1a63f32ade812008f69a3198ad436167dd12f5ffc672673
+  metadata.gz: 191de3ba56873baa45d3f922f7276edcdc0f84eda77fc6627cb9d55e4058b00ec792785b08ad4ef666dd4c0efe95b9cdde289320293466dc598d9a703c3532a8
+  data.tar.gz: 4462eb3f2b424ac381ba35a0f9369c2a671d47efdcb7ac9698ebfeeedccaed397e0736f4d321ba366d9620f7734a9aa69621aba128c47a5a317c6559476ae86d

data/lib/canvas_link_migrator/link_parser.rb

@@ -129,7 +129,12 @@ module CanvasLinkMigrator
         url.gsub!("%24#{ref}%24", "$#{ref}$")
       end
 
-      result = parse_url(url, node, attr)
+      begin
+        result = parse_url(url, node, attr)
+      rescue Addressable::URI::InvalidURIError
+        return
+      end
+
       if result[:resolved]
         # resolved, just replace and carry on
         new_url = result[:new_url] || url

data/lib/canvas_link_migrator/resource_map_service.rb

@@ -69,7 +69,7 @@ module CanvasLinkMigrator
 
     # Looks up a wiki page slug for a migration id
     def convert_wiki_page_migration_id_to_slug(migration_id)
-      resources.dig("wiki_pages", migration_id, "destination", "url")
+      resources.dig("wiki_pages", migration_id, "destination", "url") || resources.dig("pages", migration_id, "destination", "url")
     end
 
     # looks up a discussion topic

data/spec/canvas_link_migrator/imported_html_converter_spec.rb

@@ -25,7 +25,7 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
   # tests link_parser and link_resolver
 
   describe ".convert" do
-    before do
+    before(:each) do
       @path = "/courses/2/"
       @converter = CanvasLinkMigrator::ImportedHtmlConverter.new(resource_map: JSON.parse(File.read("spec/fixtures/canvas_resource_map.json")))
     end
@@ -44,6 +44,24 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
       expect(bad_links).to be_nil
     end
 
+    context "when pages in resource map but no wiki_pages" do
+      before(:each) do
+        @converter = CanvasLinkMigrator::ImportedHtmlConverter.new(resource_map: JSON.parse(File.read("spec/fixtures/canvas_resource_map_pages.json")))
+      end
+
+        it "converts a wiki reference with migration id" do
+          test_string = %(<a href="%24WIKI_REFERENCE%24/pages/A?query=blah">Test Wiki Page</a>)
+          html, bad_links = @converter.convert_exported_html(test_string)
+          expect(html).to eq %(<a href="#{@path}pages/slug-a?query=blah">Test Wiki Page</a>)
+          expect(bad_links).to be_nil
+        end
+
+        it "converts a wiki reference by migration id" do
+          test_string = %(<a href="wiki_page_migration_id=A">Test Wiki Page</a>)
+          expect(@converter.convert_exported_html(test_string)).to eq([%(<a href="#{@path}pages/slug-a">Test Wiki Page</a>), nil])
+        end
+    end
+
     context "when course attachments exist" do
       subject { @converter.convert_exported_html(test_string) }
 

data/spec/canvas_link_migrator/link_parser_spec.rb

@@ -42,5 +42,10 @@ describe CanvasLinkMigrator::LinkParser do
       expect(doc.at_css('a')['href']).to include("LINK.PLACEHOLDER")
       expect(doc.at_css('a').inner_html).not_to include("LINK.PLACEHOLDER")
     end
+
+    it "doesn't convert inner html of anchor tags if unnecessary" do
+      doc = Nokogiri::HTML5.fragment("<a href=\"https://what:10.1111/HFP.0b013e31828df26\">broken link</a>")
+      expect{ parser.convert_link(doc.at_css('a'), "href", "wiki_page", "migrationid", "") }.not_to raise_error
+    end
   end
 end

data/spec/canvas_link_migrator/link_resolver_spec.rb

@@ -33,6 +33,12 @@ describe CanvasLinkMigrator::LinkResolver do
       expect(link[:new_value]).to eq("/courses/2/pages/slug-a?foo=bar")
     end
 
+    it "converts wiki_pages links with pages in resource map" do
+      link = { link_type: :wiki_page, migration_id: "A", query: "?foo=bar" }
+      resolver(JSON.parse(File.read("spec/fixtures/canvas_resource_map_pages.json"))).resolve_link!(link)
+      expect(link[:new_value]).to eq("/courses/2/pages/slug-a?foo=bar")
+    end
+
     it "converts module_item links" do
       link = { link_type: :module_item, migration_id: "C", query: "?foo=bar" }
       resolver.resolve_link!(link)

data/spec/fixtures/canvas_resource_map_pages.json

@@ -0,0 +1,134 @@
+{
+    "attachment_path_id_lookup": {
+      "subfolder/test.png": "G",
+      "subfolder/with a space/test.png": "F",
+      "subfolder/with a space/yodawg.mov": "I",
+      "subfolder/withCapital/test.png": "migration_id!",
+      "lolcat.mp3": "H",
+      "test.png": "E"
+    },
+    "contains_migration_ids": true,
+    "destination_course": "2",
+    "destination_hosts": [
+      "apple.edu",
+      "kiwi.edu"
+    ],
+    "destination_root_folder": "course files/",
+    "resource_mapping": {
+      "announcements": {
+        "H": {
+          "source": {
+            "id": "9"
+          },
+          "destination": {
+            "id": "10"
+          }
+        }
+      },
+      "assignments": {
+        "I": {
+          "source": {
+            "id": "11"
+          },
+          "destination": {
+            "id": "12"
+          }
+        }
+      },
+      "discussion_topics": {
+        "G": {
+          "destination": {
+            "id": "7"
+          },
+          "source": {
+            "id": "6"
+          }
+        }
+      },
+      "files": {
+        "E": {
+          "destination": {
+            "id": "5",
+            "media_entry_id": "m-stuff"
+          },
+          "source": {
+            "id": "3",
+            "media_entry_id": "m-stuff"
+          }
+        },
+        "F": {
+          "destination": {
+            "id": "6",
+            "media_entry_id": "m-stuff"
+          },
+          "source": {
+            "id": "4",
+            "media_entry_id": "m-stuff"
+          }
+        },
+        "G": {
+          "destination": {
+            "id": "7"
+          },
+          "source": {
+            "id": "2"
+          }
+        },
+        "H": {
+          "destination": {
+            "id": "8",
+            "media_entry_id": "m-lolcat"
+          },
+          "source": {
+            "id": "3",
+            "media_entry_id": "m-lolcat"
+          }
+        },
+        "I": {
+          "destination": {
+            "id": "9",
+            "media_entry_id": "m-yodawg"
+          },
+          "source": {
+            "id": "4",
+            "media_entry_id": "m-yodawg"
+          }
+        }
+      },
+      "module_items": {
+        "C": {
+          "destination": {
+            "id": "3"
+          },
+          "source": {
+            "id": "2"
+          }
+        }
+      },
+      "modules": {
+        "J": {
+          "destination": {
+            "id": "36"
+          },
+          "source": {
+            "id": "22"
+          }
+        }
+      },
+      "pages": {
+        "A": {
+          "destination": {
+            "id": "2",
+            "url": "slug-a"
+          },
+          "source": {
+            "id": "1",
+            "url": "slug-a"
+          }
+        }
+      }
+    },
+    "source_course": "1",
+    "source_host": "pineapple.edu"
+  }
+  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_link_migrator
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Mysti Lilla
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2024-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -147,6 +147,7 @@ files:
 - spec/canvas_link_migrator/link_resolver_spec.rb
 - spec/canvas_link_migrator_spec.rb
 - spec/fixtures/canvas_resource_map.json
+- spec/fixtures/canvas_resource_map_pages.json
 - spec/spec_helper.rb
 - test.sh
 homepage: