w3c_validators 1.2 → 1.3

data/test/test_exceptions.rb

@@ -14,22 +14,25 @@ class ExceptionTests < Test::Unit::TestCase
   end
 
   def test_bad_validator_uri
-    skip("Pending, broken")
-    ['http://noexist/', 'http://noexist.badtld/', 
-     'http://example.com/noexist'].each do |uri|
-      v = MarkupValidator.new(:validator_uri => uri)
-      assert_raise ValidatorUnavailable do
-        r = v.validate_text(@valid_fragment)
+    VCR.turned_off do
+      WebMock.allow_net_connect!
+      ['http://noexist/', 'http://noexist.badtld/',
+       'http://example.com/noexist'].each do |uri|
+        v = MarkupValidator.new(:validator_uri => uri)
+        assert_raise ValidatorUnavailable do
+          v.validate_text(@valid_fragment)
+        end
       end
+      WebMock.disable_net_connect!
     end
   end
 
   def test_bad_soap_response
-    skip("Pending, broken")
+    omit("Pending, broken")
     [].each do |uri|
       v = MarkupValidator.new(:validator_uri => uri)
       assert_raise ParsingError do
-        r = v.validate_text(@valid_fragment)
+        v.validate_text(@valid_fragment)
       end
     end
   end

data/test/test_feed_validator.rb

@@ -9,57 +9,60 @@ class FeedValidatorTests < Test::Unit::TestCase
   end
 
   def test_validating_uri_with_soap
-    skip("Pending, broken")
-    r = @v.validate_uri('http://code.dunae.ca/w3c_validators/test/invalid_feed.xml')
-    assert_errors r, 1
-    assert_warnings r, 1
+    VCR.use_cassette('feed_validating_uri_with_soap') do
+      r = @v.validate_uri('https://doc75.github.io/w3c_validators_tests/invalid_feed.xml')
+      assert_errors r, 1
+      assert_warnings r, 1
+    end
   end
  
   def test_validating_file
-    skip("Pending, broken")
-    file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/invalid_feed.xml')
-    r = @v.validate_file(file_path)
-    assert_errors r, 1
+    VCR.use_cassette('feed_validating_file') do
+      file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/invalid_feed.xml')
+      r = @v.validate_file(file_path)
+      assert_errors r, 1
+    end
   end
  
   def test_validating_text
-    skip("Pending, broken")
-    fragment = <<-EOT
-    <?xml version="1.0" encoding="utf-8"?>
-    <feed xmlns="http://www.w3.org/2005/Atom">
-     <title>Example Feed</title>
-     <subtitle>A subtitle.</subtitle>
-     <link href="http://example.org/feed/" rel="self"/>
-     <link href="http://example.org/"/>
-     <updated>2003-12-13T18:30:02Z</updated>
-     <author>
-       <email>johndoe@example.com</email>
-     </author>
-     <id>urn:uuid:60a76c80-d399-11d9-b91C-0003939e0af6</id>
-     <entry>
-       <title>Atom-Powered Robots Run Amok</title>
-       <link href="http://example.org/2003/12/13/atom03"/>
-       <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+    VCR.use_cassette('feed_validating_text') do
+      fragment = <<-EOT
+      <?xml version="1.0" encoding="utf-8"?>
+      <feed xmlns="http://www.w3.org/2005/Atom">
+       <title>Example Feed</title>
+       <subtitle>A subtitle.</subtitle>
+       <link href="http://example.org/feed/" rel="self"/>
+       <link href="http://example.org/"/>
        <updated>2003-12-13T18:30:02Z</updated>
-       <summary>Some text.</summary>
-     </entry>
-    </feed>
-    EOT
+       <author>
+         <email>johndoe@example.com</email>
+       </author>
+       <id>urn:uuid:60a76c80-d399-11d9-b91C-0003939e0af6</id>
+       <entry>
+         <title>Atom-Powered Robots Run Amok</title>
+         <link href="http://example.org/2003/12/13/atom03"/>
+         <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+         <updated>2003-12-13T18:30:02Z</updated>
+         <summary>Some text.</summary>
+       </entry>
+      </feed>
+      EOT
 
-    r = @v.validate_text(fragment)
-    assert_equal 1, r.errors.length
+      r = @v.validate_text(fragment)
+      assert_equal 1, r.errors.length
+    end
   end
 
 
   def test_validating_text_via_file
-    skip("Pending, broken")
-    file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/invalid_feed.xml')
-    fh = File.new(file_path, 'r+')    
-    r = @v.validate_file(fh)
-    fh.close
-    assert_errors r, 1
+    VCR.use_cassette('feed_validating_text_via_file') do
+      file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/invalid_feed.xml')
+      fh = File.new(file_path, 'r+')
+      r = @v.validate_file(fh)
+      fh.close
+      assert_errors r, 1
+    end
   end
 
-
- 
 end
+

data/test/test_helper.rb

@@ -1,8 +1,13 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'iconv'
 require 'rubygems'
 require 'test/unit'
 require 'w3c_validators'
+require 'vcr'
+
+VCR.configure do |config|
+  config.cassette_library_dir = "test/http_recording"
+  config.hook_into :webmock # or :fakeweb
+end
 
 class Test::Unit::TestCase
 
@@ -36,4 +41,4 @@ class Test::Unit::TestCase
     end
   end
 
-end
+end

data/test/test_html5_validator.rb

@@ -9,50 +9,58 @@ class HTML5ValidatorTests < Test::Unit::TestCase
   end
 
   def test_getting_request_data
-    r = @v.validate_uri('http://code.dunae.ca/w3c_validators/test/valid_html5.html')
-    assert_equal :html5, r.doctype
-    assert_equal 'http://code.dunae.ca/w3c_validators/test/valid_html5.html', r.uri
-    assert_no_errors r
-    assert_no_warnings r
-    assert r.is_valid?
+    VCR.use_cassette('html5_getting_request_data') do
+      r = @v.validate_uri('https://doc75.github.io/w3c_validators_tests/valid_html5.html')
+      assert_equal :html5, r.doctype
+      assert_equal 'https://doc75.github.io/w3c_validators_tests/valid_html5.html', r.uri
+      assert_no_errors r
+      assert_no_warnings r
+      assert r.is_valid?
+    end
   end
 
   def test_validating_uri
-    r = @v.validate_uri('http://code.dunae.ca/w3c_validators/test/invalid_html5.html')
-    assert_errors r, 2
-    assert_warnings r, 1
-    assert !r.is_valid?
+    VCR.use_cassette('html5_validating_uri') do
+      r = @v.validate_uri('https://doc75.github.io/w3c_validators_tests/invalid_html5.html')
+      assert_errors r, 2
+      assert_no_warnings r
+      assert !r.is_valid?
+    end
   end
 
   def test_validating_file
-    skip("Pending, broken")
-    file = File.dirname(__FILE__) + '/fixtures/invalid_html5.html'
-    r = @v.validate_file(file)
-    assert_errors r, 1
+    omit('Pending, broken')
+    VCR.use_cassette('html5_validating_file') do
+      file = File.dirname(__FILE__) + '/fixtures/invalid_html5.html'
+      r = @v.validate_file(file)
+      assert_errors r, 1
+    end
   end
 
   def test_validating_text
-    skip("Pending, broken")
-    valid_fragment = <<-EOV
-    <!DOCTYPE html>
-    <html lang="en-ca">
-      <head>
-        <title>HTML 5 Example</title>
-      </head>
-      <body>
-        <!-- should have one error (missing </section>) -->
-        <p>This is a sample HTML 5 document.</p>
-        <section>
-        <h1>Example of paragraphs</h1>
-        This is the <em>first</em> paragraph in this example.
-        <p>This is the second.</p>
-        <p>Test<br>test</p>
-      </body>
-    </html>
-    EOV
+    omit('Pending, broken')
+    VCR.use_cassette('html5_validating_text') do
+      valid_fragment = <<-EOV
+      <!DOCTYPE html>
+      <html lang="en-ca">
+        <head>
+          <title>HTML 5 Example</title>
+        </head>
+        <body>
+          <!-- should have one error (missing </section>) -->
+          <p>This is a sample HTML 5 document.</p>
+          <section>
+          <h1>Example of paragraphs</h1>
+          This is the <em>first</em> paragraph in this example.
+          <p>This is the second.</p>
+          <p>Test<br>test</p>
+        </body>
+      </html>
+      EOV
     
-    r = @v.validate_text(valid_fragment)
-    assert_errors r, 1
+      r = @v.validate_text(valid_fragment)
+      assert_errors r, 1
+    end
   end
 
   #def test_validating_text_via_file

data/test/test_markup_validator.rb

@@ -1,5 +1,4 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
-require 'ruby-debug'
 
 # Test cases for the MarkupValidator.
 class MarkupValidatorTests < Test::Unit::TestCase
@@ -10,91 +9,115 @@ class MarkupValidatorTests < Test::Unit::TestCase
   end
 
   def test_overriding_doctype
-    @v.set_doctype!(:html32, false)
-    r = @v.validate_uri('http://code.dunae.ca/w3c_validators/test/invalid_markup.html')
-    assert_equal '-//W3C//DTD HTML 3.2 Final//EN', r.doctype
+    VCR.use_cassette('markup_overriding_doctype') do
+      @v.set_doctype!(:html32, false)
+      r = @v.validate_uri('https://doc75.github.io/w3c_validators_tests/invalid_markup.html')
+      assert_equal '-//W3C//DTD HTML 3.2 Final//EN', r.doctype
+    end
   end
 
   def test_overriding_doctype_for_fallback_only
-    @v.set_doctype!(:html32, true)
-    r = @v.validate_uri('http://code.dunae.ca/w3c_validators/test/invalid_markup.html')
-    assert_not_equal '-//W3C//DTD HTML 3.2 Final//EN', r.doctype
+    VCR.use_cassette('markup_overriding_doctype_for_fallback_only') do
+      @v.set_doctype!(:html32, true)
+      r = @v.validate_uri('https://doc75.github.io/w3c_validators_tests/invalid_markup_1.html')
+      assert_not_equal '-//W3C//DTD HTML 3.2 Final//EN', r.doctype
+    end
   end
 
   def test_overriding_charset
-    @v.set_charset!(:utf_16, false)
-    r = @v.validate_uri('http://code.dunae.ca/w3c_validators/test/invalid_markup.html')
-    assert_equal 'utf-16', r.charset
+    VCR.use_cassette('markup_overriding_charset') do
+      @v.set_charset!(:utf_16, false)
+      r = @v.validate_uri('https://doc75.github.io/w3c_validators_tests/invalid_markup_2.html')
+      assert_equal 'utf-16', r.charset
+    end
   end
 
   def test_overriding_charset_for_fallback_only
-    @v.set_doctype!(:utf_16, true)
-    r = @v.validate_uri('http://code.dunae.ca/w3c_validators/test/invalid_markup.html')
-    assert_not_equal 'utf-16', r.charset
+    VCR.use_cassette('markup_overriding_charset_for_fallback_only') do
+      @v.set_doctype!(:utf_16, true)
+      r = @v.validate_uri('https://doc75.github.io/w3c_validators_tests/markup_overriding_charset_for_fallback_only.html')
+      assert_not_equal 'utf-16', r.charset
+    end
   end
 
   def test_validating_uri_with_head_request
-    r = @v.validate_uri_quickly('http://code.dunae.ca/w3c_validators/test/invalid_markup.html')
-    assert_errors r, 1
+    VCR.use_cassette('markup_validating_uri_with_head_request') do
+      r = @v.validate_uri_quickly('https://doc75.github.io/w3c_validators_tests/invalid_markup_4.html')
+      assert_errors r, 1
+    end
   end
 
   def test_validating_uri_with_soap
-    r = @v.validate_uri('http://code.dunae.ca/w3c_validators/test/invalid_markup.html')
-    assert_errors r, 1
-    assert_no_warnings r
+    VCR.use_cassette('markup_validating_uri_with_soap') do
+      r = @v.validate_uri('https://doc75.github.io/w3c_validators_tests/invalid_markup_5.html')
+      assert_errors r, 1
+      assert_no_warnings r
+    end
   end
 
   def test_debugging_uri
-    @v.set_debug!
-    r = @v.validate_uri('http://code.dunae.ca/w3c_validators/test/invalid_markup.html')
-    assert r.debug_messages.length > 0
+    VCR.use_cassette('markup_debugging_uri') do
+      @v.set_debug!
+      r = @v.validate_uri('https://doc75.github.io/w3c_validators_tests/invalid_markup_6.html')
+      assert r.debug_messages.length > 0
+    end
   end
 
   def test_validating_file
