validate-website 1.9.3 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bc6ec31c18ead2191fb2c32b24cb7760b84cd9edc296e1ae5a16ef904ca4fd1
-  data.tar.gz: a5d08b83a6e6263bc3be738aaeab2836b14019575a385a801e5240cab23e1415
+  metadata.gz: 4a5b0553089c9d66d3622781fe6c4ab5ca68ac6a198fe36c53c84c8d34e14adb
+  data.tar.gz: f3f0cc4aef203f85ebb9868e793b7cd0312db8c4b6f7fb0d15beefeaaef1cc83
 SHA512:
-  metadata.gz: 1d1ed522d9721e37c17db84fc63257afe632622a684012aa2d6585cfeb1f740482c887977f94a208e3844c6c6d4731d2511ea2e1dbf52076585869e4a3d3b61d
-  data.tar.gz: e4c0d75cbfb629a41d7eccbb766be3aaa0dff5bf9dd1532b6786e02a11ad7fe3955b4c5516cc5ea52358114b64218268de5fa66230f16978ef11820d7021df40
+  metadata.gz: c9a8fae92bcb19d5f92466a7b77f3e40cca59643c946c15563885d9e65a1d2793271dee2b723a296fe487d57634fdd88f4440a60d2fac625a6a7208c8105159d
+  data.tar.gz: e7a78f899b42d5f27cb41e99472e37499389bf39c567dd9f16ab064fce38927a43de89c00411c25697c622ad76f59b8d4b9836d898249822cf9bc0d37591c3bf

data/History.md

@@ -1,4 +1,15 @@
 
+1.10.0 / 2020-07-03
+==================
+
+  * Fix build for Ruby 2.3 and 2.4
+  * Remove rbx-3 from build
+  * Remove minitest-focus and fix minitest 6 warnings
+  * Fix html5_validator option and change html5_validator_service_url
+  * Add Ruby 2.7 to CI and update jruby
+  * Update rubocop and fix offences
+  * Remove Ruby 2.2 support and update rubocop
+
 1.9.3 / 2019-04-11
 ==================
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2019 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2009-2020 Laurent Arnoud <laurent@spkdev.net>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -145,7 +145,7 @@ See [GitHub](https://github.com/spk/validate-website/graphs/contributors).
 
 The MIT License
 
-Copyright (c) 2009-2019 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2009-2020 Laurent Arnoud <laurent@spkdev.net>
 
 ---
 [![Build](https://img.shields.io/travis/spk/validate-website.svg)](https://travis-ci.org/spk/validate-website)

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/testtask'
 require 'rubocop/rake_task'
 require 'asciidoctor'

data/bin/validate-website

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'validate_website/runner'
 exit_status = ValidateWebsite::Runner.run_crawl(ARGV)

data/bin/validate-website-static

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'validate_website/runner'
 exit_status = ValidateWebsite::Runner.run_static(ARGV)

data/lib/validate_website.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'validate_website/core'
 require 'validate_website/version'

data/lib/validate_website/colorful_messages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'paint'
 
 module ValidateWebsite
@@ -5,6 +7,7 @@ module ValidateWebsite
   module ColorfulMessages
     def color(type, message, colored = true)
       return message unless colored
+
       send(type, message)
     end
 

data/lib/validate_website/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 require 'open-uri'
 require 'webrick/cookie'
@@ -26,7 +28,7 @@ module ValidateWebsite
     EXIT_FAILURE_MARKUP = 64
     EXIT_FAILURE_NOT_FOUND = 65
     EXIT_FAILURE_MARKUP_NOT_FOUND = 66
-    START_MESSAGE = 'Validating'.freeze
+    START_MESSAGE = 'Validating'
 
     # Initialize core ValidateWebsite class
     # @example
@@ -43,11 +45,11 @@ module ValidateWebsite
     end
 
     def errors?
-      @errors_count > 0
+      @errors_count.positive?
     end
 
     def not_founds?
-      @not_founds_count > 0
+      @not_founds_count.positive?
     end
 
     def exit_status
@@ -78,6 +80,7 @@ module ValidateWebsite
     def check_css_syntax(page)
       nodes = Crass::Parser.parse_stylesheet(page.body)
       return unless any_css_errors?(nodes)
+
       handle_validation_error(page.url)
     end
 
@@ -111,10 +114,10 @@ module ValidateWebsite
     # @param [Nokogiri::HTML::Document] original_doc
     # @param [String] The raw HTTP response body of the page
     # @param [String] url
-    # @param [Regexp] Errors to ignore
+    # @param [Hash] Validator options
     #
-    def validate(doc, body, url, ignore = nil)
-      validator = Validator.new(doc, body, ignore: ignore)
+    def validate(doc, body, url, options)
+      validator = Validator.new(doc, body, options)
       if validator.valid?
         print color(:success, '.', options[:color]) # rspec style
       else
@@ -125,6 +128,7 @@ module ValidateWebsite
     def handle_html_validation_error(validator, url)
       handle_validation_error(url)
       return unless options[:verbose]
+
       puts color(:error, validator.errors.join(', '), options[:color])
     end
 

data/lib/validate_website/crawl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'validate_website/core'
 require 'validate_website/utils'
 
@@ -41,6 +43,7 @@ module ValidateWebsite
     #
     def extract_imgs_from_page(page)
       return Set[] if page.is_redirect?
+
       page.doc.search('//img[@src]').reduce(Set[]) do |result, elem|
         u = elem.attributes['src'].content
         result << page.to_absolute(URI.parse(URI.encode(u)))
@@ -77,7 +80,10 @@ module ValidateWebsite
         end
 
         if validate?(page)
-          validate(page.doc, page.body, page.url, options[:ignore])
+          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)
         end
       end
     end

data/lib/validate_website/option_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'slop'
 require File.expand_path('version', __dir__)
 
@@ -29,6 +31,7 @@ module ValidateWebsite
     # Generic parse method for crawl or static options
     def self.parse(options, type)
       raise ArgumentError unless VALID_TYPES.include?(type)
+
       # We are in command line (ARGV)
       if options.is_a?(Array)
         send("command_line_parse_#{type}", options)

data/lib/validate_website/runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'validate_website/core'
 
 module ValidateWebsite
@@ -5,7 +7,7 @@ module ValidateWebsite
   class Runner
     def self.trap_interrupt
       trap('INT') do
-        STDERR.puts "\nExiting..."
+        warn "\nExiting..."
         exit!(1)
       end
     end

data/lib/validate_website/static.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'validate_website/core'
 require 'validate_website/utils'
 
@@ -5,7 +7,7 @@ module ValidateWebsite
   # Class for validation Static website
   class Static < Core
     CONTENT_TYPES = ['text/html', 'text/xhtml+xml'].freeze
-    START_MESSAGE_TYPE = 'files'.freeze
+    START_MESSAGE_TYPE = 'files'
 
     attr_reader :history_count
 
@@ -24,7 +26,8 @@ module ValidateWebsite
       files = Dir.glob(@options[:pattern])
       files.each do |file|
         next unless File.file?(file)
-        next if @options[:exclude] && @options[:exclude].match(file)
+        next if @options[:exclude]&.match(file)
+
         @history_count += 1
         check_static_file(file)
       end
@@ -57,7 +60,10 @@ module ValidateWebsite
 
     def check_page(file, page)
       if page.html? && options[:markup]
-        validate(page.doc, page.body, file, options[:ignore])
+        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, file, slice)
       end
       check_static_not_found(page.links) if options[:not_found]
     end
@@ -68,11 +74,13 @@ module ValidateWebsite
       static_links = links.map { |l| StaticLink.new(l, @site) }
       static_links.each do |static_link|
         next unless static_link.check?
+
         unless File.exist?(static_link.file_path)
           not_found_error(static_link.file_path)
           next
         end
         next unless static_link.css?
+
         check_static_not_found static_link.extract_urls_from_fake_css_response
       end
     end

data/lib/validate_website/static_link.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'validate_website/utils'
 require 'validate_website/static'
@@ -25,9 +27,9 @@ StaticLink = Struct.new(:link, :site) do
 
   def body
     if File.exist?(link)
-      open(link).read
+      File.open(link).read
     else
-      open(file_path).read
+      File.open(file_path).read
     end
   end
 

data/lib/validate_website/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Base module ValidateWebsite
 module ValidateWebsite
   # Utils class for CSS helpers
@@ -10,6 +12,7 @@ module ValidateWebsite
     def self.extract_urls_from_css(page)
       return Set[] unless page
       return Set[] if page.body.nil?
+
       nodes = Crass::Parser.parse_stylesheet(page.body)
       extract_urls_from_nodes nodes, page
     end

data/lib/validate_website/validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 require 'nokogiri'
@@ -10,7 +12,7 @@ module ValidateWebsite
   class Validator
     extend ValidatorClassMethods
 
-    @html5_validator_service_url = 'https://checker.html5.org/'
+    @html5_validator_service_url = 'https://validator.nu/'
     XHTML_SCHEMA_PATH = File.expand_path('../../data/schemas', __dir__)
     @mutex = Mutex.new
 
@@ -68,14 +70,17 @@ module ValidateWebsite
     # http://www.w3.org/TR/xhtml1/#dtds
     def find_namespace(dtd)
       return unless dtd.system_id
+
       dtd_uri = URI.parse(dtd.system_id)
       return unless dtd_uri.path
+
       @dtd_uri = dtd_uri
       File.basename(@dtd_uri.path, '.dtd')
     end
 
     def document
       return @document if @document
+
       @document = if @dtd_uri && @body.match(@dtd_uri.to_s)
                     @body.sub(@dtd_uri.to_s, @namespace + '.dtd')
                   else

data/lib/validate_website/validator_class_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tidy_ffi'
 
 # Validator Class Methods
@@ -9,6 +11,7 @@ module ValidatorClassMethods
 
   def tidy
     return @tidy if defined?(@tidy)
+
     @lib_tidy = TidyFFI::LibTidy
     @tidy = TidyFFI::Tidy
   rescue TidyFFI::LibTidyNotInstalled

data/lib/validate_website/version.rb

@@ -2,5 +2,5 @@
 
 # Version file for ValidateWebsite
 module ValidateWebsite
-  VERSION = '1.9.3'.freeze
+  VERSION = '1.10.0'
 end

data/test/core_test.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require File.expand_path('test_helper', __dir__)
 
 describe ValidateWebsite::Core do
   describe 'invalid options' do
     it 'raise ArgumentError on wrong validation_type' do
-      proc { ValidateWebsite::Core.new({ color: false }, :fail) }
+      _(proc { ValidateWebsite::Core.new({ color: false }, :fail) })
         .must_raise ArgumentError
     end
   end

data/test/crawler_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('test_helper', __dir__)
 
 # rubocop:disable Metrics/BlockLength
@@ -21,7 +23,7 @@ describe ValidateWebsite::Crawl do
       _out, _err = capture_io do
         v = ValidateWebsite::Crawl.new(site: TEST_DOMAIN, user_agent: ua)
         v.crawl
-        v.crawler.user_agent.must_equal ua
+        _(v.crawler.user_agent).must_equal ua
       end
     end
 
@@ -31,7 +33,7 @@ describe ValidateWebsite::Crawl do
       _out, _err = capture_io do
         ValidateWebsite::Crawl.new(site: TEST_DOMAIN,
                                    html5_validator_service_url: new)
-        validator.html5_validator_service_url.must_equal new
+        _(validator.html5_validator_service_url).must_equal new
         validator.html5_validator_service_url = original
       end
     end
@@ -43,7 +45,8 @@ describe ValidateWebsite::Crawl do
       _out, _err = capture_io do
         v = ValidateWebsite::Crawl.new(site: TEST_DOMAIN, cookies: cookies)
         v.crawl
-        v.crawler.cookies.cookies_for_host(v.host).must_equal v.default_cookies
+        _(v.crawler.cookies.cookies_for_host(v.host))
+          .must_equal v.default_cookies
       end
     end
   end
@@ -53,37 +56,53 @@ describe ValidateWebsite::Crawl do
       name = 'xhtml1-strict'
       file = File.join('test', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          body: open(file).read,
+                          body: File.open(file).read,
                           content_type: 'text/html')
       @validate_website.site = page.url
       _out, _err = capture_io do
         @validate_website.crawl
       end
-      @validate_website.history_count.must_equal 5
+      _(@validate_website.history_count).must_equal 5
     end
 
     it 'extract link' do
       name = 'html4-strict'
       file = File.join('test', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          body: open(file).read,
+                          body: File.open(file).read,
                           content_type: 'text/html')
       @validate_website.site = page.url
       _out, _err = capture_io do
         @validate_website.crawl
       end
-      @validate_website.history_count.must_equal 98
+      _(@validate_website.history_count).must_equal 98
+    end
+
+    it 'can change validator' do
+      name = 'html5-fail'
+      file = File.join('test', 'data', "#{name}.html")
+      page = FakePage.new(name,
+                          body: File.open(file).read,
+                          content_type: 'text/html')
+      validator_res = File.join('test', 'data', 'validator.nu-failure.json')
+      stub_request(:any, /#{validator.html5_validator_service_url}/)
+        .to_return(body: File.open(validator_res).read)
+      @validate_website.site = page.url
+      _out, _err = capture_io do
+        @validate_website.crawl(html5_validator: :nu, ignore: /Warning/)
+      end
+      _(@validate_website.errors_count).must_equal 1
     end
 
     it 'crawl when URLs are not ascii only' do
       name = 'cozy-community'
       file = File.join('test', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          body: open(file).read,
+                          body: File.open(file).read,
                           content_type: 'text/html')
       validator_res = File.join('test', 'data', 'validator.nu-failure.json')
       stub_request(:any, /#{validator.html5_validator_service_url}/)
-        .to_return(body: open(validator_res).read)
+        .to_return(body: File.open(validator_res).read)
       @validate_website.site = page.url
       _out, _err = capture_io do
         @validate_website.crawl
@@ -119,7 +138,7 @@ describe ValidateWebsite::Crawl do
         _out, _err = capture_io do
           @validate_website.crawl
         end
-        @validate_website.history_count.must_equal 5
+        _(@validate_website.history_count).must_equal 5
       end
 
       it 'should extract url with single quote' do
@@ -130,7 +149,7 @@ describe ValidateWebsite::Crawl do
         _out, _err = capture_io do
           @validate_website.crawl
         end
-        @validate_website.history_count.must_equal 2
+        _(@validate_website.history_count).must_equal 2
       end
 
       it 'should extract url with double quote' do
@@ -141,7 +160,7 @@ describe ValidateWebsite::Crawl do
         _out, _err = capture_io do
           @validate_website.crawl
         end
-        @validate_website.history_count.must_equal 2
+        _(@validate_website.history_count).must_equal 2
       end
 
       it 'should extract url with params' do
@@ -152,7 +171,7 @@ describe ValidateWebsite::Crawl do
         _out, _err = capture_io do
           @validate_website.crawl
         end
-        @validate_website.history_count.must_equal 2
+        _(@validate_website.history_count).must_equal 2
       end
 
       it 'should not extract invalid urls' do
@@ -163,7 +182,7 @@ describe ValidateWebsite::Crawl do
         _out, _err = capture_io do
           @validate_website.crawl
         end
-        @validate_website.history_count.must_equal 1
+        _(@validate_website.history_count).must_equal 1
       end
     end
 
@@ -182,7 +201,7 @@ describe ValidateWebsite::Crawl do
         _out, _err = capture_io do
           @validate_website.crawl
         end
-        @validate_website.errors_count.must_equal 1
+        _(@validate_website.errors_count).must_equal 1
       end
 
       it 'should be invalid with syntax error' do
@@ -193,7 +212,7 @@ describe ValidateWebsite::Crawl do
         _out, _err = capture_io do
           @validate_website.crawl
         end
-        @validate_website.errors_count.must_equal 1
+        _(@validate_website.errors_count).must_equal 1
       end
     end
   end

data/test/static_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('test_helper', __dir__)
 
 # rubocop:disable Metrics/BlockLength
@@ -17,7 +19,7 @@ describe ValidateWebsite::Static do
                               not_found: false,
                               exclude: /data|example/)
     end
-    @validate_website.history_count.must_equal 0
+    _(@validate_website.history_count).must_equal 0
   end
 
   it 'no space in directory name' do
@@ -28,7 +30,7 @@ describe ValidateWebsite::Static do
                               markup: false,
                               not_found: false)
     end
-    @validate_website.not_founds_count.must_equal 0
+    _(@validate_website.not_founds_count).must_equal 0
   end
 
   it 'not found' do
@@ -40,7 +42,25 @@ describe ValidateWebsite::Static do
                                 markup: false,
                                 not_found: true)
       end
