w3c_validators 1.0.2 → 1.1

data/CHANGELOG

@@ -26,3 +26,7 @@
 == Version 1.0.2
  * Added support for proxy servers
  * Fixed to minor unit test errors
+
+== Version 1.1
+ * Ruby 1.9 compatibility
+ * Switched to Nokogiri for XML parsing

data/lib/w3c_validators/css_validator.rb

@@ -109,12 +109,13 @@ protected
 
 
     def parse_soap_response(response) # :nodoc:
-      doc = REXML::Document.new(response)
+      doc = Nokogiri::XML(response)
+      doc.remove_namespaces! 
 
       result_params = {}
 
       {:uri => 'uri', :checked_by => 'checkedby', :validity => 'validity', :css_level => 'csslevel'}.each do |local_key, remote_key|        
-        if val = doc.elements["//*[local-name()='cssvalidationresponse']/*[local-name()='#{remote_key.to_s}']"]
+        if val = doc.at('cssvalidationresponse ' + remote_key)
           result_params[local_key] = val.text
         end
       end
@@ -122,17 +123,17 @@ protected
       results = Results.new(result_params)
 
       ['warninglist', 'errorlist'].each do |list_type|
-        doc.elements.each("//*[local-name()='#{list_type.to_s}']") do |message_list|        
+        doc.css(list_type).each do |message_list|        
 
-          if uri_node = message_list.elements["*[local-name()='uri']"]
+          if uri_node = message_list.at('uri')
             uri = uri_node.text
           end
 
           [:warning, :error].each do |msg_type|
-            message_list.elements.each("*[local-name()='#{msg_type.to_s}']") do |message|
+            message_list.css(msg_type.to_s).each do |message|
               message_params = {}
-              message.each_element_with_text do |el|
-                message_params[el.name.to_sym] = el.text
+              message.children.each do |el|
+                message_params[el.name.to_sym] = el.text unless el.blank?
               end
               message_params[:uri] = uri
               results.add_message(msg_type, message_params)

data/lib/w3c_validators/feed_validator.rb

@@ -81,12 +81,13 @@ protected
     #
     # Returns W3CValidators::Results.
     def parse_soap_response(response) # :nodoc:
-      doc = REXML::Document.new(response)
+      doc = Nokogiri::XML(response)
+      doc.remove_namespaces! 
 
       result_params = {}
 
       {:uri => 'uri', :checked_by => 'checkedby', :validity => 'validity'}.each do |local_key, remote_key|        
-        if val = doc.elements["//*[local-name()='feedvalidationresponse']/*[local-name()='#{remote_key.to_s}']"]
+        if val = doc.at('feedvalidationresponse ' + remote_key)
           result_params[local_key] = val.text
         end
       end
@@ -94,10 +95,10 @@ protected
       results = Results.new(result_params)
 
       [:warning, :error].each do |msg_type|
-        doc.elements.each("//*[local-name()='#{msg_type.to_s}']") do |message|
+        doc.css(msg_type.to_s).each do |message|
           message_params = {}
-          message.each_element_with_text do |el|
-            message_params[el.name.to_sym] = el.text
+          message.children.each do |el|
+            message_params[el.name.to_sym] = el.text unless el.blank?
           end
           results.add_message(msg_type, message_params)
         end

data/lib/w3c_validators/markup_validator.rb

@@ -130,7 +130,6 @@ protected
         else
           response = send_request(options, :post)
         end
-
         @results = parse_soap_response(response.body)
       end
       @results
@@ -169,36 +168,35 @@ protected
     #
     # Returns W3CValidators::Results.
     def parse_soap_response(response) # :nodoc:
-      doc = REXML::Document.new(response)
+      doc = Nokogiri::XML(response)
+      doc.remove_namespaces! 
 
       result_params = {}
 
-      {:doctype => 'm:doctype', :uri => 'm:uri', :charset => 'm:charset', 
-       :checked_by => 'm:checkedby', :validity => 'm:validity'}.each do |local_key, remote_key|        
-        if val = doc.elements["env:Envelope/env:Body/m:markupvalidationresponse/#{remote_key}"]
+      {:doctype => 'doctype', :uri => 'uri', :charset => 'charset', 
+       :checked_by => 'checkedby', :validity => 'validity'}.each do |local_key, remote_key|        
+        if val = doc.css(remote_key)
           result_params[local_key] = val.text
         end
       end
 
       results = Results.new(result_params)
 
-      {:warning => 'm:warnings/m:warninglist/m:warning', :error => 'm:errors/m:errorlist/m:error'}.each do |local_type, remote_type|
-        doc.elements.each("env:Envelope/env:Body/m:markupvalidationresponse/#{remote_type}") do |message|
+      {:warning => 'warnings warning', :error => 'errorlist error'}.each do |local_type, remote_type|
+        doc.css(remote_type).each do |message|
           message_params = {}
-          message.each_element_with_text do |el|
-            message_params[el.name.to_sym] = el.text
+          message.children do |el|
+            message_params[el.name.to_sym] = el.text unless el.blank?
           end
           results.add_message(local_type, message_params)
         end
       end
 
-      doc.elements.each("env:Envelope/env:Body/env:Fault/env:Reason") do |message|
-        message.elements.each("env:Text") do |m|
-          results.add_message(:error, {:mesage => m.text})
-        end
+      doc.css("Fault Reason Text").each do |message|
+        results.add_message(:error, {:mesage => message.text})
       end
-
-      doc.elements.each("env:Envelope/env:Body/m:markupvalidationresponse/m:debug") do |debug|
+      
+      doc.css("markupvalidationresponse debug").each do |debug|
         results.add_debug_message(debug.attribute('name').value, debug.text)
       end
       return results

data/lib/w3c_validators/nu_validator.rb

@@ -2,7 +2,7 @@ require 'json'
 
 module W3CValidators
   class NuValidator < Validator
-    MARKUP_VALIDATOR_URI      = 'http://validator.nu/'
+    MARKUP_VALIDATOR_URI      = 'http://html5.validator.nu/'
 
     # Create a new instance of the NuValidator.
     #
@@ -16,6 +16,7 @@ module W3CValidators
     #
     # See Validator#new for proxy server options.
     def initialize(options = {})
+      options[:parser] = 'html'
       if options[:validator_uri]
         @validator_uri = URI.parse(options[:validator_uri])
         options.delete(options[:validator_uri])
@@ -62,11 +63,11 @@ module W3CValidators
 protected
     def validate(options) # :nodoc:
       options = get_request_options(options)
-
+      
       if options.has_key?(:doc)
         response = send_request(options, :get)
       else
-        response = send_request(options, :post)
+        response = send_request(options, :post, false, :content)
       end
 
       @results = parse_json_response(response.body)

data/lib/w3c_validators/validator.rb

@@ -1,7 +1,8 @@
 require 'cgi'
 require 'net/http'
 require 'uri'
-require 'rexml/document'
+require 'json'
+require 'nokogiri'
 
 require 'w3c_validators/exceptions'
 require 'w3c_validators/constants'
@@ -39,7 +40,7 @@ module W3CValidators
     # +request_mode+ must be either <tt>:get</tt>, <tt>:head</tt> or <tt>:post</tt>.
     #
     # Returns Net::HTTPResponse.
-    def send_request(options, request_mode = :get)
+    def send_request(options, request_mode = :get, following_redirect = false, params_to_post = nil)
       response = nil
       results = nil
 
@@ -60,13 +61,30 @@ module W3CValidators
             response = http.get(@validator_uri.path + '?' + query)
           when :post
             # send a multipart form request
-            query, boundary = create_multipart_data(options)
-            response = http.post2(@validator_uri.path, query, "Content-type" => "multipart/form-data; boundary=" + boundary)
+            if params_to_post
+              post = {}
+              [params_to_post].flatten.each do |param|
+                post[param] = options.delete(param)
+              end
+            else
+              post = options
+              options = {}
+            end
+              
+            qs = create_query_string_data(options)
+            
+            query, boundary = create_multipart_data(post)
+            response = http.post2(@validator_uri.path + '?' + qs, query, "Content-type" => "multipart/form-data; boundary=" + boundary)
           else
             raise ArgumentError, "request_mode must be either :get, :head or :post"
         end
       end
 
+      if response.kind_of?(Net::HTTPRedirection) and response['location'] and not following_redirect
+        options[:url] = response['location']
+        return send_request(options, request_mode, true)
+      end
+
       response.value
       return response
 
@@ -135,7 +153,7 @@ module W3CValidators
         when Net::HTTPServerException, SocketError
           msg = "unable to connect to the validator at #{@validator_uri} (response was #{e.message})."
           raise ValidatorUnavailable, msg, caller
-        when REXML::ParseException
+        when JSON::ParserError, Nokogiri::XML::SyntaxError
           msg = "unable to parse the response from the validator."
           raise ParsingError, msg, caller
         else

data/test/test_helper.rb

@@ -1,7 +1,5 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../'))
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../lib/'))
-
-require 'rubygems'
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'iconv'
 require 'test/unit'
 require 'w3c_validators'
 

metadata

@@ -1,36 +1,47 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: w3c_validators
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2009-11-20 00:00:00 -08:00
-summary: Wrapper for the World Wide Web Consortium's online validation services.
-require_paths: 
-- lib
-email: code@dunae.ca
-homepage: http://code.dunae.ca/w3c_validators
-rubyforge_project: 
-description: W3C Validators is a Ruby wrapper for the World Wide Web Consortium's online validation services.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  hash: 13
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  version: "1.1"
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Alex Dunae
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-10-20 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+description: W3C Validators is a Ruby wrapper for the World Wide Web Consortium's online validation services.
+email: code@dunae.ca
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README.rdoc
+- CHANGELOG
+- LICENSE
 files: 
-- lib/w3c_validators
-- lib/w3c_validators.rb
 - lib/w3c_validators/constants.rb
 - lib/w3c_validators/css_validator.rb
 - lib/w3c_validators/exceptions.rb
@@ -40,10 +51,10 @@ files:
 - lib/w3c_validators/nu_validator.rb
 - lib/w3c_validators/results.rb
 - lib/w3c_validators/validator.rb
+- lib/w3c_validators.rb
 - README.rdoc
 - CHANGELOG
 - LICENSE
-test_files: 
 - test/test_css_validator.rb
 - test/test_exceptions.rb
 - test/test_feed_validator.rb
@@ -51,21 +62,49 @@ test_files:
 - test/test_html5_validator.rb
 - test/test_markup_validator.rb
 - test/test_proxy.rb
+has_rdoc: true
+homepage: http://code.dunae.ca/w3c_validators
+licenses: []
+
+post_install_message: 
 rdoc_options: 
 - --all
 - --inline-source
 - --line-numbers
 - --charset
 - utf-8
-extra_rdoc_files: 
-- README.rdoc
-- CHANGELOG
-- LICENSE
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: Wrapper for the World Wide Web Consortium's online validation services.
+test_files: 
+- test/test_css_validator.rb
+- test/test_exceptions.rb
+- test/test_feed_validator.rb
+- test/test_helper.rb
+- test/test_html5_validator.rb
+- test/test_markup_validator.rb
+- test/test_proxy.rb