lib/headhunter/html_validator.rb in headhunter-0.1.6 vs lib/headhunter/html_validator.rb in headhunter-0.1.7

@@ -1,18 +1,29 @@
 require 'html_validation'
 
 module Headhunter
   class HtmlValidator
+    VALIDATOR_DIR = Gem.loaded_specs['headhunter'].full_gem_path + '/lib/tidy/'
+
     attr_reader :responses
 
     def initialize
       @responses = []
     end
 
-    def validate(url, html)
-      # Docs for Tidy: http://tidy.sourceforge.net/docs/quickref.html
-      @responses << PageValidations::HTMLValidation.new.validation(html, url)
+    def validate(uri, html)
+      Dir.chdir(VALIDATOR_DIR) do
+        # Docs for Tidy: http://tidy.sourceforge.net/docs/quickref.html
+        stdin, stdout, stderr = Open3.popen3('tidy -quiet')
+        stdin.puts html
+        stdin.close
+        stdout.close
+
+        @responses << Response.new(stderr.read, uri)
+        stderr.close
+      end
+
       @responses.last
     end
 
     def valid_responses
       @responses.select(&:valid?)
@@ -28,14 +39,14 @@
       lines << "Validated #{responses.size} pages.".yellow
       lines << "All pages are valid.".green if invalid_responses.size == 0
       lines << "#{x_pages_be(invalid_responses.size)} invalid.".red if invalid_responses.size > 0
 
       invalid_responses.each do |response|
-        lines << "  #{response.resource}:".red
-      
-        ([response.exceptions].flatten).each do |exception|
-          lines << "    - #{exception.strip}".red
+        lines << "  #{response.uri}:".red
+
+        response.errors.each do |error|
+          lines << "    - #{error.to_s}".red
         end
       end
 
       lines.join("\n")
     end
@@ -43,9 +54,46 @@
     def x_pages_be(size)
       if size <= 1
         "#{size} page is"
       else
         "#{size} pages are"
+      end
+    end
+
+    class Response
+      attr_reader :uri
+
+      def initialize(response = nil, uri = nil)
+        @response = response
+        @uri      = uri
+      end
+
+      def valid?
+        @response.empty?
+      end
+
+      def errors
+        @response.split("\n").map do |error|
+          matches = error.match(/line (\d*) column (\d*) - (.*)/)
+          Error.new( matches[1],
+                     matches[3],
+                     column: matches[2]
+                   )
+        end
+      end
+
+      class Error
+        attr_reader :line, :message, :details
+
+        def initialize(line, message, details = {})
+          @line    = line
+          @message = message
+          @details = details
+        end
+
+        def to_s
+          "Line #{@line}, column #{@details[:column]}: #{@message}."
+        end
       end
     end
   end
 end