html-proofer 4.0.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6e8293984dde05cd406326b21fa93a638b0a972efdab95f59adfe606e8be538
-  data.tar.gz: b9323e2c6d7cf91a08f45a7b9ecb77b826c02b2ad2b6bf74e6951701b41c3bdb
+  metadata.gz: 916656620e369529ae71be63c4316ba627afcf97d2f60b4ce963e375f772a7b8
+  data.tar.gz: 83e751f1ec8bf453c2612cf1d34ef24e3de1d7620d740be1f8c392627f39cc85
 SHA512:
-  metadata.gz: 6d962362e0abc03b2deb15da0b06f2e42857756b045db568c959263346957b628dee73b719de2ed9f24a03762e2ae97e2ff208ea8f216c6d0323bca77864d43d
-  data.tar.gz: 2bb9ca1d81e1a088344c8df0c513d2c0e96187cf23b7895def81fba4ac1820f56a0099a4dd2caa861df6ecd75afd4388e4a5b37e18308c4641300ab07f704d15
+  metadata.gz: c396512e2262ba0bbeab69ee602c42c522cdec4f7b9036e81808011e4b6d47e06188baeaa86524361166af90ce1751b3f08e4075b437b28eab8c4c6bec065630
+  data.tar.gz: e2e660641cca01f1501b69dda405808624ec03b4ebaa0a9c12618f82e77314f94adbc459ec343898f548be5676f763d11d69bf5cbbebf154148490e49b304f83

data/bin/htmlproofer

@@ -21,10 +21,11 @@ Mercenary.program(:htmlproofer) do |p|
   p.option 'assume_extension', '--assume-extension <ext>', 'Automatically add specified extension to files for internal links, to allow extensionless URLs (as supported by most servers) (default: `.html`).'
   p.option 'checks', '--checks check1,[check2,...]', Array, 'A comma-separated list of Strings indicating which checks you want to run (default: `["Links", "Images", "Scripts"]`)'
   p.option 'check_external_hash', '--check-external-hash', 'Checks whether external hashes exist (even if the webpage exists) (default: `true`).'
+  p.option 'check_internal_hash', '--check-internal-hash', 'Checks whether internal hashes exist (even if the webpage exists) (default: `true`).'
   p.option 'check_sri', '--check-sri', 'Check that `<link>` and `<script>` external resources use SRI (default: `false`).'
   p.option 'directory_index_file', '--directory-index-file <filename>', String, 'Sets the file to look for when a link refers to a directory. (default: `index.html`)'
   p.option 'disable_external', '--disable-external', 'If `true`, does not run the external link checker (default: `false`)'
-  p.option 'enforce_https', '--enforce-https', 'Fails a link if it\'s not marked as `https` (default: `true`).'
+  p.option 'enforce_https', '--enforce-https <false>', String, 'Fails a link if it\'s not marked as `https` (default: `true`).'
   p.option 'extensions', '--extensions ext1,[ext2,...[', Array, 'A comma-separated list of Strings indicating the file extensions you would like to check (including the dot) (default: `.html`)'
   p.option 'ignore_empty_alt', '--ignore-empty-alt', ' If `true`, ignores images with empty/missing alt tags (in other words, `<img alt>` and `<img alt="">` are valid; set this to `false` to flag those)'
   p.option 'ignore_files', '--ignore-files file1,[file2,...]', Array, 'A comma-separated list of Strings or RegExps containing file paths that are safe to ignore'
@@ -67,6 +68,8 @@ Mercenary.program(:htmlproofer) do |p|
       end
     end
 
+    options[:enforce_https] = false if opts['enforce_https'] == "false"
+
     options[:log_level] = opts['log_level'].to_sym unless opts['log_level'].nil?
 
     options[:typhoeus] = HTMLProofer::Configuration.parse_json_option('typhoeus', opts['typhoeus'], symbolize_names: false) unless opts['typhoeus'].nil?

data/lib/html_proofer/attribute/url.rb

@@ -161,7 +161,13 @@ module HTMLProofer
       end
 
       def unslashed_directory?(file)
-        File.directory?(file) && !file.end_with?(File::SEPARATOR)
+        return false unless File.directory?(file)
+
+        !file.end_with?(File::SEPARATOR) && !follow_location?
+      end
+
+      def follow_location?
+        @runner.options[:typhoeus] && @runner.options[:typhoeus][:followlocation]
       end
 
       def absolute_path?(path)

data/lib/html_proofer/check/images.rb

@@ -20,12 +20,21 @@ module HTMLProofer
             add_failure("image has no src or srcset attribute", 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?
+          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)
           elsif @img.multiple_srcsets?
-            srcsets = @img.srcset.split(",").map(&:strip)
-            srcsets.each do |srcset|
+            @img.srcsets.each do |srcset|
+              srcset_url = HTMLProofer::Attribute::Url.new(@runner, srcset, base_url: @img.base_url)
+
+              if srcset_url.remote?
+                add_to_external_urls(srcset_url.url, @img.line)
+              elsif !srcset_url.exists?
+                add_failure("internal image #{srcset} does not exist", line: @img.line, content: @img.content)
+              end
+            end
+          elsif @img.multiple_sizes?
+            @img.srcsets_wo_sizes.each do |srcset|
               srcset_url = HTMLProofer::Attribute::Url.new(@runner, srcset, base_url: @img.base_url)
 
               if srcset_url.remote?

data/lib/html_proofer/configuration.rb

@@ -9,6 +9,7 @@ module HTMLProofer
       allow_missing_href: false,
       assume_extension: ".html",
       check_external_hash: true,
+      check_internal_hash: true,
       checks: DEFAULT_TESTS,
       directory_index_file: "index.html",
       disable_external: false,

data/lib/html_proofer/element.rb

@@ -84,6 +84,28 @@ module HTMLProofer
       !blank?(srcset) && srcset.split(",").size > 1
     end
 
+    def srcsets
+      return nil if blank?(srcset)
+
+      srcset.split(",").map(&:strip)
+    end
+
+    def multiple_sizes?
+      return false if blank?(srcsets)
+
+      srcsets.any? do |srcset|
+        !blank?(srcset) && srcset.split(" ").size > 1
+      end
+    end
+
+    def srcsets_wo_sizes
+      return nil if blank?(srcsets)
+
+      srcsets.map do |srcset|
+        srcset.split(" ").first
+      end
+    end
+
     def ignore?
       return true if @node.attributes["data-proofer-ignore"]
       return true if ancestors_ignorable?

data/lib/html_proofer/url_validator/internal.rb

@@ -68,6 +68,7 @@ module HTMLProofer
       private def hash_exists?(url)
         href_hash = url.hash
         return true if blank?(href_hash)
+        return true unless @runner.options[:check_internal_hash]
 
         # prevents searching files we didn't ask about
         return false unless url.known_extension?

data/lib/html_proofer/version.rb

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

metadata

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