validate-website 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f63d4c84f653035be69262c33ccad0025c48013492b653882a803f7d110e717f
-  data.tar.gz: fdf8e994af98a8dbff7411dd480b88f759009a70b5b5c1fcde15120b5db1ad02
+  metadata.gz: e75c6ffc6e4b8087ecdeff96f028c95aec4d7a145f36e8b7f1290aac2958a711
+  data.tar.gz: 8e57b037034aa7e20cbba2f420f478dd66bb362b40a592a6d8c375994144fd64
 SHA512:
-  metadata.gz: 6b0774aaab6ca32e10d43cfc0dd6c57219cc9e3862af5febd892a30884920195512301f702e5af11459a55c8dde4eaa4238a09833b102924a8ca36c9deb8480f
-  data.tar.gz: c0cdf68b1486c2d15257d7fb07e8561f52054b5a234e46162a468b1ffdc6bbc26905563150ccab3053e78a15a70c59142a857afa1aaff7563a22279840752332
+  metadata.gz: 846ee7365d54a843644857244af7a6c9a1616f080a667b0dbcf5aa6fc17047d4c6902b15eacf6f88ee514466963f0899d31b60d5038c0c9a2147db1083de6186
+  data.tar.gz: fcc0f3f832bf725e6b2b464d500ee19663c928999a60f038298c72fe96cc0d32c06d0c58a6e8d8f2b10e6f4cc652e1cd9c0e5ac42ad6ac596c27a822edf69649

data/History.md

@@ -1,4 +1,27 @@
 
+1.12.0 / 2022-11-15
+===================
+
+  * Regen manpages
+  * Bump year
+  * Fix lint Metrics/AbcSize on check_page
+  * Fix test/static_test.rb with relative path
+  * Add relative link test fail
+  * Fix test/static_test.rb with relative path
+  * Nokigumbo is merged into nokogiri 1.12~
+
+1.11.1 / 2021-01-10
+===================
+
+  * Add nokogumbo doc
+  * nokogumbo support for ruby engine
+  * Add support for nokogumbo
+  * Add jruby to github actions
+  * Merge pull request #24 from @marocchino / patch-1
+    * Some minor improvements
+  * Remove travis ci
+  * Init github actions ci
+
 1.11.0 / 2021-01-08
 ===================
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2021 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2009-2022 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

@@ -95,6 +95,11 @@ If the libtidy5 is found on your system this will be the default to validate
 your html5 document. This does not depend on a tier service everything is done
 locally.
 
+#### nokogiri
+
+nokogiri can validate html5 document without tier service but reports less
+errors than tidy.
+
 #### Validator.nu web service
 
 When `--html5-validator nu` option is used HTML5 support is done by using the
@@ -145,7 +150,7 @@ See [GitHub](https://github.com/spk/validate-website/graphs/contributors).
 
 The MIT License
 
-Copyright (c) 2009-2021 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2009-2022 Laurent Arnoud <laurent@spkdev.net>
 
 ---
 [![Build](https://img.shields.io/gitlab/pipeline/spkdev/validate-website/master)](https://gitlab.com/spkdev/validate-website/-/commits/master)

data/lib/validate_website/option_parser.rb

@@ -56,7 +56,7 @@ module ValidateWebsite
       opt.regexp('-i', '--ignore',
                  'Validation errors to ignore (ex: "valign|autocorrect")')
       opt.string('-x', '--html5-validator',
-                 'Change default html5 validator engine (ex: tidy or nu)',
+                 'Change default html5 validator engine (tidy/nu/nokogiri)',
                  default: DEFAULT_OPTIONS[:html5_validator])
       opt.string('-5', '--html5-validator-service-url',
                  'Change default html5 validator service URL for "nu" engine')

data/lib/validate_website/static.rb

@@ -61,17 +61,16 @@ module ValidateWebsite
     def check_page(file, page)
       if page.html? && options[:markup]
         keys = %i[ignore html5_validator]
-        # slice does not exists on Ruby <= 2.4
-        slice = Hash[[keys, options.values_at(*keys)].transpose]
+        slice = options.slice(*keys)
         validate(page.doc, page.body, file, slice)
       end
-      check_static_not_found(page.links) if options[:not_found]
+      check_static_not_found(page.links, page.url.to_s) if options[:not_found]
     end
 
     # check files linked on static document
     # see lib/validate_website/runner.rb
-    def check_static_not_found(links)
-      static_links = links.map { |l| StaticLink.new(l, @site) }
+    def check_static_not_found(links, site = @site)
+      static_links = links.map { |l| StaticLink.new(l, site) }
       static_links.each do |static_link|
         next unless static_link.check?
 

data/lib/validate_website/validator.rb

@@ -2,7 +2,7 @@
 
 require 'uri'
 
-require 'nokogiri'
+require 'nokogiri' unless ValidateWebsite.jruby?
 require 'w3c_validators'
 
 require 'validate_website/validator_class_methods'
@@ -112,8 +112,10 @@ module ValidateWebsite
     def html5_validate
       if html5_validator.to_sym == :tidy && self.class.tidy
         tidy_validate
-      else
+      elsif html5_validator.to_sym == :nu
         nu_validate
+      else
+        Nokogiri::HTML5(document, max_errors: -1).errors
       end
     end
 

data/lib/validate_website/version.rb

@@ -2,5 +2,9 @@
 
 # Version file for ValidateWebsite
 module ValidateWebsite
-  VERSION = '1.11.0'
+  VERSION = '1.12.0'
+
+  def self.jruby? # :nodoc:
+    defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+  end
 end

data/man/man1/validate-website-static.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: validate-website-static
 .\"    Author: [see the "AUTHOR(S)" section]
-.\" Generator: Asciidoctor 1.5.8
-.\"      Date: 2019-01-09
+.\" Generator: Asciidoctor 2.0.18
+.\"      Date: 2022-05-02
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "VALIDATE\-WEBSITE\-STATIC" "1" "2019-01-09" "\ \&" "\ \&"
+.TH "VALIDATE\-WEBSITE\-STATIC" "1" "2022-05-02" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -28,7 +28,7 @@
 .  LINKSTYLE blue R < >
 .\}
 .SH "NAME"
-validate\-website\-static \- check the validity of your documents
+validate-website-static \- check the validity of your documents
 .SH "SYNOPSIS"
 .sp
 \fBvalidate\-website\-static\fP [\fIOPTIONS\fP]
@@ -82,7 +82,7 @@ Show colored output (Default: true)
 .sp
 \fB\-x\fP, \fB\-\-html5\-validator\fP \fIVALIDATOR\fP
 .RS 4
-Change default html5 validator engine (ex: tidy or nu)
+Change default html5 validator engine (tidy/nu/nokogiri)
 .RE
 .sp
 \fB\-5\fP, \fB\-\-html5\-validator\-service\-url\fP \fIURL\fP

data/man/man1/validate-website.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: validate-website
 .\"    Author: [see the "AUTHOR(S)" section]
-.\" Generator: Asciidoctor 1.5.8
-.\"      Date: 2019-01-09
+.\" Generator: Asciidoctor 2.0.18
+.\"      Date: 2022-05-02
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "VALIDATE\-WEBSITE" "1" "2019-01-09" "\ \&" "\ \&"
+.TH "VALIDATE\-WEBSITE" "1" "2022-05-02" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -28,7 +28,7 @@
 .  LINKSTYLE blue R < >
 .\}
 .SH "NAME"
-validate\-website \- Web crawler for checking the validity of your documents
+validate-website \- Web crawler for checking the validity of your documents
 .SH "SYNOPSIS"
 .sp
 \fBvalidate\-website\fP [\fIOPTIONS\fP]
@@ -87,7 +87,7 @@ Show colored output (Default: true)
 .sp
 \fB\-x\fP, \fB\-\-html5\-validator\fP \fIVALIDATOR\fP
 .RS 4
-Change default html5 validator engine (ex: tidy or nu)
+Change default html5 validator engine (tidy/nu/nokogiri)
 .RE
 .sp
 \fB\-5\fP, \fB\-\-html5\-validator\-service\-url\fP \fIURL\fP

data/test/data/news/index.html

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<title>title</title>
+		<meta name="description" content="" />
+		<meta name="keywords" content="" />
+		<meta name="author" content="" />
+	</head>
+	<body>
+		<header>
+			<nav>
+				<ul>
+					<li><a href="ryzom-naissance-du-projet-libre-ryzom-forge.md" title="title">my url</a></li>
+				</ul>
+			</nav>
+		</header>
+	</body>
+</html>

data/test/static_test.rb

@@ -34,15 +34,14 @@ describe ValidateWebsite::Static do
   end
 
   it 'not found' do
-    pattern = File.join(File.dirname(__FILE__), '**/*.html')
     Dir.chdir('test/data') do
       _out, _err = capture_io do
-        @validate_website.crawl(pattern: pattern,
+        @validate_website.crawl(pattern: '**/*.html',
                                 site: 'https://linuxfr.org/',
                                 markup: false,
                                 not_found: true)
       end
-      _(@validate_website.not_founds_count).must_equal 213
+      _(@validate_website.not_founds_count).must_equal 210
     end
   end
 

data/test/validator_test.rb

@@ -79,7 +79,7 @@ describe ValidateWebsite::Validator do
         @html5_page = @http.get_page(page.url)
       end
 
-      describe('without tidy') do
+      describe('with nu') do
         it 'should have an array of errors' do
           validator = subject.new(@html5_page.doc,
                                   @html5_page.body,
@@ -99,8 +99,31 @@ describe ValidateWebsite::Validator do
         end
       end
 
+      describe('with nokogiri') do
+        it 'have an array of errors' do
+          skip('nokogiri dont support jruby') if ValidateWebsite.jruby?
+          validator = subject.new(@html5_page.doc,
+                                  @html5_page.body,
+                                  html5_validator: :nokogiri)
+          _(validator.valid?).must_equal false
+          _(validator.errors.size).must_equal 1
+        end
+
+        it 'exclude errors ignored by :ignore option' do
+          skip('nokogiri dont support jruby') if ValidateWebsite.jruby?
+          ignore = /That tag isn't allowed here/
+          validator = subject.new(@html5_page.doc,
+                                  @html5_page.body,
+                                  ignore: ignore,
+                                  html5_validator: :nokogiri)
+          _(validator.valid?).must_equal true
+          _(validator.errors.size).must_equal 0
+        end
+      end
+
       describe('with tidy') do
         it 'should have an array of errors' do
+          skip('tidy is not installed') unless ValidateWebsite::Validator.tidy
           validator = subject.new(@html5_page.doc,
                                   @html5_page.body)
           _(validator.valid?).must_equal false
@@ -108,6 +131,7 @@ describe ValidateWebsite::Validator do
         end
 
         it 'should exclude errors ignored by :ignore option' do
+          skip('tidy is not installed') unless ValidateWebsite::Validator.tidy
           ignore = /letter not allowed here|trimming empty/
           validator = subject.new(@html5_page.doc,
                                   @html5_page.body,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validate-website
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Laurent Arnoud
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crass
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +265,7 @@ files:
 - test/data/html4-strict.html
 - test/data/html5-fail.html
 - test/data/html5.html
+- test/data/news/index.html
 - test/data/news/ryzom-naissance-du-projet-libre-ryzom-forge.md
 - test/data/validator.nu-failure.json
 - test/data/validator.nu-success.json
@@ -265,7 +280,7 @@ homepage: http://github.com/spk/validate-website
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -280,12 +295,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.2
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: Web crawler for checking the validity of your documents
 test_files:
-- test/static_test.rb
 - test/core_test.rb
-- test/validator_test.rb
 - test/crawler_test.rb
+- test/static_test.rb
+- test/validator_test.rb