html-proofer 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c86b30d36446c4e7513915f860d356094394893184e451050133d8db0051588
-  data.tar.gz: dea3274188458eec8e625e3d0e891cb383e9b533cf8f378a9348a1baf724f1e3
+  metadata.gz: c827c0b89b31ad51e1a4b177f190bdcbbb8f8fd933f235420be60da28e43cfb6
+  data.tar.gz: e47a4bf7944efc46622762720036c846c1ccb82acf339d99a93d7fade05eb1d9
 SHA512:
-  metadata.gz: 128ba50160a450747d9f7085ac6cea6231c6ec962a9d4b159df9f882682ec78396b5f2ca86264a69b1cbb0b3c28b2e96e2fb93f7e398ee60cee7d4a49b9c6b65
-  data.tar.gz: 323474cfa12ccadc4254f7dab7d035b8569fad92c4337d5946776b14a10dd30213849ed278ad9d3b314dcc20c93c5af78071b9acdaaee6635b4070a88497eb87
+  metadata.gz: c4b46613b516b0fbbaf52747d812dd390598b2bd3db6d45e342d2946ed012a7da2d47f36a0bae9a7c8b09fd484d7d0ecf2e4d12714f1044bb0ef2cfd5bd1d6da
+  data.tar.gz: '005058a0df180ce5619c2733438189842645840e1b94b6209bd3b2b6751b6cdd5f30b2adaa4aaed1e797e1332cfaf98388d54e06bf4497f5eb6f9796be71a1d8'

data/bin/htmlproofer

@@ -24,7 +24,7 @@ Mercenary.program(:htmlproofer) do |p|
   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 +67,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/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/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/version.rb

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

metadata

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