Merge pull request #740 from gjtorikian/webp-madness

adjust for additional srcset/webp logic
gjtorikian · Jul 26, 2022 · 54358c4 · 54358c4
2 parents 565bdd9 + 85f3f73
commit 54358c4
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 4 deletions.
diff --git a/lib/html_proofer/attribute/url.rb b/lib/html_proofer/attribute/url.rb
@@ -3,18 +3,20 @@
 module HTMLProofer
   class Attribute
     class Url < HTMLProofer::Attribute
-      attr_reader :url
+      attr_reader :url, :size
 
       REMOTE_SCHEMES = ["http", "https"].freeze
 
-      def initialize(runner, link_attribute, base_url: nil)
+      def initialize(runner, link_attribute, base_url: nil, extract_size: false)
         super
 
         if @raw_attribute.nil?
           @url = nil
         else
           @url = @raw_attribute.delete("\u200b").strip
+          @url, @size = @url.split(/\s+/) if extract_size
           @url = Addressable::URI.join(base_url, @url).to_s unless blank?(base_url)
+          @url = "" if @url.nil?
 
           swap_urls!
           clean_url!

diff --git a/lib/html_proofer/check/images.rb b/lib/html_proofer/check/images.rb
@@ -25,7 +25,7 @@ def run
               content: @img.content)
           elsif @img.multiple_srcsets?
             @img.srcsets.each do |srcset|
-              srcset_url = HTMLProofer::Attribute::Url.new(@runner, srcset, base_url: @img.base_url)
+              srcset_url = HTMLProofer::Attribute::Url.new(@runner, srcset, base_url: @img.base_url, extract_size: true)
 
               if srcset_url.remote?
                 add_to_external_urls(srcset_url.url, @img.line)
@@ -35,7 +35,7 @@ def run
             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)
+              srcset_url = HTMLProofer::Attribute::Url.new(@runner, srcset, base_url: @img.base_url, extract_size: true)
 
               if srcset_url.remote?
                 add_to_external_urls(srcset_url.url, @img.line)

diff --git a/spec/html-proofer/fixtures/images/webp/user_1200x1200_fit_q75_h2_lanczos.webp b/spec/html-proofer/fixtures/images/webp/user_1200x1200_fit_q75_h2_lanczos.webp
diff --git a/spec/html-proofer/fixtures/images/webp/user_400.webp b/spec/html-proofer/fixtures/images/webp/user_400.webp
diff --git a/spec/html-proofer/fixtures/images/webp/user_760.webp b/spec/html-proofer/fixtures/images/webp/user_760.webp
diff --git a/spec/html-proofer/fixtures/images/webp_valid.html b/spec/html-proofer/fixtures/images/webp_valid.html
@@ -0,0 +1,10 @@
+<html>
+  <body>
+    <div class="w-100">
+      <img alt="User::round" srcset="webp/user_400.webp 400w, webp/user_760.webp
+      760w, webp/user_1200x1200_fit_q75_h2_lanczos.webp 1200w"
+      src=webp/user_400.webp width="250" height="187" loading="lazy"
+      data-zoomable>
+    </div>
+  </body>
+</html>
diff --git a/spec/html-proofer/images_spec.rb b/spec/html-proofer/images_spec.rb
@@ -259,4 +259,10 @@
     proofer = run_proofer(custom_data_src_check, :file)
     expect(proofer.failed_checks.first.description).to(match(/foo.webp does not exist/))
   end
+
+  it "works for various webp images" do
+    custom_data_src_check = "#{FIXTURES_DIR}/images/webp_valid.html"
+    proofer = run_proofer(custom_data_src_check, :file)
+    expect(proofer.failed_checks).to(eq([]))
+  end
 end