html-proofer 3.17.1 → 3.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8be1f60d1495959b468c2cfad3a4d659a5817b934bb2011906540d296e2a062
-  data.tar.gz: 39ecb6a6899913c4745289443ff77cf1483d3578689fc616099bb00df90a4f16
+  metadata.gz: 60d8c8a9a9d38a05b628f3b6a852e27081ee85b7671a41bf51457f4d5f05440c
+  data.tar.gz: 8fb0e24b312fdae8eb37c98de0d6498035fd20e46dd71456842916d59daf642b
 SHA512:
-  metadata.gz: ce1749adb1022b2a3245396c28b990d4de6bfe368fb5944cddf81b48822f54dff8c744b847e65bcd4cb040f2e7f63a1cbdcccebda943380ab767ecbd96161c8a
-  data.tar.gz: 0ffc3e5095dbf40272113991b521a0909408a40715efb2119bfd8f4a310b62b6884fe2566beb198e873f781d6d0ebefed06a966a91a4772309c53835c66ce483
+  metadata.gz: 93dc24aec3ae4e94a4352751a41237aedf147493364cb8b40de7c25d8b9e2780969f8159d95f176fef539fe0560b3c28ae229432efdccf5dfeb878d7b765841f
+  data.tar.gz: caefd93da740afefb6f78c1c1e767bfaddeba2f1b7de248ea426790283a1d97785f75b33123c89d488ba36cdd3d850185400c011830a9f4e5eecd45b52ba6a2a

data/lib/html-proofer.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Naming/FileName
 # frozen_string_literal: true
 
 def require_all(path)
@@ -52,3 +53,4 @@ module HTMLProofer
     HTMLProofer::Runner.new(links, options)
   end
 end
+# rubocop:enable Naming/FileName

data/lib/html-proofer/check.rb

@@ -26,8 +26,8 @@ module HTMLProofer
       raise NotImplementedError, 'HTMLProofer::Check subclasses must implement #run'
     end
 
-    def add_issue(desc, line: nil, status: -1, content: nil)
-      @issues << Issue.new(@path, desc, line: line, status: status, content: content)
+    def add_issue(desc, line: nil, path: nil, status: -1, content: nil)
+      @issues << Issue.new(path || @path, desc, line: line, status: status, content: content)
       false
     end
 

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

@@ -7,7 +7,7 @@ class FaviconCheck < ::HTMLProofer::Check
       favicon = create_element(node)
       next if favicon.ignore?
 
-      found = true if favicon.rel.split(' ').last.eql? 'icon'
+      found = true if favicon.rel.split.last.eql? 'icon'
       break if found
     end
 

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

@@ -45,7 +45,7 @@ class LinkCheck < ::HTMLProofer::Check
       # intentionally here because we still want valid? & missing_href? to execute
       next if @link.non_http_remote?
 
-      if !@link.internal? && @link.remote?
+      if !@link.href&.start_with?('#') && !@link.internal? && @link.remote?
         check_sri(line, content) if @link.check_sri? && node.name == 'link'
         # we need to skip these for now; although the domain main be valid,
         # curl/Typheous inaccurately return 404s for some links. cc https://git.io/vyCFx
@@ -65,15 +65,15 @@ class LinkCheck < ::HTMLProofer::Check
     external_urls
   end
 
-  def check_internal_link(link, line, content)
+  def check_internal_link(link, path, line, content)
     # does the local directory have a trailing slash?
     if link.unslashed_directory?(link.absolute_path)
-      add_issue("internally linking to a directory #{link.absolute_path} without trailing slash", line: line, content: content)
+      add_issue("internally linking to a directory #{link.absolute_path} without trailing slash", path: path, line: line, content: content)
       return false
     end
 
     # verify the target hash
-    return handle_hash(link, line, content) if link.hash
+    return handle_hash(link, path, line, content) if link.hash
 
     true
   end
@@ -103,9 +103,9 @@ class LinkCheck < ::HTMLProofer::Check
     add_issue("#{link.href} contains no phone number", line: line, content: content) if link.path.empty?
   end
 
