html-proofer 3.9.3 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 246e851f166c3330542ef13670c9b86ea6acef06b142de26692ae16ec421dd15
-  data.tar.gz: 6e63ce9f51b36817a9420ef07dd7a40c5668227f94ffc01df4cf3d8ac21fdb1e
+  metadata.gz: b45b89b9e969d7559aa5006e53ff2b363fd7e1aeed1178366c30656696696e61
+  data.tar.gz: 756470e2c29749f59accaed01ff8b64bef731fa06c20ec6995a76ee8a3f1fe9b
 SHA512:
-  metadata.gz: 19a3a97c74d2c9fddbbb4b12cbc38e9ab08309232c876ccaab922643de9535f0ebf9d56a90a3ce0c4821cd070d5b629ef4368629e2e5b2c6a02c36acb5019e3a
-  data.tar.gz: e2201edf4fee55ed6b80b00e7bbdb5eb272a8fc5748d1bcd41148e3afa7757e24487c5698e12083288aeefc2a5e7db317d8fd29b5340d5678d9c14fe2b327381
+  metadata.gz: 616c50dff0b36c1fac958985eb6d8fe22278a38abfd2701779b270268836e104bc0d25856a3fef1546644cc27fe04be3ee99172c4c6069189d41fbaf94af8b24
+  data.tar.gz: 02b0c9dfe2deb801d2cea99923791b5eb212bcf2f28ee1096c7599367406bfe40cf7d090f905f174746ac9aa3004219d8b34ae9e2490d72971fbd287a732d41c

data/bin/htmlproofer

@@ -34,16 +34,17 @@ Mercenary.program(:htmlproofer) do |p|
   p.option 'external_only', '--external_only', 'Only checks problems with external references'
   p.option 'file_ignore', '--file-ignore file1,[file2,...]', Array, 'A comma-separated list of Strings or RegExps containing file paths that are safe to ignore'
   p.option 'http_status_ignore', '--http-status-ignore 123,[xxx, ...]', Array, 'A comma-separated list of numbers representing status codes to ignore.'
+  p.option 'internal_domains', '--internal-domains domain1,[domain2,...]', Array, 'A comma-separated list of Strings containing domains that will be treated as internal urls.'
   p.option 'report_invalid_tags', '--report-invalid-tags', 'Ignore `check_html` errors associated with unknown markup (default: `false`)'
   p.option 'report_missing_names', '--report-missing-names', 'Ignore `check_html` errors associated with missing entities (default: `false`)'
   p.option 'report_script_embeds', '--report-script-embeds', 'Ignore `check_html` errors associated with `script`s (default: `false`)'
   p.option 'log_level', '--log-level <level>', String, 'Sets the logging level, as determined by Yell. One of `:debug`, `:info`, `:warn`, `:error`, or `:fatal`. (default: `:info`)'
   p.option 'only_4xx', '--only-4xx', 'Only reports errors for links that fall within the 4xx status code range'
+  p.option 'storage_dir', '--storage-dir PATH', String, 'Directory where to store the cache log (default: "tmp/.htmlproofer")'
   p.option 'timeframe', '--timeframe <time>', String, 'A string representing the caching timeframe.'
+  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 'internal_domains', '--internal-domains domain1,[domain2,...]', Array, 'A comma-separated list of Strings containing domains that will be treated as internal urls.'
-  p.option 'storage_dir', '--storage-dir PATH', String, 'Directory where to store the cache log (default: "tmp/.htmlproofer")'
 
   p.action do |args, opts|
     args = ['.'] if args.empty?
@@ -80,6 +81,9 @@ Mercenary.program(:htmlproofer) do |p|
     options[:validation][:report_missing_names] = opts['report_missing_names']
     options[:validation][:report_invalid_tags] = opts['report_invalid_tags']
 
+    options[:typhoeus] = {}
+    options[:typhoeus] = HTMLProofer::Configuration.parse_json_option('typhoeus_config', opts['typhoeus_config'])
+
     options[:cache] = {}
     options[:cache][:timeframe] = opts['timeframe'] unless opts['timeframe'].nil?
     options[:cache][:storage_dir] = opts['storage_dir'] unless opts['storage_dir'].nil?

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

@@ -127,7 +127,7 @@ class LinkCheck < ::HTMLProofer::Check
     html.xpath(*xpaths)
   end
 
-  IGNORABE_REL = %(canonical alternate icon manifest apple-touch-icon)
+  IGNORABE_REL = %(canonical alternate next prev previous icon manifest apple-touch-icon)
 
   def check_sri(line, content)
     return if IGNORABE_REL.include?(@link.rel)

data/lib/html-proofer/configuration.rb

@@ -61,5 +61,22 @@ module HTMLProofer
         item
       end
     end
+
+    def self.parse_json_option(option_name, config)
+      raise ArgumentError.new('Must provide an option name in string format.') unless option_name.is_a?(String)
+      raise ArgumentError.new('Must provide an option name in string format.') unless !option_name.strip.empty?
+
+      return {} if config.nil?
+
+      raise ArgumentError.new('Must provide a JSON configuration in string format.') unless config.is_a?(String)
+
+      return {} if config.strip.empty?
+
+      begin
+        JSON.parse(config)
+      rescue
+        raise ArgumentError.new("Option '" + option_name + "' did not contain valid JSON.")
+      end
+    end
   end
 end

data/lib/html-proofer/element.rb

@@ -173,11 +173,10 @@ module HTMLProofer
 
       file = File.join base, path
 
-      # implicit index support
-      if File.directory?(file) && !unslashed_directory?(file)
-        file = File.join file, @check.options[:directory_index_file]
-      elsif @check.options[:assume_extension] && File.file?("#{file}#{@check.options[:extension]}")
+      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
+        file = File.join file, @check.options[:directory_index_file]
       end
 
       file

data/lib/html-proofer/version.rb

@@ -1,3 +1,3 @@
 module HTMLProofer
-  VERSION = '3.9.3'.freeze
+  VERSION = '3.10.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-proofer
 version: !ruby/object:Gem::Version
-  version: 3.9.3
+  version: 3.10.0
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement