From 9068c36f472df95bd577851ec4d67a735499b61e Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Mon, 20 Apr 2015 16:26:37 -0700 Subject: [PATCH 1/2] Add script/bootstrap --- script/bootstrap | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 script/bootstrap diff --git a/script/bootstrap b/script/bootstrap new file mode 100755 index 00000000..bfe3dc50 --- /dev/null +++ b/script/bootstrap @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +bundle install "$@" From df1bc4f01ac3c114d30c811d7041a33ba7a0a1a0 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Mon, 20 Apr 2015 16:40:40 -0700 Subject: [PATCH 2/2] Properly merge in Typhoeus default opts --- lib/html/proofer.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/html/proofer.rb b/lib/html/proofer.rb index 2766b16d..8df33de0 100644 --- a/lib/html/proofer.rb +++ b/lib/html/proofer.rb @@ -23,6 +23,13 @@ class Proofer attr_reader :options, :typhoeus_opts, :hydra_opts, :parallel_opts + TYPHOEUS_DEFAULTS = { + :followlocation => true, + :headers => { + "User-Agent" => "Mozilla/5.0 (compatible; HTML Proofer/#{VERSION}; +https://github.com/gjtorikian/html-proofer)" + } + } + def initialize(src, opts = {}) @src = src @@ -43,12 +50,7 @@ def initialize(src, opts = {}) :checks_to_ignore => [] } - @typhoeus_opts = opts[:typhoeus] || { - :followlocation => true, - :headers => { - "User-Agent" => "Mozilla/5.0 (compatible; HTML Proofer/#{VERSION}; +https://github.com/gjtorikian/html-proofer)" - } - } + @typhoeus_opts = TYPHOEUS_DEFAULTS.merge(opts[:typhoeus] || {}) opts.delete(:typhoeus) @hydra_opts = opts[:hydra] || {}