-  def handle_hash(link, line, content)
+  def handle_hash(link, path, line, content)
     if link.internal? && !hash_exists?(link.html, link.hash) # rubocop:disable Style/GuardClause
-      return add_issue("linking to internal hash ##{link.hash} that does not exist", line: line, content: content)
+      return add_issue("linking to internal hash ##{link.hash} that does not exist", path: path, line: line, content: content)
     elsif link.external?
       return external_link_check(link, line, content)
     end

data/lib/html-proofer/element.rb

@@ -181,7 +181,8 @@ module HTMLProofer
       path_dot_ext = path + @check.options[:extension] if @check.options[:assume_extension]
 
       base = if absolute_path?(path) # path relative to root
-               @check.options[:root_dir] || File.dirname(@check.src)
+               # either overwrite with root_dir; or, if source is directory, use that; or, just get the current file's dirname
+               @check.options[:root_dir] || (File.directory?(@check.src) ? @check.src : File.dirname(@check.src))
              elsif File.exist?(File.expand_path(path, @check.src)) || File.exist?(File.expand_path(path_dot_ext, @check.src)) # relative links, path is a file
                File.dirname(@check.path)
              elsif File.exist?(File.join(File.dirname(@check.path), path)) || File.exist?(File.join(File.dirname(@check.path), path_dot_ext)) # rubocop:disable Lint/DuplicateBranch; relative links in nested dir, path is a file
@@ -189,7 +190,9 @@ module HTMLProofer
              else # relative link, path is a directory
                @check.path
              end
+
       file = File.join(base, path)
+
       if @check.options[:assume_extension] && File.file?("#{file}#{@check.options[:extension]}")
         file = "#{file}#{@check.options[:extension]}"
       elsif File.directory?(file) && !unslashed_directory?(file) # implicit index support

data/lib/html-proofer/middleware.rb

@@ -60,7 +60,7 @@ module HTMLProofer
       body = []
       result.last.each { |e| body << e }
 
-      body = body.join('')
+      body = body.join
       begin
         html = body.lstrip
       rescue StandardError

data/lib/html-proofer/runner.rb

@@ -147,14 +147,17 @@ module HTMLProofer
         urls_to_check = load_internal_cache
 
         urls_to_check.each_pair do |url, internal_urls|
-          result = @internal_link_checks.check_internal_link(internal_urls.first.link, internal_urls.first.line, internal_urls.first.content)
+          # pulled from cache
+          internal_urls = @internal_urls[url] unless internal_urls.first.is_a?(LinkCheck::InternalLink)
+
+          result = @internal_link_checks.check_internal_link(internal_urls.first.link, internal_urls.first.path, internal_urls.first.line, internal_urls.first.content)
           code = result ? 200 : 404
           @cache.add(url, @internal_urls_to_paths[url].sort, code, '') # TODO: blank msg for now
         end
         @cache.write
       else
         @internal_urls.values.flatten.each do |internal_url|
-          @internal_link_checks.check_internal_link(internal_url.link, internal_url.line, internal_url.content)
+          @internal_link_checks.check_internal_link(internal_url.link, internal_url.path, internal_url.line, internal_url.content)
         end
       end
 
@@ -211,7 +214,8 @@ module HTMLProofer
       sorted_failures.sort_and_report
       count = @failures.length
       failure_text = pluralize(count, 'failure', 'failures')
-      raise @logger.colorize :fatal, "HTML-Proofer found #{failure_text}!"
+      @logger.log :fatal, "\nHTML-Proofer found #{failure_text}!"
+      exit 1
     end
 
     # Set before_request callback.

data/lib/html-proofer/url_validator.rb

@@ -120,7 +120,7 @@ module HTMLProofer
     def clean_url(href)
       # catch any obvious issues, like strings in port numbers
       parsed = Addressable::URI.parse(href)
-      if href =~ /^([!#{$&}-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/
+      if href =~ /^([!#{Regexp.last_match(0)}-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/
         href
       else
         parsed.normalize

data/lib/html-proofer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-proofer
 version: !ruby/object:Gem::Version
-  version: 3.17.1
+  version: 3.18.1
 platform: ruby
 authors:
 - Garen Torikian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -308,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A set of tests to validate your HTML output. These tests check if your image