validate-website 0.9.0 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c6d263126db73e28c33fddb7ba58358f522d305
-  data.tar.gz: bc4d5405e1872d425dea1691456159d523b9c2d2
+  metadata.gz: e99e7c0d34cdd411b03d1a8a0990ae75f029a1b8
+  data.tar.gz: 601f3a5c01cba46f473a4cead89f10908e2e4d6b
 SHA512:
-  metadata.gz: 3039cb7c6d5082a2d69915ddf2c1d102362049e5297899eb2aeba0b8b493edc32301aa3803a20411bbfb82bbb9fe05cbebc514083ae1aef9ae954769cd308521
-  data.tar.gz: 14682a11d7e68083aefecd1ab2ca978de5c3d257f0a8d6d5bcacf4427586f5814947f7ea0c3b52bd821d72c3e4dbc0803ae9c950b629576fa10bf05facec1758
+  metadata.gz: 833b02e5cdb8f91f314042c1db35e4f5dcd1ca17347d6bce93a31ba329424b97ad80caf13d6fcfb4ccf12f78a2618bbdcf7e17a89b7b9c440bc52e4b6fdcad9d
+  data.tar.gz: 96cc9f5b765251133c82d5525fcc1a5b1232aef251c76f2a65810f5d721d20bd1ae4dc3d158159726fcc6d1a3efdfbfa0c2688c2b1b3fd6aff0f9d8bf7eb4da2

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rdoc/task'
 require 'rake/testtask'
 
-task :default => [:test]
+task default: [:test]
 
 RDoc::Task.new do |rd|
   rd.main = "README.rdoc"
@@ -17,4 +17,4 @@ end
 Rake::TestTask.new do |t|
   t.pattern = "spec/*_spec.rb"
 end
-task :spec => :test
+task spec: :test

data/lib/validate_website/colorful_messages.rb

@@ -4,7 +4,7 @@ require 'paint'
 module ValidateWebsite
   # Internal helper for colorful messages
   module ColorfulMessages
-    def color(type, message, colored=true)
+    def color(type, message, colored = true)
       return message unless colored
       send(type, message)
     end

data/lib/validate_website/core.rb

@@ -10,10 +10,8 @@ require 'validate_website/colorful_messages'
 require 'spidr'
 
 module ValidateWebsite
-
   # Core class for static or website validation
   class Core
-
     attr_accessor :site
     attr_reader :options, :crawler
 
@@ -26,7 +24,7 @@ module ValidateWebsite
 
     PING_URL = 'http://www.google.com/'
 
-    def initialize(options={}, validation_type=:crawl)
+    def initialize(options = {}, validation_type = :crawl)
       @markup_error = nil
       @not_found_error = nil
 
@@ -50,9 +48,9 @@ module ValidateWebsite
     #   :markup_validation [Boolean] Check the markup validity
     #   :not_found [Boolean] Check for not found page (404)
     #
-    def crawl(opts={})
+    def crawl(opts = {})
       opts = @options.merge(opts)
-      opts.merge!(:ignore_links => Regexp.new(opts[:exclude])) if opts[:exclude]
+      opts.merge!(ignore_links: Regexp.new(opts[:exclude])) if opts[:exclude]
 
       puts color(:note, "validating #{@site}", opts[:color]) unless opts[:quiet]
       puts color(:warning, "No internet connection") unless internet_connection?
@@ -77,7 +75,7 @@ module ValidateWebsite
         crawler.every_failed_url do |url|
           if opts[:not_found]
             @not_found_error = true
-            puts color(:error, "%s linked but not exist" % [url], opts[:color])
+            puts color(:error, "#{url} linked but not exist", opts[:color])
             to_file(url)
           end
         end
@@ -90,8 +88,7 @@ module ValidateWebsite
       false
     end
 
-
-    def crawl_static(opts={})
+    def crawl_static(opts = {})
       opts = @options.merge(opts)
       puts color(:note, "validating #{@site}", opts[:color])
 
@@ -126,39 +123,39 @@ module ValidateWebsite
     private
 
     def to_file(msg)
