validate-website 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b148e551f237891330dc1ebbbdb8b2c1d60217d41aac7d682293f9b85f7e3d45
-  data.tar.gz: '068a9f8dde45e751498d69a903d9e23b8f38a68748ef7416863b8a1c73feacec'
+  metadata.gz: 5cd3346ce5ce02dd898df5bb28912dcf4c0d682278bdc4e6e2e7b05b4bdf8ef8
+  data.tar.gz: 7e10dd580a2da57dec3f648a57cd633fbbd6251493a064a2b4077b7fd910a9dc
 SHA512:
-  metadata.gz: 8cba9a25bc027cf5d9a309e6077b3228b8668a8f473b89113d518ddcccca7e86a486a3059d3b74401bd5e7130a28213a4bfa02117de24918d396838d51418672
-  data.tar.gz: 9d99666a222c2c2dd1de6aa551c9d572d8ef68f30e13bb809924a14502032bd0698ba10ef128acb48a11571bcad8ec41234dac7eb06968e0f8c091bca97643ce
+  metadata.gz: fa59986d8a2e40840807c6e43c58cc89fdb359e81cef7c3eb8b307bd08aa4b51c8168f26ea72de9783d1963cb0861e910780eb7e7d138f3f409d2505ee29d010
+  data.tar.gz: 0f73aae18879b13d7bbadc24a97cca5ca7178498eb060930b81c0059605c129cb25b27c6277b1724f7f364a125cccb8fdcc4ef03a69ee86fa588fd1bdf6d6edb

data/History.md

@@ -1,4 +1,12 @@
 
+1.9.0 / 2018-12-25
+==================
+
+  * Update deps paint; slop; webmock
+  * Remove Ruby 2.1 support
+  * Force nonet and disable substitute entities on xhtml parse
+  * Use coveralls for code coverage
+
 v1.8.1 / 2018-03-25
 ===================
 

data/README.md

@@ -11,9 +11,12 @@ Web crawler for checking the validity of your documents
 ### Debian
 
 ~~~ console
-apt install ruby-dev libxslt-dev libxml2-dev libtidy5
+apt install ruby-dev libxslt1-dev libxml2-dev
 ~~~
 
+If you want complete local validation look [tidy
+packages](https://binaries.html-tidy.org/)
+
 ### RubyGems
 
 ~~~ console
@@ -27,6 +30,15 @@ validate-website [OPTIONS]
 validate-website-static [OPTIONS]
 ~~~
 
+## Examples
+
+~~~ console
+validate-website -v -s https://www.ruby-lang.org/
+validate-website -v -x tidy -s https://www.ruby-lang.org/
+validate-website -v -x nu -s https://www.ruby-lang.org/
+validate-website -h
+~~~
+
 ## Description
 
 validate-website is a web crawler for checking the markup validity with XML
@@ -139,5 +151,5 @@ Copyright (c) 2009-2018 Laurent Arnoud <laurent@spkdev.net>
 [![Version](https://img.shields.io/gem/v/validate-website.svg)](https://rubygems.org/gems/validate-website)
 [![Documentation](https://img.shields.io/badge/doc-rubydoc-blue.svg)](http://www.rubydoc.info/gems/validate-website)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT "MIT")
-[![Code Climate](https://img.shields.io/codeclimate/github/spk/validate-website.svg)](https://codeclimate.com/github/spk/validate-website)
+[![Coverage Status](https://img.shields.io/coveralls/github/spk/validate-website.svg)](https://coveralls.io/github/spk/validate-website?branch=master)
 [![Inline docs](https://inch-ci.org/github/spk/validate-website.svg?branch=master)](http://inch-ci.org/github/spk/validate-website)

data/Rakefile

@@ -2,7 +2,9 @@ require 'rake/testtask'
 require 'rubocop/rake_task'
 require 'asciidoctor'
 
-task default: %i[test rubocop]
+default = %i[test]
+default << :rubocop unless RUBY_ENGINE == 'rbx'
+task default: default
 
 desc 'Update manpage from asciidoc file'
 task :manpage do

data/bin/validate-website

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

data/bin/validate-website-static

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

data/lib/validate_website/option_parser.rb

@@ -38,57 +38,57 @@ module ValidateWebsite
     end
 
     def self.default_args
-      Slop.parse do |o|
-        yield o if block_given?
-        markup_syntax(o)
-        boolean_options(o)
-        ignore_html5_options(o)
-        verbose_option(o)
-        version_help(o)
+      Slop.parse do |opt|
+        yield opt if block_given?
+        markup_syntax(opt)
+        boolean_options(opt)
+        ignore_html5_options(opt)
+        verbose_option(opt)
+        version_help(opt)
       end
     end
 
-    def self.ignore_html5_options(o)
-      o.regexp('-i', '--ignore',
-               'Validation errors to ignore (ex: "valign|autocorrect")')
-      o.string('-x', '--html5-validator',
-               'Change default html5 validator engine (ex: tidy or nu)',
-               default: DEFAULT_OPTIONS[:html5_validator])
-      o.string('-5', '--html5-validator-service-url',
-               'Change default html5 validator service URL for "nu" engine')
+    def self.ignore_html5_options(opt)
+      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)',
+                 default: DEFAULT_OPTIONS[:html5_validator])
+      opt.string('-5', '--html5-validator-service-url',
+                 'Change default html5 validator service URL for "nu" engine')
     end
 
-    def self.markup_syntax(o)
-      o.bool('-m', '--markup',
-             "Markup validation (default: #{DEFAULT_OPTIONS[:markup]})",
-             default: DEFAULT_OPTIONS[:markup])
-      o.bool('--css-syntax',
-             "Css validation (default: #{DEFAULT_OPTIONS[:css_syntax]})",
-             default: DEFAULT_OPTIONS[:css_syntax])
+    def self.markup_syntax(opt)
+      opt.bool('-m', '--markup',
+               "Markup validation (default: #{DEFAULT_OPTIONS[:markup]})",
+               default: DEFAULT_OPTIONS[:markup])
+      opt.bool('--css-syntax',
+               "Css validation (default: #{DEFAULT_OPTIONS[:css_syntax]})",
+               default: DEFAULT_OPTIONS[:css_syntax])
     end
 
-    def self.boolean_options(o)
-      o.bool('-n', '--not-found',
-             "Log not found url (default: #{DEFAULT_OPTIONS[:not_found]})",
-             default: DEFAULT_OPTIONS[:not_found])
-      o.bool('--color',
-             "Show colored output (default: #{DEFAULT_OPTIONS[:color]})",
-             default: DEFAULT_OPTIONS[:color])
+    def self.boolean_options(opt)
+      opt.bool('-n', '--not-found',
+               "Log not found url (default: #{DEFAULT_OPTIONS[:not_found]})",
+               default: DEFAULT_OPTIONS[:not_found])
+      opt.bool('--color',
+               "Show colored output (default: #{DEFAULT_OPTIONS[:color]})",
+               default: DEFAULT_OPTIONS[:color])
     end
 
-    def self.verbose_option(o)
-      o.bool('-v', '--verbose',
-             "Show validator errors (default: #{DEFAULT_OPTIONS[:verbose]})",
-             default: DEFAULT_OPTIONS[:verbose])
+    def self.verbose_option(opt)
+      opt.bool('-v', '--verbose',
+               "Show validator errors (default: #{DEFAULT_OPTIONS[:verbose]})",
+               default: DEFAULT_OPTIONS[:verbose])
     end
 
-    def self.version_help(o)
-      o.on('--version', 'Display version.') do
+    def self.version_help(opt)
+      opt.on('--version', 'Display version.') do
         puts ValidateWebsite::VERSION
         exit
       end
-      o.on('-h', '--help', 'Display this help message.') do
-        puts o
+      opt.on('-h', '--help', 'Display this help message.') do
+        puts opt
         exit
       end
     end
@@ -97,15 +97,15 @@ module ValidateWebsite
     # @params [ARGV]
     # @return [Hash]
     def self.command_line_parse_crawl(_args)
-      default_args do |o|
-        o.string('-s', '--site',
-                 "Website to crawl (default: #{DEFAULT_OPTIONS[:site]})",
-                 default: DEFAULT_OPTIONS[:site])
-        o.string('-u', '--user-agent',
-                 'Change user agent',
-                 default: DEFAULT_OPTIONS[:user_agent])
-        o.regexp('-e', '--exclude', 'Url to exclude (ex: "redirect|news")')
-        o.string('-c', '--cookies', 'Set defaults cookies')
+      default_args do |opt|
+        opt.string('-s', '--site',
+                   "Website to crawl (default: #{DEFAULT_OPTIONS[:site]})",
+                   default: DEFAULT_OPTIONS[:site])
+        opt.string('-u', '--user-agent',
+                   'Change user agent',
+                   default: DEFAULT_OPTIONS[:user_agent])
+        opt.regexp('-e', '--exclude', 'Url to exclude (ex: "redirect|news")')
+        opt.string('-c', '--cookies', 'Set defaults cookies')
       end
     end
 
@@ -113,14 +113,14 @@ module ValidateWebsite
     # @params [ARGV]
     # @return [Hash]
     def self.command_line_parse_static(_args)
-      default_args do |o|
-        o.string('-s', '--site',
-                 "Website to crawl (default: #{DEFAULT_OPTIONS[:site]})",
-                 default: DEFAULT_OPTIONS[:site])
-        o.string('-p', '--pattern',
-                 "Filename pattern (default: #{DEFAULT_OPTIONS[:pattern]})",
-                 default: DEFAULT_OPTIONS[:pattern])
-        o.regexp('-e', '--exclude', 'Url to exclude (ex: "redirect|news")')
+      default_args do |opt|
+        opt.string('-s', '--site',
+                   "Website to crawl (default: #{DEFAULT_OPTIONS[:site]})",
+                   default: DEFAULT_OPTIONS[:site])
+        opt.string('-p', '--pattern',
+                   "Filename pattern (default: #{DEFAULT_OPTIONS[:pattern]})",
+                   default: DEFAULT_OPTIONS[:pattern])
+        opt.regexp('-e', '--exclude', 'Url to exclude (ex: "redirect|news")')
       end
     end
   end

data/lib/validate_website/static.rb

@@ -20,11 +20,11 @@ module ValidateWebsite
       @site = @options[:site]
 
       files = Dir.glob(@options[:pattern])
-      files.each do |f|
-        next unless File.file?(f)
-        next if @options[:exclude].is_a?(Regexp) && @options[:exclude].match(f)
+      files.each do |file|
+        next unless File.file?(file)
+        next if @options[:exclude] && @options[:exclude].match(file)
         @history_count += 1
-        check_static_file(f)
+        check_static_file(file)
       end
       print_status_line(files.size, 0, @not_founds_count, @errors_count)
     end
@@ -47,15 +47,15 @@ module ValidateWebsite
 
     private
 
-    def check_static_file(f)
-      page = StaticLink.new(f, @site).page
-      check_page(f, page)
+    def check_static_file(file)
+      page = StaticLink.new(file, @site).page
+      check_page(file, page)
       check_css_syntax(page) if page.css? && options[:css_syntax]
     end
 
-    def check_page(f, page)
+    def check_page(file, page)
       if page.html? && options[:markup]
-        validate(page.doc, page.body, f, options[:ignore])
+        validate(page.doc, page.body, file, options[:ignore])
       end
       check_static_not_found(page.links) if options[:not_found]
     end

data/lib/validate_website/validator.rb

@@ -15,7 +15,7 @@ module ValidateWebsite
       attr_accessor :html5_validator_service_url
     end
 
-    XHTML_PATH = File.expand_path('../../../data/schemas', __FILE__)
+    XHTML_PATH = File.expand_path('../../data/schemas', __dir__)
 
     @xsd_schemas ||= {}
 
@@ -139,7 +139,7 @@ module ValidateWebsite
 
     def xhtml_doc
       Dir.chdir(XHTML_PATH) do
-        Nokogiri::XML(document) { |cfg| cfg.noent.dtdload.dtdvalid }
+        Nokogiri::XML(document) { |cfg| cfg.nonoent.dtdload.dtdvalid.nonet }
       end
     end
   end

data/lib/validate_website/version.rb

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

data/test/core_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('test_helper', __dir__)
 
 describe ValidateWebsite::Core do
   describe 'invalid options' do

data/test/crawler_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('test_helper', __dir__)
 
 # rubocop:disable Metrics/BlockLength
 describe ValidateWebsite::Crawl do

data/test/static_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('test_helper', __dir__)
 
 # rubocop:disable Metrics/BlockLength
 describe ValidateWebsite::Static do

data/test/test_helper.rb

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

data/test/validator_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('test_helper', __dir__)
 
 # rubocop:disable Metrics/BlockLength
 describe ValidateWebsite::Validator do

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: validate-website
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Laurent Arnoud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spidr
+  name: crass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: crass
+  name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: paint
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
-  name: w3c_validators
+  name: spidr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: tidy_ffi
   requirement: !ruby/object:Gem::Requirement
@@ -81,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: slop
+  name: w3c_validators
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -123,47 +123,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.58.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.58.0
 - !ruby/object:Gem::Dependency
-  name: asciidoctor
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.4'
 description: validate-website is a web crawler for checking the markup validity with
   XML Schema / DTD and not found urls.
 email: laurent@spkdev.net
@@ -259,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="