html-proofer 3.17.0 → 3.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b5a47189e872130e01a2080e6e8ddb1f7f22520098deaf941960194d2338b2b
-  data.tar.gz: 3543c42860956427e8c828861f76e1c5cd984d79054c091c6e5f97e0352b3137
+  metadata.gz: f8be1f60d1495959b468c2cfad3a4d659a5817b934bb2011906540d296e2a062
+  data.tar.gz: 39ecb6a6899913c4745289443ff77cf1483d3578689fc616099bb00df90a4f16
 SHA512:
-  metadata.gz: 1defd1fb2ee651015231b0ed4d1407ed56e25a907e0602ee9e175b23f3b88938e020f438d2171ceea8d52bc58984901543c97184a3da13c9b08cdaf62200a4aa
-  data.tar.gz: 97eb6120db724822830398a85f14faa4415638e965d21aef0703991e7a14d335f32df65d72bb877be6f0706f24154deea3f08a6bbeb2cdf5d7c392d03ce2af23
+  metadata.gz: ce1749adb1022b2a3245396c28b990d4de6bfe368fb5944cddf81b48822f54dff8c744b847e65bcd4cb040f2e7f63a1cbdcccebda943380ab767ecbd96161c8a
+  data.tar.gz: 0ffc3e5095dbf40272113991b521a0909408a40715efb2119bfd8f4a310b62b6884fe2566beb198e873f781d6d0ebefed06a966a91a4772309c53835c66ce483

data/bin/htmlproofer

@@ -50,7 +50,7 @@ Mercenary.program(:htmlproofer) do |p|
   p.option 'typhoeus_config', '--typhoeus-config CONFIG', String, 'JSON-formatted string of Typhoeus config. Will override the html-proofer defaults.'
   p.option 'url_ignore', '--url-ignore link1,[link2,...]', Array, 'A comma-separated list of Strings or RegExps containing URLs that are safe to ignore. It affects all HTML attributes. Note that non-HTTP(S) URIs are always ignored'
   p.option 'url_swap', '--url-swap re:string,[re:string,...]', Array, 'A comma-separated list containing key-value pairs of `RegExp => String`. It transforms URLs that match `RegExp` into `String` via `gsub`. The escape sequences `\\:` should be used to produce literal `:`s.'
-  p.option 'root_dir', '--root-folder PATH', String, 'The absolute path to the directory serving your html-files. Used when running html-proofer on a file, rather than a directory.'
+  p.option 'root_dir', '--root-dir PATH', String, 'The absolute path to the directory serving your html-files.'
 
   p.action do |args, opts|
     args = ['.'] if args.empty?

data/lib/html-proofer/element.rb

@@ -169,6 +169,10 @@ module HTMLProofer
       url.start_with?('?')
     end
 
+    def absolute_path?(path)
+      path.start_with?('/')
+    end
+
     def file_path
       return if path.nil? || path.empty?
 
@@ -176,22 +180,16 @@ module HTMLProofer
 
       path_dot_ext = path + @check.options[:extension] if @check.options[:assume_extension]
 
-      if %r{^/}.match?(path) # path relative to root
-        if File.directory?(@check.src)
-          base = @check.src
-        else
-          root_dir = @check.options[:root_dir]
-          base = root_dir || File.dirname(@check.src)
-        end
-      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
-        base = 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
-        base = File.dirname @check.path
-      else # relative link, path is a directory
-        base = @check.path
-      end
-
-      file = File.join base, path
+      base = if absolute_path?(path) # path relative to root
+               @check.options[:root_dir] || 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
+               File.dirname(@check.path)
+             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
@@ -203,14 +201,15 @@ module HTMLProofer
 
     # checks if a file exists relative to the current pwd
     def exists?
-      return @checked_paths[absolute_path] if @checked_paths.key? absolute_path
+      return @checked_paths[absolute_path] if @checked_paths.key?(absolute_path)
 
-      @checked_paths[absolute_path] = File.exist? absolute_path
+      @checked_paths[absolute_path] = File.exist?(absolute_path)
     end
 
     def absolute_path
       path = file_path || @check.path
-      File.expand_path path, Dir.pwd
+
+      File.expand_path(path, Dir.pwd)
     end
 
     def ignores_pattern_check(links)

data/lib/html-proofer/runner.rb

@@ -226,7 +226,7 @@ module HTMLProofer
     # @return [ Array<Block> ] All before_request blocks.
     def before_request(&block)
       @before_request ||= []
-      @before_request << block if block_given?
+      @before_request << block if block
       @before_request
     end
 

data/lib/html-proofer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-proofer
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.17.1
 platform: ruby
 authors:
 - Garen Torikian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2020-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable