blinkr 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6d0248a7f8b5ffd6fb131c9bfd554d542fcf4e2
-  data.tar.gz: cc36b93643ea59c8b2874f31fbec41f0460a353b
+  metadata.gz: 1df6688e98868b28398b0bb8cd3e31f4ad47e450
+  data.tar.gz: d21bfa1954fbf9f2328c0baefefaff23eee6c98c
 SHA512:
-  metadata.gz: a48ff2eb5cc0d25694bc17f6d34c7443199cf4521bd6564e21f197e99bc0d39d6ced7a4169049ff32f6f72c163b771914bd60f298b491b8d873f169cbb70f0ae
-  data.tar.gz: 521419f058076d99248ed4bf0642a5be3152ad7d698f0089e0d5bf6031d1e8b7f1544b2279712437f2c36ce91008591978aa7d81bf5099ea41e507d77afeb9d6
+  metadata.gz: 9db0fb41e32a587e2f20384473ed72642113a35545688f2777de887cb5a085be94baab09ff92832649a8618a927ac6b4f1977f9feb0da34f1ea98210e4812d8a
+  data.tar.gz: e2bf502da1bf99a5e98120c934cd0d9507a9afd37bfe1fcf3a43f17cb29cb86f3eb979b921ea4dfbcc7894b514f93b689574c5f4ade17696dd7cb9e980904f2a

data/lib/blinkr/config.rb

@@ -9,7 +9,9 @@ module Blinkr
     end
 
     DEFAULTS = {:skips => [], :ignores => [], :max_retrys => 3, :browser => 'typhoeus',
-                :viewport => 1200, :phantomjs_threads => 8, :report => 'blinkr.html'}
+                :viewport => 1200, :phantomjs_threads => 8, :report => 'blinkr.html',
+                :warning_on_300s => false
+               }
 
     def initialize(hash={})
       super(DEFAULTS.merge(hash))

data/lib/blinkr/extensions/links.rb

@@ -37,9 +37,14 @@ module Blinkr
         processed = 0
         # Find the internal links
         @links.select{|k| k.start_with? @config.base_url}.each do |url, locations|
+          # TODO figure out what to do about relative links
           link = URI.parse(url)
+
+          # fix up links so they're proper, also drop fragments and queries as they won't be in the sitemap that way
           link.fragment = nil
           link.query = nil
+          link.path = link.path.gsub(/\/+/, '/') if link.path
+
           unless context.pages.keys.include?(link.to_s) || context.pages.keys.include?((link.to_s + '/'))
             locations.each do |location|
               location[:page].errors << Blinkr::Error.new({:severity => :warning,
@@ -60,10 +65,11 @@ module Blinkr
         external_links.each do |url, metadata|
           # if link start_with? @config.base_url check to see if it's in the sitemap.xml
           browser.process(url, @config.max_retrys, :method => :get, :followlocation => true, :timeout => 30,
+                                                   :cookiefile => '_tmp/cookies', :cookiejar => '_tmp/cookies',
                                                    :connecttimeout => 10, :maxredirs => 3) do |resp|
             puts "Loaded #{url} via #{browser.name} #{'(cached)' if resp.cached?}" if @config.verbose
 
-            if resp.code.to_i < 200 || resp.code.to_i > 300
+            if resp.code.to_i < 200 || (resp.code.to_i > 300 && @config.warning_on_300s)
               response = resp
 
               metadata.each do |src|
@@ -80,12 +86,12 @@ module Blinkr
                   severity = :warning
                 end
                 src[:page].errors << Blinkr::Error.new({:severity => severity,
-                :category => 'Resources missing',
-                :type => '<a href=""> target cannot be loaded',
-                :url => url, :title => "#{url} (line #{src[:line]})",
-                :code => response.code.to_i, :message => message,
-                :detail => detail, :snippet => src[:snippet],
-                :icon => 'fa-bookmark-o'}) unless response.success?
+                                                        :category => 'Resources missing',
+                                                        :type => '<a href=""> target cannot be loaded',
+                                                        :url => url, :title => "#{url} (line #{src[:line]})",
+                                                        :code => response.code.to_i, :message => message,
+                                                        :detail => detail, :snippet => src[:snippet],
+                                                        :icon => 'fa-bookmark-o'}) unless response.success?
               end
             end
             processed += 1

data/lib/blinkr/extensions/meta.rb

@@ -39,7 +39,7 @@ module Blinkr
             lines << elm.line
             snippets << elm.to_s
           end
-          page.errors << Blinkr::Error.new({:severity => :info, :category => 'HTML Compatibility/Correctness',
+          page.errors << Blinkr::Error.new({:severity => :danger, :category => 'HTML Compatibility/Correctness',
                                             :type => '<title> tag declared more than once',
                                             :title => %Q{<title> declared more than once (lines #{lines.join(', ')})},
                                             :message => %Q{<title> declared more than onc},
@@ -53,13 +53,13 @@ module Blinkr
           @titles[title] ||= {}
           @titles[title][page.response.effective_url] = page
           if title.length < 20
-            page.errors << Blinkr::Error.new({:severity => :info, :category => 'SEO', :type => 'page title too short',
+            page.errors << Blinkr::Error.new({:severity => :warning, :category => 'SEO', :type => 'page title too short',
                                               :title => %Q{<title> too short (line #{elms.first.line})},
                                               :message => %Q{<title> too short (< 20 characters)},
                                               :snippet => elms.first.to_s, :icon => 'fa-header'})
           end
           if title.length > 55
-            page.errors << Blinkr::Error.new({:severity => :info, :category => 'SEO', :type => 'page title too long',
+            page.errors << Blinkr::Error.new({:severity => :warning, :category => 'SEO', :type => 'page title too long',
                                               :title => %Q{<title> too long (line #{elms.first.line})},
                                               :message => %Q{<title> too long (> 55 characters)},
                                               :snippet => elms.first.to_s, :icon => 'fa-header'})
@@ -76,13 +76,13 @@ module Blinkr
             lines << elm.line
             snippets << elm.to_s
           end
-          page.errors << Blinkr::Error.new({:severity => :info, :category => 'HTML Compatibility/Correctness',
+          page.errors << Blinkr::Error.new({:severity => :danger, :category => 'HTML Compatibility/Correctness',
                                             :type => '<meta name="description"> tag declared more than once',
                                             :title => %Q{<meta name="description"> tag declared more than once (lines #{lines.join(', ')})},
                                             :message => %Q{<meta name="description"> tag declared more than once},
                                             :snippet => snippets.join('\n'), :icon => 'fa-header'})
         elsif elms.empty?
-          page.errors << Blinkr::Error.new({:severity => :info, :category => 'SEO',
+          page.errors << Blinkr::Error.new({:severity => :warning, :category => 'SEO',
                                             :type => '<meta name="description"> tag missing',
                                             :title => %Q{<meta name="description"> tag missing},
                                             :message => %Q{<meta name="description"> tag missing},
@@ -92,14 +92,14 @@ module Blinkr
           @descriptions[desc] ||= {}
           @descriptions[desc][page.response.effective_url] = page
           if desc.length < 60
-            page.errors << Blinkr::Error.new({:severity => :info, :category => 'SEO',
+            page.errors << Blinkr::Error.new({:severity => :warning, :category => 'SEO',
                                               :type => '<meta name="description"> too short',
                                               :title => %Q{<meta name="description"> too short (lines #{elms.first.line})},
                                               :message => %Q{<meta name="description"> too short (< 60 characters)},
                                               :snippet => elms.first.to_s, :icon => 'fa-header'})
           end
           if desc.length > 115
-            page.errors << Blinkr::Error.new({:severity => :info, :category => 'SEO',
+            page.errors << Blinkr::Error.new({:severity => :warning, :category => 'SEO',
                                               :type => '<meta name="description"> too long',
                                               :title => %Q{<meta name="description"> too long (lines #{elms.first.line})},
                                               :message => %Q{<meta name="description"> too long (> 115 characters)},

data/lib/blinkr/http_utils.rb

@@ -30,6 +30,12 @@ module Blinkr
         # If we have an absolute path URI, join it to the base URL
         dest_uri = URI.join(base_uri.scheme, base_uri.hostname, base_uri.port, dest_uri) if empty?(dest_uri.scheme) && empty?(dest_uri.hostname)
 
+        # switch multiple '/' to just one. Those types of URIs don't affect the browser,
+        # but they do affect our checking
+        dest_uri.path = dest_uri.path.gsub(/\/+/, '/') if dest_uri.path
+        dest_uri.query = dest_uri.query.gsub(/\/+/, '/') if dest_uri.query
+        dest_uri.fragment = dest_uri.query.gsub(/\/+/, '/') if dest_uri.fragment
+
         dest = dest_uri.to_s
       rescue URI::InvalidURIError, URI::InvalidComponentError, URI::BadURIError
         # ignored

data/lib/blinkr/version.rb

@@ -1,4 +1,4 @@
 module Blinkr
-  VERSION='0.3.3'
+  VERSION='0.3.4'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blinkr
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Pete Muir
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler