validator.nu 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/validator.nu.rb

@@ -1,5 +1,9 @@
 $:.unshift File.dirname(__FILE__)
 
+require 'yajl/http_stream'
+require 'yajl/gzip'
+require 'yajl/deflate'
+
 require 'net/http'
 require 'cgi'
 require 'uri'
@@ -44,12 +48,13 @@ module Validator
     HOST = "validator.nu"
     GZIP = false
     PORT = 80
+    LAX_CONTENT_TYPE = false
 
     def nu(uri_or_document, options={})
       if uri_or_document.kind_of?(URI::HTTP)
-        get(uri_or_document, options)          
+        get(uri_or_document, options)
       else
-        post(uri_or_document, options)          
+        post(uri_or_document, options)
       end
     end
 
@@ -63,20 +68,28 @@ module Validator
       begin
         host = options[:host] || HOST
         port = options[:port] || PORT
-        http = Net::HTTP.new(host, port)
-        uri = "/?&doc=#{CGI::escape(url.to_s)}&out=json"
-
-        response = http.start do |http|
-          http.get(uri)
-        end
+        laxtype = options[:lax_content_type] || LAX_CONTENT_TYPE
+
+        # http = Net::HTTP.new(host, port)
+        uri = "http://#{host}/?&doc=#{CGI::escape(url.to_s)}&out=json"
+        uri += "&laxtype=yes" if laxtype
+        url = URI.parse uri
+        #STDERR.puts url
+        #url.port = port
         
-        if response.kind_of? Net::HTTPSuccess
-          return response.body
-        else
-          STDERR.puts response.body.inspect
-          raise RemoteException.new("#{response.code}: #{response.message}")
-        end
-
+        return Yajl::HttpStream.get(url)
+        
+      #  response = http.start do |http|
+      #    http.get(url.path)
+      #  end
+      #  
+      #  if response.kind_of? Net::HTTPSuccess
+      #    return response.body
+      #  else
+      #    STDERR.puts response.body.inspect
+      #    raise RemoteException.new("#{response.code}: #{response.message}")
+      #  end
+      #
       rescue Exception => e
         STDERR.puts "Error contacting validator.nu: #{e}"
         STDERR.puts e.backtrace.join("\n"), 'debug'
@@ -91,6 +104,7 @@ module Validator
         content_type = options[:content_type] || CONTENT_TYPE
         content_encoding = options[:content_encoding] || CONTENT_ENCODING
         gzip = options[:gzip] || GZIP
+        laxtype = options[:lax_content_type] || LAX_CONTENT_TYPE
 
         if gzip
           content_encoding = 'gzip'
@@ -103,6 +117,7 @@ module Validator
 
         http = Net::HTTP.new(host, port)
         uri = "/?out=json"
+        uri += "&laxtype=yes" if laxtype
         headers = { 'Content-Type' => content_type, 'Content-Encoding' => content_encoding }
 
         response = http.start do |http|

data/spec/fixtures/fatal-error-post.json

@@ -1 +1 @@
-{"messages":[{"type":"info","message":"The Content-Type was “application/xhtml+xml”. Using the XML parser (not resolving external entities)."},{"type":"info","message":"Using the preset for XHTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental) based on the root namespace."},{"type":"error","lastLine":6,"lastColumn":10,"subType":"fatal","message":"name expected","extract":"body>\n<p>Fatal & erro","hiliteStart":15,"hiliteLength":1}]}
+{"messages":[{"type":"info","message":"The Content-Type was “application/xhtml+xml”. Using the XML parser (not resolving external entities)."},{"type":"info","message":"Using the preset for XHTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental) based on the root namespace."},{"type":"error","lastLine":6,"lastColumn":10,"subType":"fatal","message":"name expected","extract":"body>\n<p>Fatal & error</p>\n</b","hiliteStart":15,"hiliteLength":1}]}

data/spec/fixtures/fatal-error.json

@@ -1 +1 @@
-{"url":"http://hsivonen.iki.fi/test/moz/messages-types/fatal.xhtml","messages":[{"type":"info","message":"The Content-Type was “application/xhtml+xml”. Using the XML parser (not resolving external entities)."},{"type":"info","message":"Using the preset for XHTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental) based on the root namespace."},{"type":"error","lastLine":6,"lastColumn":10,"subType":"fatal","message":"name expected","extract":"body>\n<p>Fatal & erro","hiliteStart":15,"hiliteLength":1}]}
+{"url":"http://hsivonen.iki.fi/test/moz/messages-types/fatal.xhtml","messages":[{"type":"info","message":"The Content-Type was “application/xhtml+xml”. Using the XML parser (not resolving external entities)."},{"type":"info","message":"Using the preset for XHTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental) based on the root namespace."},{"type":"error","lastLine":6,"lastColumn":10,"subType":"fatal","message":"name expected","extract":"body>\n<p>Fatal & error</p>\n</b","hiliteStart":15,"hiliteLength":1}]}

data/spec/fixtures/no-message-post.json

@@ -1 +1 @@
-{"messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA (experimental)."}]}
+{"messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental)."}]}