-    file = File.dirname(__FILE__) + '/fixtures/invalid_markup.html'
-    r = @v.validate_file(file)
-    assert_errors r, 1
+    VCR.use_cassette('markup_validating_file') do
+      file = File.dirname(__FILE__) + '/fixtures/invalid_markup.html'
+      r = @v.validate_file(file)
+      assert_errors r, 1
     
-    assert r.uri =~ /fixtures\/invalid_markup\.html$/
+      assert r.uri =~ /fixtures\/invalid_markup\.html$/
+    end
   end
 
   def test_validating_text
-    skip("Pending, broken")
-    valid_fragment = <<-EOV
-      <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-      <title>Test</title>
-      <body>
-      <div class="example">This is a test</div>
-      </body>
-    EOV
-    
-    r = @v.validate_text(valid_fragment)
-    assert_no_errors r
-    assert_no_warnings r
+    VCR.use_cassette('markup_validating_text') do
+      valid_fragment = <<-EOV
+        <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+        <title>Test</title>
+        <body>
+        <div class="example">This is a test</div>
+        </body>
+      EOV
+
+      r = @v.validate_text(valid_fragment)
+      assert_no_errors r
+      assert_warnings r, 2
+    end
   end
 
   def test_validating_text_via_file
-    fh = File.new(File.dirname(__FILE__) + '/fixtures/invalid_markup.html', 'r+')    
-    r = @v.validate_file(fh)
-    fh.close
-    assert_errors r, 1
+    VCR.use_cassette('markup_validating_text_via_file') do
+      fh = File.new(File.dirname(__FILE__) + '/fixtures/invalid_markup.html', 'r+')
+      r = @v.validate_file(fh)
+      fh.close
+      assert_errors r, 1
+    end
   end
 
 
   def test_validator_abort
-    @v.set_debug!
-    assert_nothing_raised do
-      r = @v.validate_uri('http://code.dunae.ca/w3c_validators/test/invalid_encoding.html')
-      assert !r.is_valid?
-      assert_errors r, 1
-      assert_no_warnings r
+    VCR.use_cassette('markup_validator_abort') do
+      @v.set_debug!
+      assert_nothing_raised do
+        r = @v.validate_uri('https://doc75.github.io/w3c_validators_tests/invalid_encoding.html')
+        assert !r.is_valid?
+        assert_errors r, 1
+        assert_no_warnings r
+      end
     end
   end
 
-  def test_validator_contains_details_of_error_conditions    
-    r = @v.validate_uri('http://code.dunae.ca/w3c_validators/test/invalid_markup.html')    
-    assert_not_nil r.errors[0].col
-    assert_not_nil r.errors[0].line
-    assert_not_nil r.errors[0].message
+  def test_validator_contains_details_of_error_conditions
+    VCR.use_cassette('markup_validator_contains_details_of_error_conditions') do
+      r = @v.validate_uri('https://doc75.github.io/w3c_validators_tests/invalid_markup_7.html')
+      assert_not_nil r.errors[0].col
+      assert_not_nil r.errors[0].line
+      assert_not_nil r.errors[0].message
+    end
   end
 end
+

data/test/test_proxy.rb

@@ -22,7 +22,10 @@ class ProxyTests < Test::Unit::TestCase
 
 
   def test_validating_uri_with_head_request
-    r = @v.validate_uri_quickly('http://code.dunae.ca/w3c_validators/test/invalid_markup.html')
-    assert_errors r, 1
+    omit("Pending, to prevent w3.org abuse")
+    VCR.use_cassette('markup_overriding_doctype') do
+      r = @v.validate_uri_quickly('https://doc75.github.io/w3c_validators_tests/invalid_markup_8.html')
+      assert_errors r, 1
+    end
   end
 end

data/w3c_validators.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/w3c_validators/version.rb', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Alex Dunae"]
+  gem.summary       = "A Ruby wrapper for the World Wide Web Consortium’s online validation services."
+  gem.homepage      = "https://github.com/w3c-validators/w3c_validators"
+
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test}/*`.split("\n")
+  gem.name          = "w3c_validators"
+  gem.require_paths = ["lib"]
+  gem.version       = W3CValidators::VERSION
+
+  gem.required_ruby_version = '~>2.0'
+
+  gem.add_dependency 'nokogiri', '~> 1.6'
+  gem.add_dependency 'json', '~> 2.0'
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'vcr'
+  gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'test-unit'
+end