-      if @file && File.exist?(@file)
-        open(@file, 'a').write("#{msg}\n")
-      end
+      return unless @file
+      open(@file, 'a').write("#{msg}\n") if File.exist?(@file)
     end
 
     # check files linked on static document
     # see lib/validate_website/runner.rb
-    def check_static_not_found(links, opts={})
-      opts = @options.merge(opts)
+    def check_static_not_found(links)
       links.each do |l|
         file_location = URI.parse(File.join(Dir.getwd, l.path)).path
+        not_found_error and next unless File.exist?(file_location)
         # Check CSS url()
-        if File.exists?(file_location) && File.extname(file_location) == '.css'
+        if File.extname(file_location) == '.css'
           response = fake_http_response(open(file_location).read, ['text/css'])
           css_page = Spidr::Page.new(l, response)
           links.concat extract_urls_from_css(css_page)
           links.uniq!
         end
-        unless File.exists?(file_location)
-          @not_found_error = true
-          puts color(:error, "%s linked but not exist" % file_location, opts[:color])
-          to_file(file_location)
-        end
       end
     end
 
+    def not_found_error
+      @not_found_error = true
+      puts color(:error, "#{file_location} linked but not exist", @options[:color])
+      to_file(file_location)
+    end
+
     # Extract urls from CSS page
     #
     # @param [Spidr::Page] an Spidr::Page object
     # @return [Array] Lists of urls
     #
     def extract_urls_from_css(page)