data/spec/fixtures/no-message.json

@@ -1 +1 @@
-{"url":"http://hsivonen.iki.fi/test/moz/messages-types/no-message.html","messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA (experimental)."}]}
+{"url":"http://hsivonen.iki.fi/test/moz/messages-types/no-message.html","messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental)."}]}

data/spec/fixtures/precise-error-post.json

@@ -1 +1 @@
-{"messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA (experimental)."},{"type":"error","lastLine":7,"lastColumn":4,"message":"“&” did not start a character reference. (“&” probably should have been escaped as “&amp;”.)","extract":"ead>\n<body>\n<p>&a</p>","hiliteStart":15,"hiliteLength":1}]}
+{"messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental)."},{"type":"error","lastLine":7,"lastColumn":4,"message":"“&” did not start a character reference. (“&” probably should have been escaped as “&amp;”.)","extract":"ead>\n<body>\n<p>&a</p>\n</body>\n","hiliteStart":15,"hiliteLength":1}]}

data/spec/fixtures/precise-error.json

@@ -1 +1 @@
-{"url":"http://hsivonen.iki.fi/test/moz/messages-types/precise-error.html","messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA (experimental)."},{"type":"error","lastLine":7,"lastColumn":4,"message":"“&” did not start a character reference. (“&” probably should have been escaped as “&amp;”.)","extract":"ead>\n<body>\n<p>&a</p>","hiliteStart":15,"hiliteLength":1}]}
+{"url":"http://hsivonen.iki.fi/test/moz/messages-types/precise-error.html","messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental)."},{"type":"error","lastLine":7,"lastColumn":4,"message":"“&” did not start a character reference. (“&” probably should have been escaped as “&amp;”.)","extract":"ead>\n<body>\n<p>&a</p>\n</body>\n","hiliteStart":15,"hiliteLength":1}]}

data/spec/fixtures/range-error-post.json

@@ -1 +1 @@
-{"messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA (experimental)."},{"type":"error","lastLine":7,"lastColumn":13,"firstColumn":10,"message":"End tag for “p” seen, but there were unclosed elements.","extract":"\n<p><span></p>\n</bod","hiliteStart":10,"hiliteLength":4}]}
+{"messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental)."},{"type":"error","lastLine":7,"lastColumn":13,"firstColumn":10,"message":"End tag “p” seen, but there were open elements.","extract":"\n<p><span></p>\n</bod","hiliteStart":10,"hiliteLength":4},{"type":"error","lastLine":7,"lastColumn":9,"firstColumn":4,"message":"Unclosed element “span”.","extract":"<body>\n<p><span></p>\n<","hiliteStart":10,"hiliteLength":6}]}

data/spec/fixtures/range-error.json

@@ -1 +1 @@
-{"url":"http://hsivonen.iki.fi/test/moz/messages-types/range-error.html","messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA (experimental)."},{"type":"error","lastLine":7,"lastColumn":13,"firstColumn":10,"message":"End tag for “p” seen, but there were unclosed elements.","extract":"\n<p><span></p>\n</bod","hiliteStart":10,"hiliteLength":4}]}
+{"url":"http://hsivonen.iki.fi/test/moz/messages-types/range-error.html","messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental)."},{"type":"error","lastLine":7,"lastColumn":13,"firstColumn":10,"message":"End tag “p” seen, but there were open elements.","extract":"\n<p><span></p>\n</bod","hiliteStart":10,"hiliteLength":4},{"type":"error","lastLine":7,"lastColumn":9,"firstColumn":4,"message":"Unclosed element “span”.","extract":"<body>\n<p><span></p>\n<","hiliteStart":10,"hiliteLength":6}]}

data/spec/fixtures/warning-post.json

@@ -1 +1 @@
-{"messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA (experimental)."},{"type":"error","lastLine":7,"lastColumn":13,"message":"“<” in an unquoted attribute value. Probable cause: Missing “>” immediately before.","extract":"y>\n<p class=foo<bar><","hiliteStart":15,"hiliteLength":1}]}
+{"messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental)."},{"type":"error","lastLine":7,"lastColumn":13,"message":"“<” in an unquoted attribute value. Probable cause: Missing “>” immediately before.","extract":"y>\n<p class=foo<bar></p>\n</bod","hiliteStart":15,"hiliteLength":1}]}

data/spec/fixtures/warning.json

@@ -1 +1 @@
-{"url":"http://hsivonen.iki.fi/test/moz/messages-types/warning.html","messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA (experimental)."},{"type":"error","lastLine":7,"lastColumn":13,"message":"“<” in an unquoted attribute value. Probable cause: Missing “>” immediately before.","extract":"y>\n<p class=foo<bar><","hiliteStart":15,"hiliteLength":1}]}
+{"url":"http://hsivonen.iki.fi/test/moz/messages-types/warning.html","messages":[{"type":"info","message":"The Content-Type was “text/html”. Using the HTML parser."},{"type":"info","message":"Using the schema for HTML5+ARIA, SVG 1.1 plus MathML 2.0 (experimental)."},{"type":"error","lastLine":7,"lastColumn":13,"message":"“<” in an unquoted attribute value. Probable cause: Missing “>” immediately before.","extract":"y>\n<p class=foo<bar></p>\n</bod","hiliteStart":15,"hiliteLength":1}]}

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
 require 'rubygems'
 require File.dirname(__FILE__) + '/../lib/validator.nu.rb'
+
+require 'yajl'

data/spec/validator_spec.rb

@@ -58,7 +58,11 @@ describe Validator do
     end
 
     it "should receive a fatal error result" do
-      fixture = File.open("#{File.dirname(__FILE__)}/fixtures/fatal-error.json").read
+      # fixture = File.open("#{File.dirname(__FILE__)}/fixtures/fatal-error.json").read
+      file = File.new("#{File.dirname(__FILE__)}/fixtures/fatal-error.json", 'r')
+      parser = Yajl::Parser.new
+      fixture = parser.parse(file)
+      
       Validator.nu(
         URI.parse("http://hsivonen.iki.fi/test/moz/messages-types/fatal.xhtml")
       ).should == fixture

data/validator.nu.gemspec

@@ -1,72 +1,63 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{validator.nu}
-  s.version = "0.0.4"
+  s.name = "validator.nu"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Rice"]
-  s.date = %q{2010-04-16}
-  s.description = %q{ruby client library for the validator.nu HTML5 validation API}
-  s.email = %q{me@davidjrice.co.uk}
+  s.date = "2011-10-12"
+  s.description = "ruby client library for the validator.nu HTML5 validation API"
+  s.email = "me@davidjrice.co.uk"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/validator.nu.rb",
-     "spec/fixtures/fatal-error-post.json",
-     "spec/fixtures/fatal-error.html",
-     "spec/fixtures/fatal-error.json",
-     "spec/fixtures/info-post.json",
-     "spec/fixtures/info.json",
-     "spec/fixtures/info.svg",
-     "spec/fixtures/no-message-post.json",
-     "spec/fixtures/no-message.html",
-     "spec/fixtures/no-message.json",
-     "spec/fixtures/non-document-error-post.json",
-     "spec/fixtures/non-document-error.json",
-     "spec/fixtures/precise-error-post.json",
-     "spec/fixtures/precise-error.html",
-     "spec/fixtures/precise-error.json",
-     "spec/fixtures/range-error-post.json",
-     "spec/fixtures/range-error.html",
-     "spec/fixtures/range-error.json",
-     "spec/fixtures/warning-post.json",
-     "spec/fixtures/warning.html",
-     "spec/fixtures/warning.json",
-     "spec/spec_helper.rb",
-     "spec/validator_spec.rb",
-     "test/helper.rb",
-     "test/test_validator.nu.rb",
-     "validator.nu.gemspec"
-  ]
-  s.homepage = %q{http://github.com/davidjrice/validator.nu}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{ruby client library for the validator.nu HTML5 validation API}
-  s.test_files = [
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/validator.nu.rb",
+    "spec/fixtures/fatal-error-post.json",
+    "spec/fixtures/fatal-error.html",
+    "spec/fixtures/fatal-error.json",
+    "spec/fixtures/info-post.json",
+    "spec/fixtures/info.json",
+    "spec/fixtures/info.svg",
+    "spec/fixtures/no-message-post.json",
+    "spec/fixtures/no-message.html",
+    "spec/fixtures/no-message.json",
+    "spec/fixtures/non-document-error-post.json",
+    "spec/fixtures/non-document-error.json",
+    "spec/fixtures/precise-error-post.json",
+    "spec/fixtures/precise-error.html",
+    "spec/fixtures/precise-error.json",
+    "spec/fixtures/range-error-post.json",
+    "spec/fixtures/range-error.html",
+    "spec/fixtures/range-error.json",
+    "spec/fixtures/warning-post.json",
+    "spec/fixtures/warning.html",
+    "spec/fixtures/warning.json",
     "spec/spec_helper.rb",
-     "spec/validator_spec.rb",
-     "test/helper.rb",
-     "test/test_validator.nu.rb"
+    "spec/validator_spec.rb",
+    "test/helper.rb",
+    "test/test_validator.nu.rb",
+    "validator.nu.gemspec"
   ]
+  s.homepage = "http://github.com/davidjrice/validator.nu"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "ruby client library for the validator.nu HTML5 validation API"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -1,35 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: validator.nu
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.0.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - David Rice
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-04-16 00:00:00 +01:00
-default_executable: 
+date: 2011-10-12 00:00:00.000000000Z
 dependencies: []
-
 description: ruby client library for the validator.nu HTML5 validation API
 email: me@davidjrice.co.uk
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -60,38 +50,28 @@ files:
 - test/helper.rb
 - test/test_validator.nu.rb
 - validator.nu.gemspec
-has_rdoc: true
 homepage: http://github.com/davidjrice/validator.nu
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ruby client library for the validator.nu HTML5 validation API
-test_files: 
-- spec/spec_helper.rb
-- spec/validator_spec.rb
-- test/helper.rb
-- test/test_validator.nu.rb
+test_files: []

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC