From c4edec4cbc8272405691edd3f1c64034642b7836 Mon Sep 17 00:00:00 2001 From: Laurent Arnoud Date: Wed, 13 Sep 2023 22:58:53 +0200 Subject: [PATCH] Update spidr to 0.7 --- lib/validate_website/crawl.rb | 6 ++---- validate-website.gemspec | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/validate_website/crawl.rb b/lib/validate_website/crawl.rb index 0cff182..c89bc84 100644 --- a/lib/validate_website/crawl.rb +++ b/lib/validate_website/crawl.rb @@ -52,7 +52,7 @@ def extract_imgs_from_page(page) def spidr_crawler(site, options) @host = URI(site).host - Spidr.site(site, options) do |crawler| + Spidr.site(site, **options.slice(:user_agent, :ignore_links)) do |crawler| crawler.cookies[@host] = default_cookies if options[:cookies] on_every_css_page(crawler) on_every_html_page(crawler) @@ -81,9 +81,7 @@ def on_every_html_page(crawler) if validate?(page) keys = %i[ignore html5_validator] - # slice does not exists on Ruby <= 2.4 - slice = Hash[[keys, options.values_at(*keys)].transpose] - validate(page.doc, page.body, page.url, slice) + validate(page.doc, page.body, page.url, options.slice(keys)) end end end diff --git a/validate-website.gemspec b/validate-website.gemspec index 24c4eed..2615d2b 100644 --- a/validate-website.gemspec +++ b/validate-website.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.add_dependency 'nokogiri', '~> 1.15' s.add_dependency 'paint', '~> 2' s.add_dependency 'slop', '~> 4.6' - s.add_dependency 'spidr', '~> 0.6.1' + s.add_dependency 'spidr', '~> 0.7' s.add_dependency 'tidy_ffi', '~> 1.0' s.add_dependency 'w3c_validators', '~> 1.3' s.add_dependency 'webrick', '~> 1'