-      @validate_website.not_founds_count.must_equal 213
+      _(@validate_website.not_founds_count).must_equal 213
+    end
+  end
+
+  it 'can change validator' do
+    validator_res = File.join('test', 'data', 'validator.nu-failure.json')
+    stub_request(:any,
+                 /#{ValidateWebsite::Validator.html5_validator_service_url}/)
+      .to_return(body: File.open(validator_res).read)
+    pattern = File.join(File.dirname(__FILE__), 'data',
+                        'html5-fail.html')
+    Dir.chdir('test/data') do
+      _out, _err = capture_io do
+        @validate_website.crawl(pattern: pattern,
+                                site: 'http://w3.org/',
+                                ignore: /Warning/,
+                                html5_validator: :nu)
+      end
+      _(@validate_website.errors_count).must_equal 1
     end
   end
 
@@ -53,7 +73,7 @@ describe ValidateWebsite::Static do
                                 site: 'http://w3.org/',
                                 ignore: /height|width|Length/)
       end
-      @validate_website.errors_count.must_equal 0
+      _(@validate_website.errors_count).must_equal 0
     end
   end
 
@@ -67,7 +87,7 @@ describe ValidateWebsite::Static do
                                   markup: false,
                                   css_syntax: true)
         end
-        @validate_website.errors_count.must_equal 1
+        _(@validate_website.errors_count).must_equal 1
       end
     end
   end

