html-proofer 3.15.3 → 3.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40942bc9c00696cb5c3c02e6ca427c0adfd1f80dae7028a6a2d70992c29065a2
-  data.tar.gz: 1ef56b761178d31791dc2e457c8d4da0704c6845725e87eada63e8c6d6d01d84
+  metadata.gz: 39ffac5e6c23ab7b75d99dd69779be2109ed8b02dc4a5cb0a33740119cb66766
+  data.tar.gz: cdaf142dfde936fa1d88d410499c04fdbbb3b9814bc00ba6800ff3edb8acee50
 SHA512:
-  metadata.gz: 10f6a27dc6c59b01dd3ff4aadf8d3c1fef3cd82e35ee604f180a9738094aae1be4748d78279e5abe5fdac2ed07f43a8efdac8cec4d1a3b24ba91a3125301bbe3
-  data.tar.gz: 33f427ea5661e13e301b06033f65d16623005cf4834b412729e8e04c13bbaecbc0d88cce2f7a20d06cedbb3b6bc6015bef0bd1ed370ba0edc6b18ba4d6117e03
+  metadata.gz: 34a4253b2eb9674060583c0f9006f9c36204bfd8bbb3e347293874e8db3248153e1efcdb13cbb9a5fc7967aabe478773a6a33c3c2372b4e819ecc0c41af43f36
+  data.tar.gz: 34530aeb5fb2836568aa5f7ebea7f154ef8e58c82ac0803aeba5632f704e7aed6c8111a095546c56b1331fa3dc1b563b08eac7cff0205aee4056815ebd8a6478

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

@@ -8,7 +8,7 @@ class OpenGraphElement < ::HTMLProofer::Element
     # Fake up src from the content attribute
     instance_variable_set('@src', @content)
 
-    @src.insert 0, 'http:' if @src =~ %r{^//}
+    @src.insert 0, 'http:' if %r{^//}.match?(@src)
   end
 end
 

data/lib/html-proofer/element.rb

@@ -15,7 +15,7 @@ module HTMLProofer
       # Construct readable ivars for every element
       begin
         obj.attributes.each_pair do |attribute, value|
-          name = attribute.tr('-:.;', '_').to_s.to_sym
+          name = attribute.tr('-:.;@', '_').to_s.to_sym
           (class << self; self; end).send(:attr_reader, name)
           instance_variable_set("@#{name}", value.value)
         end
@@ -42,19 +42,19 @@ module HTMLProofer
 
       # fix up missing protocols
       if defined?(@href)
-        @href.insert(0, 'http:') if @href =~ %r{^//}
+        @href.insert(0, 'http:') if %r{^//}.match?(@href)
       else
         @href = nil
       end
 
       if defined?(@src)
-        @src.insert(0, 'http:') if @src =~ %r{^//}
+        @src.insert(0, 'http:') if %r{^//}.match?(@src)
       else
         @src = nil
       end
 
       if defined?(@srcset)
-        @srcset.insert(0, 'http:') if @srcset =~ %r{^//}
+        @srcset.insert(0, 'http:') if %r{^//}.match?(@srcset)
       else
         @srcset = nil
       end
@@ -105,11 +105,11 @@ module HTMLProofer
       return true if @data_proofer_ignore
       return true if @parent_ignorable
 
-      return true if url =~ /^javascript:/
+      return true if /^javascript:/.match?(url)
 
       # ignore base64 encoded images
       if %w[ImageCheck FaviconCheck].include? @type
-        return true if url =~ /^data:image/
+        return true if /^data:image/.match?(url)
       end
 
       # ignore user defined URLs
@@ -178,7 +178,7 @@ module HTMLProofer
 
       path_dot_ext = path + @check.options[:extension] if @check.options[:assume_extension]
 
-      if path =~ %r{^/} # path relative to root
+      if %r{^/}.match?(path) # path relative to root
         if File.directory?(@check.src)
           base = @check.src
         else
@@ -217,10 +217,11 @@ module HTMLProofer
 
     def ignores_pattern_check(links)
       links.each do |ignore|
-        if ignore.is_a? String
+        case ignore
+        when String
           return true if ignore == url
-        elsif ignore.is_a? Regexp
-          return true if ignore =~ url
+        when Regexp
+          return true if ignore&.match?(url)
         end
       end
 

data/lib/html-proofer/middleware.rb

@@ -53,7 +53,7 @@ module HTMLProofer
     def call(env)
       result = @app.call(env)
       return result if env['REQUEST_METHOD'] != 'GET'
-      return result if env['QUERY_STRING'] =~ /proofer-ignore/
+      return result if /proofer-ignore/.match?(env['QUERY_STRING'])
       return result if result.first != 200
 
       body = []

data/lib/html-proofer/runner.rb

@@ -31,6 +31,7 @@ module HTMLProofer
       end
 
       @failures = []
+      @before_request = []
     end
 
     def run
@@ -117,6 +118,7 @@ module HTMLProofer
 
     def validate_urls
       url_validator = HTMLProofer::UrlValidator.new(@logger, @external_urls, @options)
+      url_validator.before_request = @before_request
       @failures.concat(url_validator.run)
       @external_urls = url_validator.external_urls
     end
@@ -173,5 +175,21 @@ module HTMLProofer
       failure_text = pluralize(count, 'failure', 'failures')
       raise @logger.colorize :fatal, "HTML-Proofer found #{failure_text}!"
     end
+
+    # Set before_request callback.
+    #
+    # @example Set before_request.
+    #   request.before_request { |request| p "yay" }
+    #
+    # @param [ Block ] block The block to execute.
+    #
+    # @yield [ Typhoeus::Request ]
+    #
+    # @return [ Array<Block> ] All before_request blocks.
+    def before_request(&block)
+      @before_request ||= []
+      @before_request << block if block_given?
+      @before_request
+    end
   end
 end

data/lib/html-proofer/url_validator.rb

@@ -10,6 +10,7 @@ module HTMLProofer
     include HTMLProofer::Utils
 
     attr_reader :external_urls
+    attr_writer :before_request
 
     def initialize(logger, external_urls, options)
       @logger = logger
@@ -18,6 +19,7 @@ module HTMLProofer
       @options = options
       @hydra = Typhoeus::Hydra.new(@options[:hydra])
       @cache = Cache.new(@logger, @options[:cache])
+      @before_request = []
     end
 
     def run
@@ -137,6 +139,9 @@ module HTMLProofer
     def queue_request(method, href, filenames)
       opts = @options[:typhoeus].merge(method: method)
       request = Typhoeus::Request.new(href, opts)
+      @before_request.each do |callback|
+        callback.call(request)
+      end
       request.on_complete { |response| response_handler(response, filenames) }
       @hydra.queue request
     end

data/lib/html-proofer/version.rb

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

metadata

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