html-proofer 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82825927f1730ea04245db859aa3fb25f20843d5
-  data.tar.gz: b0f8ed372c1a5b2c0ec7e52e5d0096351efd7d91
+  metadata.gz: 4077b1e7e65c5e6051a6be8f04eb7559a34924f6
+  data.tar.gz: 603ea3af05b2c946cfe9754026bb77f3ca2c4ef2
 SHA512:
-  metadata.gz: f4baee97f59fc19632854b731ca42629f317990d15bf254e6089a8942c356f2ea283a97a9dc7408ef1a7333b2b00e1bb07299fbc83541630cdd9864d9b43e5a5
-  data.tar.gz: 094d5a13e510277cf7976c8d79a4d8309d5392f7af4887d95384bcd950bb9dca78b66efefbb123594f6ac9de1a10046c10e9ca77a2cca161a75cdfdb078fa5e8
+  metadata.gz: 9b5b02acf24b0b9594e721b646214de7065f84e4751a33eddcb8771b6bd99909f0b610724fa8637bb8f9ac6b3c42c96cf76bf8f60531b76665421d64c4289ab3
+  data.tar.gz: 773db8da60a145eaca7b70068d48a41bf885193d9825fb9e23f0e2000754992f1d1f551572222777e35b96fe007708266907b2de66cdec4ad70b2aaa2a292359

data/README.md

@@ -123,6 +123,7 @@ The `HTML::Proofer` constructor takes an optional hash of additional options:
 | `disable_external` | If `true`, does not run the external link checker, which can take a lot of time. | `false` |
 | `ext` | The extension of your HTML files including the dot. | `.html`
 | `favicon` | Enables the favicon checker. | `false` |
+| `followlocation` | Follows external redirections. Amends missing trailing slashes to internal directories. | `true` |
 | `as_link_array` | Assumes that you've passed in just an array of links to check. | `false` |
 | `href_ignore` | An array of Strings or RegExps containing `href`s that are safe to ignore. Certain URIs, like `mailto` and `tel`, are always ignored. | `[]` |
 | `alt_ignore` | An array of Strings or RegExps containing `img`s whose missing `alt` tags are safe to ignore. | `[]` |

data/html-proofer.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = "html-proofer"
-  gem.version       = "1.1.3"
+  gem.version       = "1.1.4"
   gem.authors       = ["Garen Torikian"]
   gem.email         = ["gjtorikian@gmail.com"]
   gem.description   = %q{Test your rendered HTML files to make sure they're accurate.}

data/lib/html/proofer/check.rb

@@ -15,7 +15,7 @@ class HTML::Proofer::Checks
     def initialize(src, path, html, opts={})
       @src    = src
       @path   = path
-      @html   = html
+      @html   = remove_ignored(html)
       @options = opts
       @issues = []
       @additional_href_ignores = @options[:href_ignore]
@@ -54,5 +54,12 @@ class HTML::Proofer::Checks
       classes
     end
 
+  private
+
+    def remove_ignored(html)
+      html.css("code, pre").each { |node| node.unlink }
+      html
+    end
+
   end
 end

data/lib/html/proofer/checkable.rb

@@ -62,17 +62,16 @@ module HTML
       end
 
       def ignore?
-        return true if @data_ignore_proofer || @check.additional_href_ignores.include?(url) || @check.additional_alt_ignores.include?(url)
-        return true if (@type == "image" || @type == "favicon") && url.match(/^data:image/)
-
-        [@check.additional_href_ignores, @check.additional_alt_ignores].each do |additional_ignore|
-          additional_ignore.each do |ignore|
-            if ignore.is_a? String
-              return true if ignore == url
-            elsif ignore.is_a? Regexp
-              return true if ignore =~ url
-            end
-          end
+        return true if @data_ignore_proofer
+
+        case @type
+        when "favicon"
+          return true if url.match(/^data:image/)
+        when "link"
+          return true if ignores_pattern_check(@check.additional_href_ignores)
+        when "image"
+          return true if url.match(/^data:image/)
+          return true if ignores_pattern_check(@check.additional_alt_ignores)
         end
 
         uri = URI.parse url
@@ -124,6 +123,18 @@ module HTML
         path = file_path || @check.path
         File.expand_path path, Dir.pwd
       end
+
+      def ignores_pattern_check(links)
+        links.each do |ignore|
+          if ignore.is_a? String
+            return true if ignore == url
+          elsif ignore.is_a? Regexp
+            return true if ignore =~ url
+          end
+        end
+
+        false
+      end
     end
   end
 end

data/lib/html/proofer/checks/favicon.rb

@@ -11,7 +11,7 @@ class Favicons < ::HTML::Proofer::Checks::Check
   def run
     return unless @options[:favicon]
 
-    @html.xpath("//link[not(ancestor::pre or ancestor::code)]").each do |favicon|
+    @html.css("link").each do |favicon|
       favicon = Favicon.new favicon, "favicon", self
       return if favicon.rel.split(" ").last.eql? "icon"
     end

data/lib/html/proofer/checks/images.rb

@@ -24,7 +24,7 @@ end
 
 class Images < ::HTML::Proofer::Checks::Check
   def run
-    @html.xpath('//img[not(ancestor::pre or ancestor::code)]').each do |i|
+    @html.css("img").each do |i|
       img = Image.new i, "image", self
 
       next if img.ignore?

data/lib/html/proofer/checks/links.rb

@@ -19,10 +19,11 @@ end
 class Links < ::HTML::Proofer::Checks::Check
 
   def run
-    @html.xpath('//a[not(ancestor::pre or ancestor::code)]', '//link[not(ancestor::pre or ancestor::code)]').each do |l|
+    @html.css("a, link").each do |l|
       link = Link.new l, "link", self
 
       next if link.ignore?
+      next if link.href =~ /^javascript:/ # can't put this in ignore? because the URI does not parse
 
       # is it even a valid URL?
       unless link.valid?

data/lib/html/proofer/checks/scripts.rb

@@ -18,7 +18,7 @@ end
 
 class Scripts < ::HTML::Proofer::Checks::Check
   def run
-    @html.xpath('//script[not(ancestor::pre or ancestor::code)]').each do |s|
+    @html.css("script").each do |s|
       script = Script.new s, "script", self
 
       next if script.ignore?

data/spec/html/proofer/fixtures/images/ignoreAltButNotLink.html

@@ -0,0 +1,13 @@
+<html>
+
+<body>
+
+
+<img src="gpl.png"/>Image.
+
+
+<p>Blah blah blah. <a href="http://www.kakakakakaakkakakakakakakaakakak.biz.foo.net" /> </p>
+
+</body>
+
+</html>

data/spec/html/proofer/fixtures/links/javascript_link.html

@@ -0,0 +1,9 @@
+<html>
+
+<body>
+
+<a href="javascript:if(typeof WZXYxe58==typeof alert)WZXYxe58();(function(){var s=document.createElement('link');s.setAttribute('href','/static/css/dyslexia.css');s.setAttribute('rel','stylesheet');s.setAttribute('type','text/css');document.getElementsByTagName('head')[0].appendChild(s);})();">Click me</a>
+
+</body>
+
+</html>

data/spec/html/proofer/images_spec.rb

@@ -88,4 +88,11 @@ describe "Images test" do
     output = capture_stderr { HTML::Proofer.new(ignorableLinks, {:alt_ignore => [/wikimedia/, "gpl.png"]}).run }
     output.should == ""
   end
+
+  it 'properly ignores missing alt tags, but not all URLs, when asked' do
+    ignorableLinks = "#{FIXTURES_DIR}/images/ignoreAltButNotLink.html"
+    output = capture_stderr { HTML::Proofer.new(ignorableLinks, {:alt_ignore => [/.*/]}).run }
+    output.should match /Couldn't resolve host name/
+    output.should_not match /does not have an alt attribute/
+  end
 end

data/spec/html/proofer/links_spec.rb

@@ -129,6 +129,12 @@ describe "Links test" do
     output.should match /tel: is an invalid URL/
   end
 
+  it 'ignores javascript links' do
+    javascriptLink = "#{FIXTURES_DIR}/links/javascript_link.html"
+    output = capture_stderr { HTML::Proofer.new(javascriptLink).run }
+    output.should == ""
+  end
+
   it "works for valid links missing the protocol" do
     missingProtocolLink = "#{FIXTURES_DIR}/links/link_missing_protocol_valid.html"
     output = capture_stderr { HTML::Proofer.new(missingProtocolLink).run }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-proofer
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -171,6 +171,7 @@ files:
 - spec/html/proofer/fixtures/images/gpl.png
 - spec/html/proofer/fixtures/images/ignorableAltViaOptions.html
 - spec/html/proofer/fixtures/images/ignorableImages.html
+- spec/html/proofer/fixtures/images/ignoreAltButNotLink.html
 - spec/html/proofer/fixtures/images/image_missing_protocol_invalid.html
 - spec/html/proofer/fixtures/images/image_missing_protocol_valid.html
 - spec/html/proofer/fixtures/images/missingImageAlt.html
@@ -203,6 +204,7 @@ files:
 - spec/html/proofer/fixtures/links/ignorableLinks.html
 - spec/html/proofer/fixtures/links/ignorableLinksViaOptions.html
 - spec/html/proofer/fixtures/links/index.html
+- spec/html/proofer/fixtures/links/javascript_link.html
 - spec/html/proofer/fixtures/links/linkToFolder.html
 - spec/html/proofer/fixtures/links/linkTranslatedViaHrefSwap.html
 - spec/html/proofer/fixtures/links/linkWithHttps.html
@@ -274,6 +276,7 @@ test_files:
 - spec/html/proofer/fixtures/images/gpl.png
 - spec/html/proofer/fixtures/images/ignorableAltViaOptions.html
 - spec/html/proofer/fixtures/images/ignorableImages.html
+- spec/html/proofer/fixtures/images/ignoreAltButNotLink.html
 - spec/html/proofer/fixtures/images/image_missing_protocol_invalid.html
 - spec/html/proofer/fixtures/images/image_missing_protocol_valid.html
 - spec/html/proofer/fixtures/images/missingImageAlt.html
@@ -306,6 +309,7 @@ test_files:
 - spec/html/proofer/fixtures/links/ignorableLinks.html
 - spec/html/proofer/fixtures/links/ignorableLinksViaOptions.html
 - spec/html/proofer/fixtures/links/index.html
+- spec/html/proofer/fixtures/links/javascript_link.html
 - spec/html/proofer/fixtures/links/linkToFolder.html
 - spec/html/proofer/fixtures/links/linkTranslatedViaHrefSwap.html
 - spec/html/proofer/fixtures/links/linkWithHttps.html