-      page.body.scan(/url\((['".\/\w-]+)\)/).inject(Set[]) do |result, url|
+      page.body.scan(/url\((['".\/\w-]+)\)/).reduce(Set[]) do |result, url|
         url = url.first.gsub("'", "").gsub('"', '')
         abs = page.to_absolute(URI.parse(url))
         result << abs
@@ -171,7 +168,7 @@ module ValidateWebsite
     # @return [Array] Lists of urls
     #
     def extract_imgs_from_page(page)
-      page.doc.search('//img[@src]').inject(Set[]) do |result, elem|
+      page.doc.search('//img[@src]').reduce(Set[]) do |result, elem|
         u = elem.attributes['src']
         result << page.to_absolute(URI.parse(u))
       end
@@ -185,12 +182,15 @@ module ValidateWebsite
     #   :quiet no output (true, false)
     #   :color color output (true, false)
     #
-    def validate(doc, body, url, opts={})
+    def validate(doc, body, url, opts = {})
       opts = @options.merge(opts)
       validator = Validator.new(doc, body, opts)
-      msg = " well formed? %s" % validator.valid?
+      msg = " well formed? #{validator.valid?}"
+      # TODO: create a formatter
       if validator.valid?
-        unless opts[:quiet]
+        if opts[:quiet]
+          print color(:success, '.', opts[:color]) # rspec style
+        else
           print color(:info, url, opts[:color])
           puts color(:success, msg, opts[:color])
         end
@@ -198,7 +198,7 @@ module ValidateWebsite
         @markup_error = true
         print color(:info, url, opts[:color])
         puts color(:error, msg, opts[:color])
-        puts color(:error, validator.errors.join(', '), opts[:color]) if opts[:validate_verbose]
+        puts color(:error, validator.errors.join(', '), opts[:color]) if opts[:verbose]
         to_file(url)
       end
     end
@@ -209,7 +209,7 @@ module ValidateWebsite
     # @param [String] response body
     # @param [Array] content types
     # @return [Net::HTTPResponse] fake http response
-    def fake_http_response(body, content_types=['text/html', 'text/xhtml+xml'])
+    def fake_http_response(body, content_types = ['text/html', 'text/xhtml+xml'])
       response = Net::HTTPResponse.new '1.1', 200, 'OK'
       response.instance_variable_set(:@read, true)
       response.body = body

data/lib/validate_website/option_parser.rb

@@ -5,39 +5,40 @@ module ValidateWebsite
   # Internal class for parse command line args
   class Parser
     DEFAULT_OPTS_ALL = {
-      :markup_validation => true,
+      markup_validation: true,
       # crawler: log not found url (404 status code)
-      # static: log not found url (not on filesystem, pwd considered as root « / »)
-      :not_found         => false,
-      :quiet             => false,
-      :file              => nil,
+      # static: log not found url (not on filesystem, `pwd` considered
+      # as root « / »)
+      not_found: false,
+      quiet: false,
+      file: nil,
       # regex to ignore certain validation errors
-      :ignore_errors     => nil,
-      :color             => true,
+      ignore_errors: nil,
+      color: true,
       # internal verbose for ValidateWebsite
-      :validate_verbose  => false,
+      verbose: false,
     }
 
     DEFAULT_OPTS_CRAWL = {
-      :site              => 'http://localhost:3000/',
-      :exclude           => nil,
+      site: 'http://localhost:3000/',
+      exclude: nil,
     }.merge(DEFAULT_OPTS_ALL)
 
     DEFAULT_OPTS_STATIC = {
-      :site              => 'http://www.example.com/',
-      :pattern           => '**/*.html',
+      site: 'http://www.example.com/',
+      pattern: '**/*.html',
     }.merge(DEFAULT_OPTS_ALL)
 
     def self.parse(options, type)
       if const_defined?("DEFAULT_OPTS_#{type.to_s.upcase}")
-        @@default_opts = const_get("DEFAULT_OPTS_#{type.to_s.upcase}")
+        @default_opts = const_get("DEFAULT_OPTS_#{type.to_s.upcase}")
         if Array === options
           send("command_line_parse_#{type}", options)
         else
-          @@default_opts.merge(options)
+          @default_opts.merge(options)
         end
       else
-        raise ArgumentError, "Unknown options type : #{type}"
+        fail ArgumentError, "Unknown options type : #{type}"
       end
     end
 
@@ -46,12 +47,12 @@ module ValidateWebsite
       opts = OptionParser.new do |o|
         o.set_summary_indent('  ')
         o.banner =    'Usage: validate-website [OPTIONS]'
-        o.define_head 'validate-website - Web crawler for checking the ' +
-          'validity of your documents'
-        o.separator   ''
+        o.define_head %(validate-website - Web crawler for checking the \
+validity of your documents)
+        o.separator ''
 
         o.on("-s", "--site 'SITE'", String,
-             "Website to crawl (Default: #{@@default_opts[:site]})") { |v|
+             "Website to crawl (Default: #{@default_opts[:site]})") { |v|
           options[:site] = v
         }
         o.on("-u", "--user-agent 'USERAGENT'", String,
@@ -73,7 +74,8 @@ module ValidateWebsite
         }
 
         o.on("-m", "--[no-]markup-validation",
-             "Markup validation (Default: #{@@default_opts[:markup_validation]})") { |v|
+             %(Markup validation \
+(Default: #{@default_opts[:markup_validation]}))) { |v|
           options[:markup_validation] = v
         }
         o.on("-i", "--ignore-errors 'IGNORE'", String,
@@ -81,24 +83,28 @@ module ValidateWebsite
           options[:ignore_errors] = v
         }
         o.on("-n", "--not-found",
-             "Log not found url (Default: #{@@default_opts[:not_found]})") { |v|
+             "Log not found url (Default: #{@default_opts[:not_found]})") { |v|
           options[:not_found] = v
         }
         o.on("--[no-]color",
-             "Show colored output (Default: #{@@default_opts[:color]})") { |v|
+             "Show colored output (Default: #{@default_opts[:color]})") { |v|
           options[:color] = v
         }
         o.on("-v", "--verbose",
-             "Show validator errors (Default: #{@@default_opts[:validate_verbose]})") { |v|
-          options[:validate_verbose] = v
+             %(Show validator errors \
+(Default: #{@default_opts[:verbose]}))) { |v|
+          options[:verbose] = v
         }
         o.on("-q", "--quiet",
-             "Only report errors (Default: #{@@default_opts[:quiet]})") { |v|
+             "Only report errors (Default: #{@default_opts[:quiet]})") { |v|
           options[:quiet] = v
         }
 
         o.separator ""
-        o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
+        o.on_tail("-h", "--help", "Show this help message.") do
+          puts o
+          exit
+        end
       end
       command_line_parse!(opts, args, options)
     end
@@ -108,16 +114,18 @@ module ValidateWebsite
       opts = OptionParser.new do |o|
         o.set_summary_indent('  ')
         o.banner =    'Usage: validate-website-static [OPTIONS]'
-        o.define_head 'validate-website-static - check the validity of ' +
-          'your documents'
-        o.separator   ''
+        o.define_head %(validate-website-static - check the validity of \
+          your documents)
+        o.separator ''
 
         o.on("-s", "--site 'SITE'", String,
-             "Where static files will be hosted (Default: #{@@default_opts[:site]})") { |v|
+             %(Where static files will be hosted \
+(Default: #{@default_opts[:site]}))) { |v|
           options[:site] = v
         }
         o.on("-p", "--pattern 'PATTERN'", String,
-             "Change filenames pattern (Default: #{@@default_opts[:pattern]})") { |v|
+             %(Change filenames pattern \
+(Default: #{@default_opts[:pattern]}))) { |v|
           options[:pattern] = v.strip
         }
         o.on("-f", "--file 'FILE'", String,
@@ -130,19 +138,22 @@ module ValidateWebsite
         }
 
         o.on("-m", "--[no-]markup-validation",
-             "Markup validation (Default: #{@@default_opts[:markup_validation]})") { |v|
+             %(Markup validation \
+(Default: #{@default_opts[:markup_validation]}))) { |v|
           options[:markup_validation] = v
         }
         o.on("-n", "--not-found",
-             "Log files not on filesystem, pwd considered as root « / » (Default: #{@@default_opts[:not_found]})") { |v|
+             %(Log files not on filesystem, pwd considered as root « / » \
+(Default: #{@default_opts[:not_found]}))) { |v|
           options[:not_found] = v
         }
         o.on("-v", "--verbose",
-             "Show validator errors (Default: #{@@default_opts[:validate_verbose]})") { |v|
-          options[:validate_verbose] = v
+             %(Show validator errors \
+(Default: #{@default_opts[:verbose]}))) { |v|
+          options[:verbose] = v
         }
         o.on("-q", "--quiet",
-             "Only report errors (Default: #{@@default_opts[:quiet]})") { |v|
+             "Only report errors (Default: #{@default_opts[:quiet]})") { |v|
           options[:quiet] = v
         }
       end
@@ -150,14 +161,12 @@ module ValidateWebsite
     end
 
     def self.command_line_parse!(opts, args, options)
-      begin
-        opts.parse!(args)
-      rescue OptionParser::InvalidOption, OptionParser::MissingArgument
-        puts $!.to_s
-        puts opts
-        exit 128
-      end
-      @@default_opts.merge(options)
+      opts.parse!(args)
+      @default_opts.merge(options)
+    rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+      puts $ERROR_INFO.to_s
+      puts opts
+      exit 128
     end
   end
 end

data/lib/validate_website/validator.rb

@@ -5,7 +5,7 @@ require 'nokogiri'
 module ValidateWebsite
   # Document validation from DTD or XSD (webservice for html5)
   class Validator
-    XHTML_PATH = File.join(File.dirname(__FILE__), '..', '..', 'data', 'schemas')
+    XHTML_PATH = File.expand_path('../../../data/schemas', __FILE__)
     HTML5_VALIDATOR_SERVICE = 'http://html5.validator.nu/'
 
     attr_reader :original_doc, :body, :dtd, :doc, :namespace, :xsd, :errors
@@ -13,7 +13,7 @@ module ValidateWebsite
     ##
     # @param [Nokogiri::HTML::Document] original_doc
     # @param [String] The raw HTTP response body of the page
-    def initialize(original_doc, body, opts={})
+    def initialize(original_doc, body, opts = {})
       @original_doc = original_doc
       @body = body
       @options = opts
@@ -38,15 +38,14 @@ module ValidateWebsite
     end
 
     private
+
     def init_namespace(dtd)
-      if dtd.system_id
-        dtd_uri = URI.parse(dtd.system_id)
-        if dtd.system_id && dtd_uri.path
-          @dtd_uri = dtd_uri
-          # http://www.w3.org/TR/xhtml1/#dtds
-          @namespace = File.basename(@dtd_uri.path, '.dtd')
-        end
-      end
+      return unless dtd.system_id
+      dtd_uri = URI.parse(dtd.system_id)
+      return unless dtd_uri.path
+      @dtd_uri = dtd_uri
+      # http://www.w3.org/TR/xhtml1/#dtds
+      @namespace = File.basename(@dtd_uri.path, '.dtd')
     end
 
     def find_errors
@@ -65,7 +64,7 @@ module ValidateWebsite
 
       # http://www.w3.org/TR/xhtml1-schema/
       @xsd = Dir.chdir(XHTML_PATH) do
-        if @namespace && File.exists?(@namespace + '.xsd')
+        if @namespace && File.exist?(@namespace + '.xsd')
           Nokogiri::XML::Schema(File.read(@namespace + '.xsd'))
         end
       end
@@ -91,13 +90,13 @@ module ValidateWebsite
       require 'net/http'
       require 'multipart_body'
       url = URI.parse(HTML5_VALIDATOR_SERVICE)
-      multipart = MultipartBody.new(:content => document)
+      multipart = MultipartBody.new(content: document)
       http = Net::HTTP.new(url.host)
       headers = {
         'Content-Type' => "multipart/form-data; boundary=#{multipart.boundary}",
         'Content-Length' => multipart.to_s.bytesize.to_s,
       }
-      res = http.start {|con| con.post(url.path, multipart.to_s, headers) }
+      res = http.start { |con| con.post(url.path, multipart.to_s, headers) }
       @errors = Nokogiri::HTML(res.body).css('ol li.error').map(&:content)
     end
   end

data/spec/core_spec.rb

@@ -5,9 +5,17 @@ describe ValidateWebsite::Core do
 
   before do
     WebMock.reset!
-    stub_request(:get, ValidateWebsite::Core::PING_URL).to_return(:status => 200)
-    stub_request(:get, /#{SPEC_DOMAIN}/).to_return(:status => 200)
-    @validate_website = ValidateWebsite::Core.new(:color => false)
+    stub_request(:get, ValidateWebsite::Core::PING_URL).to_return(status: 200)
+    stub_request(:get, /#{SPEC_DOMAIN}/).to_return(status: 200)
+    @validate_website = ValidateWebsite::Core.new(color: false)
+  end
+
+  describe 'invalid options' do
+    it 'raise ArgumentError on wrong validation_type' do
+      proc {
+        ValidateWebsite::Core.new({ color: false }, :fail)
+      }.must_raise ArgumentError
+    end
   end
 
   describe('html') do
@@ -15,10 +23,10 @@ describe ValidateWebsite::Core do
       name = 'xhtml1-strict'
       file = File.join('spec', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          :body => open(file).read,
-                          :content_type => 'text/html')
+                          body: open(file).read,
+                          content_type: 'text/html')
       @validate_website.site = page.url
-      @validate_website.crawl(:quiet => true)
+      @validate_website.crawl(quiet: true)
       @validate_website.crawler.history.size.must_equal 5
     end
 
@@ -26,10 +34,10 @@ describe ValidateWebsite::Core do
       name = 'html4-strict'
       file = File.join('spec', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          :body => open(file).read,
-                          :content_type => 'text/html')
+                          body: open(file).read,
+                          content_type: 'text/html')
       @validate_website.site = page.url
-      @validate_website.crawl(:quiet => true)
+      @validate_website.crawl(quiet: true)
       @validate_website.crawler.history.size.must_equal 98
     end
   end
@@ -37,31 +45,31 @@ describe ValidateWebsite::Core do
   describe('css') do
     it "crawl css and extract url" do
       page = FakePage.new('test.css',
-                          :body => ".test {background-image: url(pouet);}
-                                    .tests {background-image: url(/image/pouet.png)}
-                                    .tests {background-image: url(/image/pouet_42.png)}
-                                    .tests {background-image: url(/image/pouet)}",
-                                    :content_type => 'text/css')
+                          body: '.t {background-image: url(pouet);}
+                                 .t {background-image: url(/image/pouet.png)}
+                                 .t {background-image: url(/image/pouet_42.png)}
+                                 .t {background-image: url(/image/pouet)}',
+                          content_type: 'text/css')
       @validate_website.site = page.url
-      @validate_website.crawl(:quiet => true)
+      @validate_website.crawl(quiet: true)
       @validate_website.crawler.history.size.must_equal 5
     end
 
     it "should extract url with single quote" do
       page = FakePage.new('test.css',
-                          :body => ".test {background-image: url('pouet');}",
-                          :content_type => 'text/css')
+                          body: ".test {background-image: url('pouet');}",
+                          content_type: 'text/css')
       @validate_website.site = page.url
-      @validate_website.crawl(:quiet => true)
+      @validate_website.crawl(quiet: true)
       @validate_website.crawler.history.size.must_equal 2
     end
 
     it "should extract url with double quote" do
       page = FakePage.new('test.css',
-                          :body => ".test {background-image: url(\"pouet\");}",
-                          :content_type => 'text/css')
+                          body: ".test {background-image: url(\"pouet\");}",
+                          content_type: 'text/css')
       @validate_website.site = page.url
-      @validate_website.crawl(:quiet => true)
+      @validate_website.crawl(quiet: true)
       @validate_website.crawler.history.size.must_equal 2
     end
   end
@@ -69,11 +77,11 @@ describe ValidateWebsite::Core do
   describe('static') do
     it 'no space in directory name' do
       pattern = File.join(File.dirname(__FILE__), 'example/**/*.html')
-      @validate_website.crawl_static(:pattern => pattern,
-                                     :site => 'http://dev.af83.com/',
-                                     :markup_validation => false,
-                                     :not_found => false,
-                                     :quiet => true)
+      @validate_website.crawl_static(pattern: pattern,
+                                     site: 'http://dev.af83.com/',
+                                     markup_validation: false,
+                                     not_found: false,
+                                     quiet: true)
     end
   end
 end

data/spec/validator_spec.rb

@@ -13,10 +13,11 @@ describe ValidateWebsite::Validator do
       dtd_uri = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
       file = File.join('spec', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          :body => open(file).read,
-                          :content_type => 'text/html')
+                          body: open(file).read,
+                          content_type: 'text/html')
       @xhtml1_page = @http.get_page(page.url)
-      validator = ValidateWebsite::Validator.new(@xhtml1_page.doc, @xhtml1_page.body)
+      validator = ValidateWebsite::Validator.new(@xhtml1_page.doc,
+                                                 @xhtml1_page.body)
       validator.dtd.system_id.must_equal dtd_uri
       validator.namespace.must_equal name
       validator.valid?.must_equal true
@@ -28,26 +29,28 @@ describe ValidateWebsite::Validator do
       before do
         validator_res = File.join('spec', 'data', 'validator.nu-success.html')
         stub_request(:any, ValidateWebsite::Validator::HTML5_VALIDATOR_SERVICE)
-          .to_return(:body => open(validator_res).read)
+          .to_return(body: open(validator_res).read)
       end
       it "html5 should be valid" do
         name = 'html5'
         file = File.join('spec', 'data', "#{name}.html")
         page = FakePage.new(name,
-                            :body => open(file).read,
-                            :content_type => 'text/html')
+                            body: open(file).read,
+                            content_type: 'text/html')
         @html5_page = @http.get_page(page.url)
-        validator = ValidateWebsite::Validator.new(@html5_page.doc, @html5_page.body)
+        validator = ValidateWebsite::Validator.new(@html5_page.doc,
+                                                   @html5_page.body)
         validator.valid?.must_equal true
       end
       it "with DLFP" do
         name = 'html5'
         file = File.join('spec', 'data', "#{name}-linuxfr.html")
         page = FakePage.new(name,
-                            :body => open(file).read,
-                            :content_type => 'text/html')
+                            body: open(file).read,
+                            content_type: 'text/html')
         @html5_page = @http.get_page(page.url)
-        validator = ValidateWebsite::Validator.new(@html5_page.doc, @html5_page.body)
+        validator = ValidateWebsite::Validator.new(@html5_page.doc,
+                                                   @html5_page.body)
         validator.valid?.must_equal true
       end
     end
@@ -55,23 +58,27 @@ describe ValidateWebsite::Validator do
       before do
         validator_res = File.join('spec', 'data', 'validator.nu-failure.html')
         stub_request(:any, ValidateWebsite::Validator::HTML5_VALIDATOR_SERVICE)
-          .to_return(:body => open(validator_res).read)
+          .to_return(body: open(validator_res).read)
         name = 'html5'
         file = File.join('spec', 'data', "#{name}-linuxfr.html")
         page = FakePage.new(name,
-                            :body => open(file).read,
-                            :content_type => 'text/html')
+                            body: open(file).read,
+                            content_type: 'text/html')
         @html5_page = @http.get_page(page.url)
       end
 
       it 'should have an array of errors' do
-        validator = ValidateWebsite::Validator.new(@html5_page.doc, @html5_page.body)
+        validator = ValidateWebsite::Validator.new(@html5_page.doc,
+                                                   @html5_page.body)
         validator.valid?.must_equal false
         validator.errors.size.must_equal 38
       end
 
       it 'should exclude errors ignored by :ignore_errors option' do
-        validator = ValidateWebsite::Validator.new(@html5_page.doc, @html5_page.body, :ignore_errors => "The nowrap attribute on the td element is obsolete")
+        ignore = "The nowrap attribute on the td element is obsolete"
+        validator = ValidateWebsite::Validator.new(@html5_page.doc,
+                                                   @html5_page.body,
+                                                   ignore_errors: ignore)
         validator.valid?.must_equal false
         validator.errors.size.must_equal 36
       end
@@ -83,10 +90,11 @@ describe ValidateWebsite::Validator do
       name = 'html4-strict'
       file = File.join('spec', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          :body => open(file).read,
-                          :content_type => 'text/html')
+                          body: open(file).read,
+                          content_type: 'text/html')
       @html4_strict_page = @http.get_page(page.url)
-      validator = ValidateWebsite::Validator.new(@html4_strict_page.doc, @html4_strict_page.body)
+      validator = ValidateWebsite::Validator.new(@html4_strict_page.doc,
+                                                 @html4_strict_page.body)
       validator.valid?.must_equal true
     end
   end

data/spec/webmock_helper.rb

@@ -10,8 +10,8 @@ class FakePage
 
   def initialize(name = '', options = {})
     @name = name
-    @links = [options[:links]].flatten if options.has_key?(:links)
-    @hrefs = [options[:hrefs]].flatten if options.has_key?(:hrefs)
+    @links = [options[:links]].flatten if options.key?(:links)
+    @hrefs = [options[:hrefs]].flatten if options.key?(:hrefs)
     @content_type = options[:content_type] || "text/html"
     @body = options[:body]
 
@@ -27,13 +27,13 @@ class FakePage
 
   def create_body
     @body = "<html><body>"
-    @links.each{|l| @body += "<a href=\"#{SPEC_DOMAIN}#{l}\"></a>"} if @links
-    @hrefs.each{|h| @body += "<a href=\"#{h}\"></a>"} if @hrefs
+    @links.each { |l| @body += "<a href=\"#{SPEC_DOMAIN}#{l}\"></a>" } if @links
+    @hrefs.each { |h| @body += "<a href=\"#{h}\"></a>" } if @hrefs
     @body += "</body></html>"
   end
 
   def add_to_webmock
-    options = {body: @body, headers: { 'Content-Type' => @content_type }}
+    options = { body: @body, headers: { 'Content-Type' => @content_type } }
     stub_request(:get, url).to_return(options)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validate-website
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.5
 platform: ruby
 authors:
 - Laurent Arnoud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spidr