blinkr 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ae9d41b67344e89b2be1a9114913c387bfe0137
-  data.tar.gz: adb4a85a366617189d158bcd3296ea31d0fd6a04
+  metadata.gz: 1aea80c9c477eab4ce09539b9b697ef2401a33b0
+  data.tar.gz: 7d57e314a280981c97c9829f975bd138ba65302d
 SHA512:
-  metadata.gz: 0a4d6eb3adf7dd35fc7a98f2c192cc6b8f04cee7536a06cec3559c617ebc172ede2c53366aa7818541b823937d5511c7265c3a14726948eb495016cf25843ec4
-  data.tar.gz: 30ddd5da3af3a0a4acaa03bda9096f40e7d9edb72529774d356f6907945aa9a389a2f0fd8d9edf2e9ae9b752363f7783241f44586b432e51309f50ce1eb30494
+  metadata.gz: d00baebd8c848e05d7501cc7fda16f79fc36ff98fdeb587850cfff6fe7c78f4b1c2e5f755223e18f5ce2f1196bcc2ae82900e772ac857d23750996fb59d698d6
+  data.tar.gz: 60701213a46677ac5bb75701ec7a09f4f9a0b9bc03fead126eb3296a2c8eb1b924548376f8a6fb48f394ea8c5d1b2becfe82afb7fb08eb271e45be095ee028f7

data/lib/blinkr/config.rb

@@ -39,7 +39,14 @@ module Blinkr
     end
 
     def ignored? url, code, message
-      ignores.any? { |ignore| ( !url.nil? && ignore.has_key?('url') ? !ignore['url'].match(url).nil? : true )  && ( !code.nil? && ignore.has_key?('code') ? ignore['code'] == code : true ) && ( !message.nil? && ignore.has_key?('message') ? !ignore['message'].match(message).nil? : true ) }
+      return false if uril.nil? || code.nil? || message.nil?
+
+      ignores.any? do |ignore|
+        return true if ignore.has_key?('url') && ignore['url'].match(url)
+        return true if ignore.has_key?('code') && ignore['code'] == code
+        return true if ignore.has_key?('message') && ignore['message'].match(message)
+        false
+      end
     end
 
     def skipped? url

data/lib/blinkr/error.rb

@@ -7,7 +7,7 @@ module Blinkr
       raise TypeError 'severity must be a string or symbol' unless opts[:severity].is_a?(String) || opts[:severity].is_a?(Symbol)
       raise 'severity not a recognized value' unless SEVERITY.include? opts[:severity].to_sym
 
-      @severity = opts[:severity]
+      @severity = opts[:severity].to_sym
       @category = opts[:category]
       @type = opts[:type]
       @title = opts[:title]

data/lib/blinkr/extensions/img_alt.rb

@@ -10,7 +10,7 @@ module Blinkr
 
       def collect page
         page.body.css('img:not([alt])').each do |img|
-          page.errors << OpenStruct.new({:severity => 'warning', :category => 'SEO',
+          page.errors << ::Blinkr::Error.new({:severity => :warning, :category => 'SEO',
                                          :type => '<img alt=""> missing',
                                          :title => "#{img['src']} (line #{img.line})",
                                          :message => '<img alt=""> missing', :snippet => img.to_s,

data/lib/blinkr/extensions/inline_css.rb

@@ -10,18 +10,20 @@ module Blinkr
 
       def collect page
         page.body.css('[style]').each do |elm|
+          elm_clone = Nokogiri.make(elm.to_s)
+          elm_clone.inner_html = ""
           if elm['style'] == ""
             page.errors << Blinkr::Error.new({:severity => 'info', :category => 'HTML Compatibility/Correctness',
                                               :type => 'style attribute is empty',
                                               :title => %Q{"#{elm['style']}" (line #{elm.line})},
-                                              :message => 'style attribute is empty', :snippet => elm.to_s,
+                                              :message => 'style attribute is empty', :snippet => elm_clone.to_s,
                                               :icon => 'fa-info'})
           else
             page.errors << Blinkr::Error.new({:severity => 'info',
                                               :category => 'HTML Compatibility/Correctness',
                                               :type => 'Inline CSS detected',
                                               :title => %Q{"#{elm['style']}" (line #{elm.line})},
-                                              :message => 'inline style', :snippet => elm.to_s,
+                                              :message => 'inline style', :snippet => elm_clone.to_s,
                                               :icon => 'fa-info'})
           end
         end

data/lib/blinkr/extensions/links.rb

@@ -33,8 +33,8 @@ module Blinkr
         puts '----------------------'
         start = DateTime.now
 
-        external_links = @links.reject { |k| k.start_with? @config.base_url }
         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
@@ -59,32 +59,32 @@ module Blinkr
                                                           })
               # It wasn't in the sitemap, so we'll add it to the "external_links" to still be checked
             end
-            external_links[link.to_s] = locations
           end
         end
-        external_links.each do |url, metadata|
+        @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 && @config.warning_on_300s)
+            resp_code = resp.code.to_i
+            if resp_code < 200 || ((resp_code > 300 && resp_code < 400) && @config.warning_on_300s) || resp_code > 400
               response = resp
 
-              metadata.each do |src|
-                detail = nil
-                if response.status_message.nil?
-                  message = response.return_message
-                else
-                  message = response.status_message
-                  detail = response.return_message unless resp.return_message == 'No error'
-                end
+              detail = nil
+              if response.status_message.nil?
+                message = response.return_message
+              else
+                message = response.status_message
+                detail = response.return_message unless resp.return_message == 'No error'
+              end
 
-                severity = :danger
-                if response.code.to_i >= 300 && response.code.to_i < 400
-                  severity = :warning
-                end
+              severity = :danger
+              if response.code.to_i >= 300 && response.code.to_i < 400
+                severity = :warning
+              end
+              metadata.each do |src|
                 src[:page].errors << Blinkr::Error.new({:severity => severity,
                                                         :category => 'Resources missing',
                                                         :type => '<a href=""> target cannot be loaded',
@@ -95,7 +95,7 @@ module Blinkr
               end
             end
             processed += 1
-            puts "Processed #{processed} of #{external_links.size}" if @config.verbose
+            puts "Processed #{processed} of #{@links.size}" if @config.verbose
           end
         end
         browser.hydra.run if browser.is_a? Blinkr::TyphoeusWrapper

data/lib/blinkr/extensions/meta.rb

@@ -1,5 +1,4 @@
 require 'blinkr/error'
-require 'ostruct'
 require 'slim'
 
 module Blinkr

data/lib/blinkr/report.rb

@@ -18,7 +18,6 @@ module Blinkr
     end
 
     def render
-      @context.pages.delete_if { |_, page| page.errors.empty? }
       @context.total = 0
       @context.severity = {}
       @context.category = {}

data/lib/blinkr/version.rb

@@ -1,4 +1,4 @@
 module Blinkr
-  VERSION='0.3.5'
+  VERSION='0.3.6'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blinkr
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Pete Muir
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler