headhunter 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17899a252da19aa720eaafc32ae6d34fee5d37e6
-  data.tar.gz: 07fd0c44d1085be0f05b59213ce8d4fcb275daf1
+  metadata.gz: 4eab4440d00eba351de19361f2dac45a68db188d
+  data.tar.gz: d8689bd2c15d0358f865653976a7f193a6bc7727
 SHA512:
-  metadata.gz: 32d2db1f50a555c779dc284d89d53038a0f33269213e6a38fa87f1a006fa48bd1a7752172c8cbceb1bf2eee044173c6b62a2d7aae981c78dc51a3f3c4a2c6cb6
-  data.tar.gz: e86281c07b6d6889b7c1a5e7a901775203eaf646900f6c8fcdb3a7f1290d8ea56ad616281ae77817cd022d28921d45c51d4320975c484143c50fa8f47bcc0532
+  metadata.gz: 17736bf55ce84edf7be0c74a33a8c5b8f25202d293506c7baa3bddf4a50992c436b0925f0ddd11203605ca1bcacc0724c3530bd9a8ae735127ed5966b3d69f65
+  data.tar.gz: e9710d38bbc41753ca27d0bd4f928f68c37c1a10750c3b3b4ba7bd15a34eacf40e279af68ef9bfbc8da2d421de603be3c4ed7ed6f342e5df652ebe6dab23be9a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    headhunter (0.1.5)
+    headhunter (0.1.6)
       colorize
       css_parser (>= 1.2.6)
       html_validation

data/lib/headhunter/css_validator.rb

@@ -3,7 +3,7 @@ require 'nokogiri/xml'
 
 module Headhunter
   class CssValidator
-    VALIDATOR_PATH = Gem.loaded_specs['headhunter'].full_gem_path + '/lib/css-validator/'
+    VALIDATOR_DIR = Gem.loaded_specs['headhunter'].full_gem_path + '/lib/css-validator/'
 
     attr_reader :stylesheets, :responses
 
@@ -21,7 +21,8 @@ module Headhunter
       # See http://stackoverflow.com/questions/1137884/is-there-an-open-source-css-validator-that-can-be-run-locally
       # More config options see http://jigsaw.w3.org/css-validator/manual.html
       results = if File.exists?(uri)
-                  Dir.chdir(VALIDATOR_PATH) { `java -jar css-validator.jar --output=soap12 file:#{uri}` }
+                  # TODO: Better use Open3.popen3!
+                  Dir.chdir(VALIDATOR_DIR) { `java -jar css-validator.jar --output=soap12 file:#{uri}` }
                 else
                   raise "Couldn't locate uri #{uri}"
                 end
@@ -73,19 +74,19 @@ module Headhunter
 
     class Response
       def initialize(response = nil)
-        @document = Nokogiri::XML(convert_soap_to_xml(response)) if response
+        @dom = Nokogiri::XML(convert_soap_to_xml(response)) if response
       end
 
       def [](key)
-        @headers[key]
+        @dom[key] # TODO: still needed?
       end
 
       def valid?
-        @document.css('validity').text == 'true'
+        @dom.css('validity').text == 'true'
       end
 
       def errors
-        @document.css('errors error').map do |error|
+        @dom.css('errors error').map do |error|
           Error.new( error.css('line').text.strip.to_i,
                      error.css('message').text.strip[0..-3],
                      errortype: error.css('errortype').text.strip,
@@ -97,7 +98,7 @@ module Headhunter
       end
 
       def uri
-        @document.css('cssvalidationresponse > uri').text
+        @dom.css('cssvalidationresponse > uri').text
       end
 
       private

data/lib/headhunter/html_validator.rb

@@ -2,15 +2,26 @@ 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
 
@@ -30,10 +41,10 @@ module Headhunter
       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
 
@@ -47,5 +58,42 @@ module Headhunter
         "#{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

data/lib/headhunter/version.rb

@@ -1,3 +1,3 @@
 module Headhunter
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: headhunter
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Joshua Muheim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri