html-proofer 5.0.0 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c984bfe049fba10c746d289d8d0256f219d6ae8f5af152f6f8af68e639301b
-  data.tar.gz: c407f3995e873bbbc42d90de1f082827a40caa90cb12e5cdba7fd514500d1124
+  metadata.gz: 1081048f56ee5d0b41f5ba9278d0757d1a1eef6fdb8c50148eb2b47a183b5572
+  data.tar.gz: 9a60b977a473c77c12085062b0438eb175751a0a013206ec4dbd1baf03deffb6
 SHA512:
-  metadata.gz: 732365ae4207754f70b27843a52d4f8186673fe1282ddaae03244ebff07517816371e970b75e465539bac51e931d51d4b1856866fcd6a3a575ae6e980d7c6465
-  data.tar.gz: ab01a8425d206863584e6c84f395ab85a22eff9d2e1df0daa4e0f72771fc9bde95a8992da17d2ef8195439ad1de2412135758989bb9ba29766b1978d95e0fad4
+  metadata.gz: 0402cc78e35cd4440bf95e9a9d0372f68677d28ad0e901867457c4583caebb4cbd4eefdc50e27e270d85e756ee402c0e2ba6898c3bf1b074fef6f69f8b30ae7a
+  data.tar.gz: f5754b9c79336f792cb2064baab958b7c27e62d13a6ae225a9fe5cde286d773e9427251ccd7b44afa7d258e517a5838af5ad6fdff3c63a0b6bf21b8cba08c75f

data/lib/html_proofer/attribute/url.rb

@@ -3,13 +3,16 @@
 module HTMLProofer
   class Attribute
     class Url < HTMLProofer::Attribute
-      attr_reader :url, :size
+      attr_reader :url, :size, :source, :filename
 
       REMOTE_SCHEMES = ["http", "https"].freeze
 
-      def initialize(runner, link_attribute, base_url: nil, extract_size: false)
+      def initialize(runner, link_attribute, base_url: nil, source: nil, filename: nil, extract_size: false)
         super
 
+        @source = source
+        @filename = filename
+
         if @raw_attribute.nil?
           @url = nil
         else
@@ -49,7 +52,8 @@ module HTMLProofer
 
       def ignore?
         return true if /^javascript:/.match?(@url)
-        return true if ignores_pattern?(@runner.options[:ignore_urls])
+
+        true if ignores_pattern?(@runner.options[:ignore_urls])
       end
 
       def valid?
@@ -115,9 +119,30 @@ module HTMLProofer
       def exists?
         return true if base64?
 
-        return @runner.checked_paths[absolute_path] if @runner.checked_paths.key?(absolute_path)
+        !resolved_path.nil?
+      end
+
+      def resolved_path
+        path_to_resolve = absolute_path
 
-        @runner.checked_paths[absolute_path] = File.exist?(absolute_path)
+        return @runner.resolved_paths[path_to_resolve] if @runner.resolved_paths.key?(path_to_resolve)
+
+        # extensionless URLs
+        path_with_extension = "#{path_to_resolve}#{@runner.options[:assume_extension]}"
+        resolved = if @runner.options[:assume_extension] && File.file?(path_with_extension)
+          path_with_extension # existence checked implicitly by File.file?
+        # implicit index support
+        elsif File.directory?(path_to_resolve) && !unslashed_directory?(path_to_resolve)
+          @runner.options[:directory_index_files]
+            .map { |dif| File.join(path_to_resolve, dif) }
+            .find { |path_with_index| File.file?(path_with_index) }
+        # explicit file or directory
+        elsif File.exist?(path_to_resolve)
+          path_to_resolve
+        end
+        @runner.resolved_paths[path_to_resolve] = resolved
+
+        resolved
       end
 
       def base64?
@@ -125,49 +150,31 @@ module HTMLProofer
       end
 
       def absolute_path
-        path = file_path || @runner.current_filename
+        path = full_path || @filename
 
         File.expand_path(path, Dir.pwd)
       end
 
-      def file_path
+      def full_path
         return if path.nil? || path.empty?
 
-        path_dot_ext = ""
-
-        path_dot_ext = path + @runner.options[:assume_extension] unless blank?(@runner.options[:assume_extension])
-
         base = if absolute_path?(path) # path relative to root
-          # either overwrite with root_dir; or, if source is directory, use that; or, just get the current file's dirname
-          @runner.options[:root_dir] || (File.directory?(@runner.current_source) ? @runner.current_source : File.dirname(@runner.current_source))
-        # relative links, path is a file
-        elsif File.exist?(File.expand_path(path,
-          @runner.current_source)) || File.exist?(File.expand_path(path_dot_ext, @runner.current_source))
-          File.dirname(@runner.current_filename)
-        # relative links in nested dir, path is a file
-        elsif File.exist?(File.join(File.dirname(@runner.current_filename),
-          path)) || File.exist?(File.join(File.dirname(@runner.current_filename), path_dot_ext))
-          File.dirname(@runner.current_filename)
-        # relative link, path is a directory
+          # either overwrite with root_dir; or, if source is directory, use that; or, just get the source file's dirname
+          @runner.options[:root_dir] || (File.directory?(@source) ? @source : File.dirname(@source))
         else
-          @runner.current_filename
-        end
-
-        file = File.join(base, path)
-
-        if @runner.options[:assume_extension] && File.file?("#{file}#{@runner.options[:assume_extension]}")
-          file = "#{file}#{@runner.options[:assume_extension]}"
-        elsif File.directory?(file) && !unslashed_directory?(file) # implicit index support
-          file = File.join(file, @runner.options[:directory_index_file])
+          # path relative to the file where the link is defined
+          File.dirname(@filename)
         end
 
-        file
+        File.join(base, path)
       end
 
       def unslashed_directory?(file)
         return false unless File.directory?(file)
 
-        !file.end_with?(File::SEPARATOR) && !follow_location?
+        # the trailing slash must be read off the URL, not off `file`: the latter
+        # is produced by File.expand_path, which strips trailing separators
+        !path.to_s.end_with?("/") && !follow_location?
       end
 
       def follow_location?
@@ -213,15 +220,28 @@ module HTMLProofer
         url.start_with?("?")
       end
 
-      def sans_hash
+      def without_hash
         @url.to_s.sub(/##{hash}/, "")
       end
 
-      # catch any obvious issues, like strings in port numbers
+      # catch any obvious issues
       private def clean_url!
-        return if @url =~ /^([!#{Regexp.last_match(0)}-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/
-
-        @url = Addressable::URI.parse(@url).normalize.to_s
+        parsed_url = Addressable::URI.parse(@url)
+        url = if parsed_url.scheme.nil?
+          parsed_url
+        else
+          parsed_url.normalize
+        end.to_s
+
+        # normalize strips this off, which causes issues with cache
+        @url = if @url.end_with?("/") && !url.end_with?("/")
+          "#{url}/"
+        elsif !@url.end_with?("/") && url.end_with?("/")
+          url.chop
+        else
+          url
+        end
+      rescue Addressable::URI::InvalidURIError # -- error will be reported at check time
       end
 
       private def swap_urls!

data/lib/html_proofer/cache.rb

@@ -34,14 +34,14 @@ module HTMLProofer
         setup_cache!(options)
 
         @external_timeframe = parsed_timeframe(options[:timeframe][:external])
-        define_singleton_method(:external_enabled?) { !@external_timeframe.nil? }
+        define_singleton_method(:external_enabled?) { !@external_timeframe.nil? } # rubocop:disable ThreadSafety/ClassInstanceVariable
         @internal_timeframe = parsed_timeframe(options[:timeframe][:internal])
-        define_singleton_method(:internal_enabled?) { !@internal_timeframe.nil? }
+        define_singleton_method(:internal_enabled?) { !@internal_timeframe.nil? } # rubocop:disable ThreadSafety/ClassInstanceVariable
       end
     end
 
     def parsed_timeframe(timeframe)
-      return nil if timeframe.nil?
+      return if timeframe.nil?
 
       time, date = timeframe.match(/(\d+)(\D)/).captures
       time = time.to_i
@@ -71,8 +71,10 @@ module HTMLProofer
       return unless external_enabled?
 
       clean_url = cleaned_url(url)
+      # Filter out non-serializable element from metadata
+      cleaned_filenames = filenames.map { |f| f.except(:element) }
       @cache_log[:external][clean_url] =
-        { time: @cache_time.to_s, found: found, status_code: status_code, message: msg, metadata: filenames }
+        { time: @cache_time.to_s, found: found, status_code: status_code, message: msg, metadata: cleaned_filenames }
     end
 
     def detect_url_changes(urls_detected, type)
@@ -93,8 +95,10 @@ module HTMLProofer
       # if there are no urls, bail
       return {} if urls_detected.empty?
 
-      urls_detected = urls_detected.transform_keys do |url|
-        cleaned_url(url)
+      if type == :external
+        urls_detected = urls_detected.transform_keys do |url|
+          cleaned_url(url)
+        end
       end
 
       urls_to_check = detect_url_changes(urls_detected, type)
@@ -184,7 +188,9 @@ module HTMLProofer
         hsh[url] = metadata_additions
         # remove from the cache the detected metadata additions as they correspond to failures to be rechecked
         # (this works assuming the detected url metadata have "found" set to false)
-        @cache_log[:internal][url][:metadata] = cache_metadata.difference(metadata_additions)
+        # Compare without the :element key since cached metadata doesn't have it
+        metadata_additions_for_diff = metadata_additions.map { |m| m.except(:element) }
+        @cache_log[:internal][url][:metadata] = cache_metadata.difference(metadata_additions_for_diff)
       end
     end
 
@@ -250,7 +256,7 @@ module HTMLProofer
     SECONDS_PER_HOUR   = 3600
     SECONDS_PER_DAY    = 86400
     SECONDS_PER_WEEK   = 604800
-    SECONDS_PER_MONTH  = 2629746  # 1/12 of a gregorian year
+    SECONDS_PER_MONTH  = 2629746 # 1/12 of a gregorian year
 
     private def time_ago(measurement, unit)
       case unit
@@ -267,7 +273,8 @@ module HTMLProofer
 
     private def url_matches_type?(url, type)
       return true if type == :internal && url !~ URI_REGEXP
-      return true if type == :external && url =~ URI_REGEXP
+
+      true if type == :external && url =~ URI_REGEXP
     end
 
     private def cleaned_url(url)

data/lib/html_proofer/check/favicon.rb

@@ -17,13 +17,17 @@ module HTMLProofer
 
         if found
           if @favicon.url.protocol_relative?
-            add_failure("favicon link #{@favicon.url} is a protocol-relative URL, use explicit https:// instead",
-              line: @favicon.line, content: @favicon.content)
+            add_failure(
+              "favicon link #{@favicon.url} is a protocol-relative URL, use explicit https:// instead",
+              element: @favicon,
+            )
           elsif @favicon.url.remote?
-            add_to_external_urls(@favicon.url, @favicon.line)
+            add_to_external_urls(@favicon.url, @favicon)
           elsif !@favicon.url.exists?
-            add_failure("internal favicon #{@favicon.url.raw_attribute} does not exist", line: @favicon.line,
-              content: @favicon.content)
+            add_failure(
+              "internal favicon #{@favicon.url.raw_attribute} does not exist",
+              element: @favicon,
+            )
           end
         else
           add_failure("no favicon provided")

data/lib/html_proofer/check/images.rb

@@ -12,48 +12,62 @@ module HTMLProofer
           next if @img.ignore?
 
           # screenshot filenames should return because of terrible names
-          add_failure("image has a terrible filename (#{@img.url.raw_attribute})", line: @img.line,
-            content: @img.content) if terrible_filename?
+          add_failure(
+            "image has a terrible filename (#{@img.url.raw_attribute})",
+            element: @img,
+          ) if terrible_filename?
 
           # does the image exist?
           if missing_src?
-            add_failure("image has no src or srcset attribute", line: @img.line, content: @img.content)
-          elsif @img.url.protocol_relative?
-            add_failure("image link #{@img.url} is a protocol-relative URL, use explicit https:// instead",
-              line: @img.line, content: @img.content)
-          elsif @img.url.remote?
-            add_to_external_urls(@img.url, @img.line)
-          elsif !@img.url.exists? && !@img.multiple_srcsets? && !@img.multiple_sizes?
-            add_failure("internal image #{@img.url.raw_attribute} does not exist", line: @img.line,
-              content: @img.content)
+            add_failure("image has no src or srcset attribute", element: @img)
           elsif @img.multiple_srcsets? || @img.multiple_sizes?
             @img.srcsets_wo_sizes.each do |srcset|
-              srcset_url = HTMLProofer::Attribute::Url.new(@runner, srcset, base_url: @img.base_url, extract_size: true)
+              srcset_url = HTMLProofer::Attribute::Url.new(@runner, srcset, base_url: @img.base_url, source: @img.url.source, filename: @img.url.filename, extract_size: true)
 
               if srcset_url.protocol_relative?
-                add_failure("image link #{srcset_url.url} is a protocol-relative URL, use explicit https:// instead",
-                  line: @img.line, content: @img.content)
+                add_failure(
+                  "image link #{srcset_url.url} is a protocol-relative URL, use explicit https:// instead",
+                  element: @img,
+                )
               elsif srcset_url.remote?
-                add_to_external_urls(srcset_url.url, @img.line)
+                add_to_external_urls(srcset_url.url, @img)
               elsif !srcset_url.exists?
-                add_failure("internal image #{srcset} does not exist", line: @img.line, content: @img.content)
+                add_failure("internal image #{srcset} does not exist", element: @img)
               end
             end
+          elsif @img.url.protocol_relative?
+            add_failure(
+              "image link #{@img.url} is a protocol-relative URL, use explicit https:// instead",
+              element: @img,
+            )
+          elsif @img.url.remote?
+            add_to_external_urls(@img.url, @img)
+          elsif !@img.url.exists? && !@img.multiple_srcsets? && !@img.multiple_sizes?
+            add_failure(
+              "internal image #{@img.url.raw_attribute} does not exist",
+              element: @img,
+            )
           end
 
           # if this is an img element, check that the alt attribute is present
           if @img.img_tag? && !ignore_element?
             if missing_alt_tag? && !ignore_missing_alt?
-              add_failure("image #{@img.url.raw_attribute} does not have an alt attribute", line: @img.line,
-                content: @img.content)
+              add_failure(
+                "image #{@img.url.raw_attribute} does not have an alt attribute",
+                element: @img,
+              )
             elsif (empty_alt_tag? || alt_all_spaces?) && !ignore_empty_alt?
-              add_failure("image #{@img.url.raw_attribute} has an alt attribute, but no content", line: @img.line,
-                content: @img.content)
+              add_failure(
+                "image #{@img.url.raw_attribute} has an alt attribute, but no content",
+                element: @img,
+              )
             end
           end
 
-          add_failure("image #{@img.url.raw_attribute} uses the http scheme", line: @img.line,
-            content: @img.content) if @runner.enforce_https? && @img.url.http?
+          add_failure(
+            "image #{@img.url.raw_attribute} uses the http scheme",
+            element: @img,
+          ) if @runner.enforce_https? && @img.url.http?
         end
 
         external_urls

data/lib/html_proofer/check/links.rb

@@ -10,7 +10,7 @@ module HTMLProofer
           next if @link.ignore?
 
           if !allow_hash_href? && @link.node["href"] == "#"
-            add_failure("linking to internal hash #, which points to nowhere", line: @link.line, content: @link.content)
+            add_failure("linking to internal hash #, which points to nowhere", element: @link)
             next
           end
 
@@ -18,19 +18,21 @@ module HTMLProofer
           if blank?(@link.url.raw_attribute)
             next if allow_missing_href?
 
-            add_failure("'#{@link.node.name}' tag is missing a reference", line: @link.line, content: @link.content)
+            add_failure("'#{@link.node.name}' tag is missing a reference", element: @link)
             next
           end
 
           # is it even a valid URL?
           unless @link.url.valid?
-            add_failure("#{@link.href} is an invalid URL", line: @link.line, content: @link.content)
+            add_failure("#{@link.href} is an invalid URL", element: @link)
             next
           end
 
           if @link.url.protocol_relative?
-            add_failure("#{@link.url} is a protocol-relative URL, use explicit https:// instead",
-              line: @link.line, content: @link.content)
+            add_failure(
+              "#{@link.url} is a protocol-relative URL, use explicit https:// instead",
+              element: @link,
+            )
             next
           end
 
@@ -47,20 +49,22 @@ module HTMLProofer
             next if @link.node["rel"] == "dns-prefetch"
 
             unless @link.url.path?
-              add_failure("#{@link.url.raw_attribute} is an invalid URL", line: @link.line, content: @link.content)
+              add_failure("#{@link.url.raw_attribute} is an invalid URL", element: @link)
               next
             end
 
-            add_to_external_urls(@link.url, @link.line)
+            add_to_external_urls(@link.url, @link)
           elsif @link.url.internal?
             # does the local directory have a trailing slash?
             if @link.url.unslashed_directory?(@link.url.absolute_path)
-              add_failure("internally linking to a directory #{@link.url.raw_attribute} without trailing slash",
-                line: @link.line, content: @link.content)
+              add_failure(
+                "internally linking to a directory #{@link.url.raw_attribute} without trailing slash",
+                element: @link,
+              )
               next
             end
 
-            add_to_internal_urls(@link.url, @link.line)
+            add_to_internal_urls(@link.url, @link)
           end
         end
       end
@@ -82,23 +86,30 @@ module HTMLProofer
         when "http"
           return unless @runner.options[:enforce_https]
 
-          add_failure("#{@link.url.raw_attribute} is not an HTTPS link", line: @link.line, content: @link.content)
+          add_failure("#{@link.url.raw_attribute} is not an HTTPS link", element: @link)
         end
       end
 
       def handle_mailto
         if @link.url.path.empty?
-          add_failure("#{@link.url.raw_attribute} contains no email address", line: @link.line,
-            content: @link.content) unless ignore_empty_mailto?
-        elsif !/#{URI::MailTo::EMAIL_REGEXP}/o.match?(@link.url.path)
-          add_failure("#{@link.url.raw_attribute} contains an invalid email address", line: @link.line,
-            content: @link.content)
+          add_failure(
+            "#{@link.url.raw_attribute} contains no email address",
+            element: @link,
+          ) unless ignore_empty_mailto?
+        # eg., if any do not match a valid URL
+        elsif @link.url.path.split(",").any? { |email| !/#{URI::MailTo::EMAIL_REGEXP}/o.match?(email) }
+          add_failure(
+            "#{@link.url.raw_attribute} contains an invalid email address",
+            element: @link,
+          )
         end
       end
 
       def handle_tel
-        add_failure("#{@link.url.raw_attribute} contains no phone number", line: @link.line,
-          content: @link.content) if @link.url.path.empty?
+        add_failure(
+          "#{@link.url.raw_attribute} contains no phone number",
+          element: @link,
+        ) if @link.url.path.empty?
       end
 
       def ignore_empty_mailto?
@@ -113,13 +124,17 @@ module HTMLProofer
         return unless SRI_REL_TYPES.include?(@link.node["rel"])
 
         if blank?(@link.node["integrity"]) && blank?(@link.node["crossorigin"])
-          add_failure("SRI and CORS not provided in: #{@link.url.raw_attribute}", line: @link.line,
-            content: @link.content)
+          add_failure(
+            "SRI and CORS not provided in: #{@link.url.raw_attribute}",
+            element: @link,
+          )
         elsif blank?(@link.node["integrity"])
-          add_failure("Integrity is missing in: #{@link.url.raw_attribute}", line: @link.line, content: @link.content)
+          add_failure("Integrity is missing in: #{@link.url.raw_attribute}", element: @link)
         elsif blank?(@link.node["crossorigin"])
-          add_failure("CORS not provided for external resource in: #{@link.link.url.raw_attribute}", line: @link.line,
-            content: @link.content)
+          add_failure(
+            "CORS not provided for external resource in: #{@link.link.url.raw_attribute}",
+            element: @link,
+          )
         end
       end
 

data/lib/html_proofer/check/open_graph.rb

@@ -11,19 +11,23 @@ module HTMLProofer
 
           # does the open_graph exist?
           if missing_content?
-            add_failure("open graph has no content attribute", line: @open_graph.line, content: @open_graph.content)
+            add_failure("open graph has no content attribute", element: @open_graph)
           elsif empty_content?
-            add_failure("open graph content attribute is empty", line: @open_graph.line, content: @open_graph.content)
+            add_failure("open graph content attribute is empty", element: @open_graph)
           elsif !@open_graph.url.valid?
-            add_failure("#{@open_graph.src} is an invalid URL", line: @open_graph.line)
+            add_failure("#{@open_graph.src} is an invalid URL", element: @open_graph)
           elsif @open_graph.url.protocol_relative?
-            add_failure("open graph link #{@open_graph.url} is a protocol-relative URL, use explicit https:// instead",
-              line: @open_graph.line, content: @open_graph.content)
+            add_failure(
+              "open graph link #{@open_graph.url} is a protocol-relative URL, use explicit https:// instead",
+              element: @open_graph,
+            )
           elsif @open_graph.url.remote?
-            add_to_external_urls(@open_graph.url, @open_graph.line)
+            add_to_external_urls(@open_graph.url, @open_graph)
           else
-            add_failure("internal open graph #{@open_graph.url.raw_attribute} does not exist", line: @open_graph.line,
-              content: @open_graph.content) unless @open_graph.url.exists?
+            add_failure(
+              "internal open graph #{@open_graph.url.raw_attribute} does not exist",
+              element: @open_graph,
+            ) unless @open_graph.url.exists?
           end
         end
 

data/lib/html_proofer/check/scripts.rb

@@ -12,16 +12,20 @@ module HTMLProofer
 
           # does the script exist?
           if missing_src?
-            add_failure("script is empty and has no src attribute", line: @script.line, content: @script.content)
+            add_failure("script is empty and has no src attribute", element: @script)
           elsif @script.url.protocol_relative?
-            add_failure("script link #{@script.url} is a protocol-relative URL, use explicit https:// instead",
-              line: @script.line, content: @script.content)
+            add_failure(
+              "script link #{@script.url} is a protocol-relative URL, use explicit https:// instead",
+              element: @script,
+            )
           elsif @script.url.remote?
-            add_to_external_urls(@script.url, @script.line)
+            add_to_external_urls(@script.url, @script)
             check_sri if @runner.check_sri?
           elsif !@script.url.exists?
-            add_failure("internal script reference #{@script.src} does not exist", line: @script.line,
-              content: @script.content)
+            add_failure(
+              "internal script reference #{@script.src} does not exist",
+              element: @script,
+            )
           end
         end
 
@@ -34,14 +38,20 @@ module HTMLProofer
 
       def check_sri
         if blank?(@script.node["integrity"]) && blank?(@script.node["crossorigin"])
-          add_failure("SRI and CORS not provided in: #{@script.url.raw_attribute}", line: @script.line,
-            content: @script.content)
+          add_failure(
+            "SRI and CORS not provided in: #{@script.url.raw_attribute}",
+            element: @script,
+          )
         elsif blank?(@script.node["integrity"])
-          add_failure("Integrity is missing in: #{@script.url.raw_attribute}", line: @script.line,
-            content: @script.content)
+          add_failure(
+            "Integrity is missing in: #{@script.url.raw_attribute}",
+            element: @script,
+          )
         elsif blank?(@script.node["crossorigin"])
-          add_failure("CORS not provided for external resource in: #{@script.url.raw_attribute}", line: @script.line,
-            content: @script.content)
+          add_failure(
+            "CORS not provided for external resource in: #{@script.url.raw_attribute}",
+            element: @script,
+          )
         end
       end
     end

data/lib/html_proofer/check.rb

@@ -24,36 +24,44 @@ module HTMLProofer
       raise NotImplementedError, "HTMLProofer::Check subclasses must implement #run"
     end
 
-    def add_failure(description, line: nil, status: nil, content: nil)
-      @failures << Failure.new(@runner.current_filename, short_name, description, line: line, status: status,
-        content: content)
+    def add_failure(description, element: nil, line: nil, status: nil, content: nil)
+      @failures << Failure.new(
+        @runner.current_filename,
+        short_name,
+        description,
+        line: element.nil? ? line : element.line,
+        status: status,
+        content: element.nil? ? content : element.content,
+        element: element,
+      )
     end
 
     def short_name
       self.class.name.split("::").last
     end
 
-    def add_to_internal_urls(url, line)
+    def add_to_internal_urls(url, element)
       url_string = url.raw_attribute
 
       @internal_urls[url_string] = [] if @internal_urls[url_string].nil?
 
       metadata = {
-        source: @runner.current_source,
-        filename: @runner.current_filename,
-        line: line,
+        source: url.source,
+        filename: url.filename,
+        line: element.line,
         base_url: base_url,
         found: false,
+        element: element,
       }
       @internal_urls[url_string] << metadata
     end
 
-    def add_to_external_urls(url, line)
+    def add_to_external_urls(url, element)
       url_string = url.to_s
 
       @external_urls[url_string] = [] if @external_urls[url_string].nil?
 
-      @external_urls[url_string] << { filename: @runner.current_filename, line: line }
+      @external_urls[url_string] << { filename: url.filename, line: element.line, element: element }
     end
 
     class << self