html-proofer 3.18.1 → 3.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60d8c8a9a9d38a05b628f3b6a852e27081ee85b7671a41bf51457f4d5f05440c
-  data.tar.gz: 8fb0e24b312fdae8eb37c98de0d6498035fd20e46dd71456842916d59daf642b
+  metadata.gz: e2d6deb85601ff3f5e5df02999f1b55f29231e5658f1d4fa9986c002b3cc0263
+  data.tar.gz: e20a007144a866b41b97eb36a964ca1372d693ade77acc69a9c9e706b353c8ef
 SHA512:
-  metadata.gz: 93dc24aec3ae4e94a4352751a41237aedf147493364cb8b40de7c25d8b9e2780969f8159d95f176fef539fe0560b3c28ae229432efdccf5dfeb878d7b765841f
-  data.tar.gz: caefd93da740afefb6f78c1c1e767bfaddeba2f1b7de248ea426790283a1d97785f75b33123c89d488ba36cdd3d850185400c011830a9f4e5eecd45b52ba6a2a
+  metadata.gz: c51154450eb20c04c0b7038effb12ab8d258457ea5560421b5a2a0739342504afebb8fd092fe4378838a076636ff2665eb691f513b8b34b49af2e89ffba988c2
+  data.tar.gz: fcb7bf492588fabc991caf1f779fca14a7b553d3ce00dbf55ba24aebf3c39f7613af6a408d94c3a3faaeb21dceb8265ece91ca9bf4320aee7d4f3dca133ba4de

data/lib/html-proofer/cache.rb

@@ -109,8 +109,13 @@ module HTMLProofer
       additions
     end
 
+    # TODO: Garbage performance--both the external and internal
+    # caches need access to this file. Write a proper versioned
+    # schema in the future
     def write
-      File.write(cache_file, @cache_log.to_json)
+      file = {}
+      file = JSON.parse(File.read(cache_file)) if File.exist?(cache_file)
+      File.write(cache_file, file.merge(@cache_log).to_json)
     end
 
     def load?

data/lib/html-proofer/check/links.rb

@@ -51,14 +51,16 @@ class LinkCheck < ::HTMLProofer::Check
         # curl/Typheous inaccurately return 404s for some links. cc https://git.io/vyCFx
         next if @link.respond_to?(:rel) && @link.rel == 'dns-prefetch'
 
+        unless @link.path?
+          add_issue("#{@link.href} is an invalid URL", line: line, content: content)
+          next
+        end
+
         add_to_external_urls(@link.href || @link.src)
         next
       elsif @link.internal?
-        if @link.exists?
-          add_to_internal_urls(@link.href, InternalLink.new(@link, @path, line, content))
-        else
-          add_issue("internally linking to #{@link.href}, which does not exist", line: line, content: content)
-        end
+        add_to_internal_urls(@link.href, InternalLink.new(@link, @path, line, content))
+        add_issue("internally linking to #{@link.href}, which does not exist", line: line, content: content) if !@link.exists? && !@link.hash
       end
     end
 
@@ -72,10 +74,10 @@ class LinkCheck < ::HTMLProofer::Check
       return false
     end
 
-    # verify the target hash
-    return handle_hash(link, path, line, content) if link.hash
+    return true unless link.hash
 
-    true
+    # verify the target hash
+    handle_hash(link, path, line, content)
   end
 
   def check_schemes(link, line, content)

data/lib/html-proofer/element.rb

@@ -24,7 +24,7 @@ module HTMLProofer
         raise e
       end
 
-      @aria_hidden = defined?(@aria_hidden) && @aria_hidden == 'true' ? true : false
+      @aria_hidden = defined?(@aria_hidden) && @aria_hidden == 'true'
 
       @data_proofer_ignore = defined?(@data_proofer_ignore)
 
@@ -74,6 +74,10 @@ module HTMLProofer
       !parts.nil?
     end
 
+    def path?
+      !parts.host.nil? && !parts.path.nil?
+    end
+
     def parts
       @parts ||= Addressable::URI.parse url
     rescue URI::Error, Addressable::URI::InvalidURIError
@@ -216,6 +220,8 @@ module HTMLProofer
     end
 
     def ignores_pattern_check(links)
+      return false unless links.is_a?(Array)
+
       links.each do |ignore|
         case ignore
         when String

data/lib/html-proofer/middleware.rb

@@ -22,7 +22,7 @@ module HTMLProofer
         allow_hash_href: true,
         check_external_hash: true,
         check_html: true,
-        url_ignore: [/.*/], # Don't try to check if local files exist
+        url_ignore: [%r{^/}], # Don't try to check if local files exist
         validation: { report_eof_tags: true }
       }
     end

data/lib/html-proofer/runner.rb

@@ -63,7 +63,9 @@ module HTMLProofer
           swap(url, @options[:url_swap])
         end
       end
-      @external_urls = Hash[*@src.map { |s| [s, nil] }.flatten]
+      @external_urls = @src.each_with_object({}) do |url, hash|
+        hash[url] = nil
+      end
       validate_external_urls
     end
 
@@ -123,7 +125,7 @@ module HTMLProofer
           end
 
           external_urls = check.external_urls
-          external_urls = Hash[check.external_urls.map { |url, file| [swap(url, @options[:url_swap]), file] }] if @options[:url_swap]
+          external_urls = check.external_urls.map { |url, file| [swap(url, @options[:url_swap]), file] }.to_h if @options[:url_swap]
           result[:external_urls].merge!(external_urls)
           result[:failures].concat(check.issues)
         end
@@ -157,11 +159,12 @@ module HTMLProofer
         @cache.write
       else
         @internal_urls.values.flatten.each do |internal_url|
-          @internal_link_checks.check_internal_link(internal_url.link, internal_url.path, internal_url.line, internal_url.content)
+          result = @internal_link_checks.check_internal_link(internal_url.link, internal_url.path, internal_url.line, internal_url.content)
+          next if result
+
+          @failures.concat(@internal_link_checks.issues) unless @internal_link_checks.issues.length.zero?
         end
       end
-
-      @failures.concat(@internal_link_checks.issues) unless @internal_urls.length.zero?
     end
 
     def files

data/lib/html-proofer/url_validator.rb

@@ -85,7 +85,7 @@ module HTMLProofer
     # for HEAD. If we've decided to check for hashes, we must do a GET--HEAD is
     # not available as an option.
     def external_link_checker(external_urls)
-      external_urls = Hash[external_urls.sort]
+      external_urls = external_urls.sort.to_h
 
       count = external_urls.length
       check_text = pluralize(count, 'external link', 'external links')

data/lib/html-proofer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTMLProofer
-  VERSION = '3.18.1'
+  VERSION = '3.18.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-proofer
 version: !ruby/object:Gem::Version
-  version: 3.18.1
+  version: 3.18.6
 platform: ruby
 authors:
 - Garen Torikian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -285,9 +285,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 2.4.10
+  - - "<"
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="