html-proofer 5.0.8 → 5.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2c4f6e223ea64d009b2dc422066610376bfff66fa8b6da09b485ce72e5538c7
-  data.tar.gz: e9f2d8f81a4f21e5bb76bbaaedd7e8a95b95cf6439938e62c364ad92392af518
+  metadata.gz: d9ed4a509a2d120a3aff5ad4809f6b91feff3842dceb371015aca5fd08e69bb2
+  data.tar.gz: 0db88e877a8fc19022d4fd1f382e4d38bfeead1540c42817e33799ccf2527bc7
 SHA512:
-  metadata.gz: 70fa1c406f6bf212176f2e2f257c98e88615635463d584e01e31a8be2647b096e8ebfb75549058a9626185f8f45989e446e28d9977a4d14189d074a4d6c75b9c
-  data.tar.gz: 31ea3bb4397972ade2731a442ad4cae5a435ad13f598777b2890c179f54a2f54f7d2102fb46ac805fc39bb0b8e7efe8805c61cf1fc63d8f897158caa732a6bde
+  metadata.gz: 6c888e7975c91eb41124057eba57fb3bdd9f8d82f38be6958c82649458526d7a41cb9aac8d4221678c273db419708cb2abfce2ce0be7396acd2b97295e938844
+  data.tar.gz: 61acc2e9c73ba8ca51abca84e21524e145a3f98f8d0d8db4c9683d13407610ea13dfe04342cc861ca0109cd8f9ac1fa24300bb0df684a198787ee5a2d40c8cde

data/lib/html_proofer/attribute/url.rb

@@ -52,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?
@@ -220,11 +221,24 @@ module HTMLProofer
         @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 # rubocop:disable Lint/SuppressedException; error will be reported at check time
       end
 
       private def swap_urls!

data/lib/html_proofer/cache.rb

@@ -41,7 +41,7 @@ module HTMLProofer
     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
@@ -252,7 +252,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
@@ -269,7 +269,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/configuration.rb

@@ -233,8 +233,8 @@ module HTMLProofer
       arg.split(",").each_with_object({}) do |s, hsh|
         split = s.split(/(?<!\\):/, 2)
 
-        re = split[0].gsub(/\\:/, ":")
-        string = split[1].gsub(/\\:/, ":")
+        re = split[0].gsub("\\:", ":")
+        string = split[1].gsub("\\:", ":")
         hsh[Regexp.new(re)] = string
       end
     end

data/lib/html_proofer/element.rb

@@ -27,7 +27,7 @@ module HTMLProofer
     end
 
     def meta_content
-      return nil unless meta_tag?
+      return unless meta_tag?
 
       @node["content"]
     end
@@ -37,7 +37,7 @@ module HTMLProofer
     end
 
     def src
-      return nil if !img_tag? && !script_tag? && !source_tag?
+      return if !img_tag? && !script_tag? && !source_tag?
 
       @node["src"]
     end
@@ -51,7 +51,7 @@ module HTMLProofer
     end
 
     def srcset
-      return nil if !img_tag? && !source_tag?
+      return if !img_tag? && !source_tag?
 
       @node["srcset"]
     end
@@ -61,7 +61,7 @@ module HTMLProofer
     end
 
     def href
-      return nil if !a_tag? && !link_tag?
+      return if !a_tag? && !link_tag?
 
       @node["href"]
     end
@@ -96,7 +96,7 @@ module HTMLProofer
     IMAGE_CANDIDATE_REGEX = /\s*([^,]\S*[^,](?:\s+[^,]+)?)\s*(?:,|$)/
 
     def srcsets
-      return nil if blank?(srcset)
+      return if blank?(srcset)
 
       srcset.split(IMAGE_CANDIDATE_REGEX).select.with_index do |_part, idx|
         idx.odd?
@@ -112,7 +112,7 @@ module HTMLProofer
     end
 
     def srcsets_wo_sizes
-      return nil if blank?(srcsets)
+      return if blank?(srcsets)
 
       srcsets.map do |srcset|
         srcset.split(" ").first
@@ -133,7 +133,7 @@ module HTMLProofer
 
       attrs = @runner.options[:swap_attributes][@node.name]
 
-      return true unless blank?(attrs)
+      true unless blank?(attrs)
     end
 
     private def swap_attributes!

data/lib/html_proofer/log.rb

@@ -41,8 +41,8 @@ module HTMLProofer
         :red
       end
 
-      if (STDOUT_LEVELS.include?(level) && $stdout.isatty) ||
-          (STDERR_LEVELS.include?(level) && $stderr.isatty)
+      if STDOUT_LEVELS.include?(level) ||
+          STDERR_LEVELS.include?(level)
         Rainbow(message).send(color)
       else
         message

data/lib/html_proofer/runner.rb

@@ -236,7 +236,7 @@ module HTMLProofer
     end
 
     private def load_cache(type)
-      ivar = instance_variable_get("@#{type}_urls")
+      ivar = instance_variable_get(:"@#{type}_urls")
 
       existing_urls_count = @cache.size(type)
       cache_text = pluralize(existing_urls_count, "#{type} link", "#{type} links")
@@ -249,7 +249,7 @@ module HTMLProofer
 
     private def format_checks_list(checks)
       checks.map do |check|
-        check.sub(/HTMLProofer::Check::/, "")
+        check.sub("HTMLProofer::Check::", "")
       end.sort.join(", ")
     end
   end

data/lib/html_proofer/url_validator/internal.rb

@@ -120,9 +120,7 @@ module HTMLProofer
         decoded_href_hash = Addressable::URI.unescape(href_hash)
         fragment_ids = [href_hash, decoded_href_hash]
         # https://www.w3.org/TR/html5/single-page.html#scroll-to-fragid
-        return true if fragment_ids.include?("top")
-
-        nil
+        true if fragment_ids.include?("top")
       end
 
       private def hash_exists_in_html?(href_hash, html)

data/lib/html_proofer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTMLProofer
-  VERSION = "5.0.8"
+  VERSION = "5.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-proofer
 version: !ruby/object:Gem::Version
-  version: 5.0.8
+  version: 5.0.9
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-06 00:00:00.000000000 Z
+date: 2024-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: A set of tests to validate your HTML output. These tests check if your image