data/test/test_helper.rb

@@ -4,16 +4,15 @@ begin
   require 'coveralls'
   Coveralls.wear!
 rescue LoadError
-  STDERR.puts 'coveralls not loaded'
+  warn 'coveralls not loaded'
 end
 
 require 'minitest/autorun'
-require 'minitest/focus'
 require 'spidr'
 
 require 'validate_website/core'
 
 require File.expand_path('webmock_helper', __dir__)
 
-TEST_DOMAIN = 'http://www.example.com/'.freeze
+TEST_DOMAIN = 'http://www.example.com/'
 ENV['LC_ALL'] = 'C.UTF-8' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'

data/test/validator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('test_helper', __dir__)
 
 # rubocop:disable Metrics/BlockLength
@@ -14,15 +16,15 @@ describe ValidateWebsite::Validator do
       name = 'w3.org-xhtml1-strict-errors'
       file = File.join('test', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          body: open(file).read,
+                          body: File.open(file).read,
                           content_type: 'text/html')
       @xhtml1_page = @http.get_page(page.url)
       ignore = /width|height|Length/
       validator = subject.new(@xhtml1_page.doc,
                               @xhtml1_page.body,
                               ignore: ignore)
-      validator.valid?.must_equal true
-      validator.errors.must_equal []
+      _(validator.valid?).must_equal true
+      _(validator.errors).must_equal []
     end
 
     it 'xhtml1-strict should be valid' do
@@ -30,17 +32,17 @@ describe ValidateWebsite::Validator do
       dtd_uri = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
       file = File.join('test', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          body: open(file).read,
+                          body: File.open(file).read,
                           content_type: 'text/html')
       @xhtml1_page = @http.get_page(page.url)
       ignore = /width|height|Length/
       validator = subject.new(@xhtml1_page.doc,
                               @xhtml1_page.body,
                               ignore: ignore)
-      validator.dtd.system_id.must_equal dtd_uri
-      validator.namespace.must_equal name
-      validator.valid?.must_equal true
-      validator.errors.must_equal []
+      _(validator.dtd.system_id).must_equal dtd_uri
+      _(validator.namespace).must_equal name
+      _(validator.valid?).must_equal true
+      _(validator.errors).must_equal []
     end
   end
 
@@ -49,18 +51,18 @@ describe ValidateWebsite::Validator do
       before do
         validator_res = File.join('test', 'data', 'validator.nu-success.json')
         stub_request(:any, /#{subject.html5_validator_service_url}/)
-          .to_return(body: open(validator_res).read)
+          .to_return(body: File.open(validator_res).read)
       end
       it 'html5 should be valid' do
         name = 'html5'
         file = File.join('test', 'data', "#{name}.html")
         page = FakePage.new(name,
-                            body: open(file).read,
+                            body: File.open(file).read,
                             content_type: 'text/html')
         @html5_page = @http.get_page(page.url)
         validator = subject.new(@html5_page.doc,
                                 @html5_page.body)
-        validator.valid?.must_equal true
+        _(validator.valid?).must_equal true
       end
     end
 
@@ -68,11 +70,11 @@ describe ValidateWebsite::Validator do
       before do
         validator_res = File.join('test', 'data', 'validator.nu-failure.json')
         stub_request(:any, /#{subject.html5_validator_service_url}/)
-          .to_return(body: open(validator_res).read)
+          .to_return(body: File.open(validator_res).read)
         name = 'html5-fail'
         file = File.join('test', 'data', "#{name}.html")
         page = FakePage.new(name,
-                            body: open(file).read,
+                            body: File.open(file).read,
                             content_type: 'text/html')
         @html5_page = @http.get_page(page.url)
       end
@@ -82,8 +84,8 @@ describe ValidateWebsite::Validator do
           validator = subject.new(@html5_page.doc,
                                   @html5_page.body,
                                   html5_validator: :nu)
-          validator.valid?.must_equal false
-          validator.errors.size.must_equal 3
+          _(validator.valid?).must_equal false
+          _(validator.errors.size).must_equal 3
         end
 
         it 'should exclude errors ignored by :ignore option' do
@@ -92,8 +94,8 @@ describe ValidateWebsite::Validator do
                                   @html5_page.body,
                                   ignore: ignore,
                                   html5_validator: :nu)
-          validator.valid?.must_equal false
-          validator.errors.size.must_equal 1
+          _(validator.valid?).must_equal false
+          _(validator.errors.size).must_equal 1
         end
       end
 
@@ -101,8 +103,8 @@ describe ValidateWebsite::Validator do
         it 'should have an array of errors' do
           validator = subject.new(@html5_page.doc,
                                   @html5_page.body)
-          validator.valid?.must_equal false
-          validator.errors.size.must_equal 3
+          _(validator.valid?).must_equal false
+          _(validator.errors.size).must_equal 3
         end
 
         it 'should exclude errors ignored by :ignore option' do
@@ -110,8 +112,8 @@ describe ValidateWebsite::Validator do
           validator = subject.new(@html5_page.doc,
                                   @html5_page.body,
                                   ignore: ignore)
-          validator.valid?.must_equal false
-          validator.errors.size.must_equal 2
+          _(validator.valid?).must_equal false
+          _(validator.errors.size).must_equal 2
         end
       end
     end
@@ -122,13 +124,13 @@ describe ValidateWebsite::Validator do
       name = 'html4-strict'
       file = File.join('test', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          body: open(file).read,
+                          body: File.open(file).read,
                           content_type: 'text/html')
       @html4_strict_page = @http.get_page(page.url)
       validator = subject.new(@html4_strict_page.doc,
                               @html4_strict_page.body)
       validator.valid?
-      validator.errors.must_equal []
+      _(validator.errors).must_equal []
     end
   end
 end

data/test/webmock_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'webmock/minitest'
 
 # FakePage html helper for webmock
@@ -27,8 +29,8 @@ class FakePage
 
   def create_body
     @body = '<html><body>'
-    @links.each { |l| @body += "<a href=\"#{TEST_DOMAIN}#{l}\"></a>" } if @links
-    @hrefs.each { |h| @body += "<a href=\"#{h}\"></a>" } if @hrefs
+    @links&.each { |l| @body += "<a href=\"#{TEST_DOMAIN}#{l}\"></a>" }
+    @hrefs&.each { |h| @body += "<a href=\"#{h}\"></a>" }
     @body += '</body></html>'
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validate-website
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.10.0
 platform: ruby
 authors:
 - Laurent Arnoud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crass
@@ -114,28 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: minitest-focus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.0
+        version: 0.72.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.0
+        version: 0.72.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -273,15 +259,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Web crawler for checking the validity of your documents