html-proofer 3.11.0 → 3.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03572c9956b3d257f19ce6b0692164a4bb18ced1351d05dfa79e3f218504e271
-  data.tar.gz: 92f19a6d0ecf5a5f298d1d6aa2df02c4d788d48e4348d28064d5edba32bb9f15
+  metadata.gz: bef0ae04093136fdf08e67fa972450c1c1ce356ded9c27d8a2b20bf5e231210c
+  data.tar.gz: 5f7992911919eef31a7a186df3bfaa765191eed49692da6639d3d4c049fa1904
 SHA512:
-  metadata.gz: ae17c5d646967fc246d0e2661f7c2fc45d1e07321db23a6cd3cf33398e2e675a825b59325154cd9bd249f2e949c4b3351845e260663591dc14aa9fa05d66f867
-  data.tar.gz: c8a7518a4d75224aa18a7ec617bfeb8b302592d4b07259bdd711690558a9d98cbf541c9b92765871dbded8ee32a8cba1524fd29e632c56f8d1b4c132efba7875
+  metadata.gz: 39b391bbb48b61e576a61a32199ac74fb362bc285fef8897438aa9d30b95c8cc62c71c9ca576b8b7e67e3a9543bd152d2f0d172ae56e64f5026bd1764ae499c9
+  data.tar.gz: a1371937ce6c4433ce957f3e1d51b2e0b91ecb5284f2538ba7c9731e106b18d5c4ef4bb2a05e92b842477b55bbdc6e581a15851dd62817f63d8b3b56834bbe39

data/bin/htmlproofer

@@ -77,18 +77,24 @@ Mercenary.program(:htmlproofer) do |p|
     options[:error_sort] = opts['error-sort'].to_sym unless opts['error-sort'].nil?
     options[:log_level] = opts['log_level'].to_sym unless opts['log_level'].nil?
 
-    # FIXME: this is gross
-    options[:validation] = {}
-    options[:validation][:report_script_embeds] = opts['report_script_embeds']
-    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?
+    options[:validation] = HTMLProofer::Configuration::VALIDATION_DEFAULTS.dup
+    options[:validation][:report_script_embeds] = opts['report_script_embeds'] unless opts['report_script_embeds'].nil?
+    options[:validation][:report_missing_names] = opts['report_missing_names'] unless opts['report_missing_names'].nil?
+    options[:validation][:report_invalid_tags] = opts['report_invalid_tags'] unless opts['report_invalid_tags'].nil?
+
+    unless opts['typhoeus_config'].nil?
+      options[:typhoeus] = HTMLProofer::Configuration.parse_json_option('typhoeus_config', opts['typhoeus_config'])
+    end
+
+    unless opts['timeframe'].nil?
+      options[:cache] ||= {}
+      options[:cache][:timeframe] = opts['timeframe'] unless opts['timeframe'].nil?
+    end
+
+    unless opts['storage_dir'].nil?
+      options[:cache] ||= {}
+      options[:cache][:storage_dir] = opts['storage_dir'] unless opts['storage_dir'].nil?
+    end
 
     options[:http_status_ignore] = Array(options[:http_status_ignore]).map(&:to_i)
 

data/lib/html-proofer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTMLProofer
-  VERSION = '3.11.0'.freeze
+  VERSION = '3.11.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-proofer
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.11.1
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-16 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary