blinkr 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66a212fd08a0e0112b033c4ba696dc8ff0c77be6
-  data.tar.gz: 23301db2cd611dcd4c075972ac94dbfebb4228be
+  metadata.gz: c2657c0ca08b00bf7cf9382dbe26798919ec9c72
+  data.tar.gz: 849ccd9b225ee72eb254d33de181e368fefae007
 SHA512:
-  metadata.gz: 881c1f04dfddd69802a19e91b15aa6e5048731123578f65716c4517bed2106e327f59078e6b0ed2336204928cc1f2334dac331e549e4bb15d4b14142a18fbfcb
-  data.tar.gz: db66a8ec76a20da8df107c5602edc8b4e344f9a0754de35705236ce14be5d74135dde482c3054769e7cf02a2bf376f844299a2d9f27b956b0cd7da651a7ea37d
+  metadata.gz: 8773b0022dc4c69561a4c744d95fef17e76f548d77730f75dea2630d7832b4d7de22d30ac7cafd55bd562a246cfd224522b412206fbfea53b47a858cd649809d
+  data.tar.gz: 3a9909351f7f27451c7e29d6b5fc176bedf2b76b7ba7a121d754801a019b12720f9cfe27fc64dbe3555ce3d6ce25690d96c872744601ef81f80d11bb18b9ca31

data/lib/blinkr/config.rb

@@ -38,13 +38,24 @@ module Blinkr
       r
     end
 
-    def ignored? url, code, message
-      return false if uril.nil? || code.nil? || message.nil?
+    def ignored? error
+      url = error.url
+      code = error.code
+      message = error.message
+      snippet = error.snippet
 
       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)
+	return true if ignore['url'].is_a?(Regexp) && url && ignore['url'] =~ url
+	return true if ignore['url'] == url
+
+        return true if ignore['code'].is_a?(Regexp) && code && ignore['code'] == code
+        return true if ignore['code']  == code
+
+        return true if ignore['message'].is_a?(Regexp) && message && ignore['message'] =~ message
+        return true if ignore['message']  == message
+
+        return true if ignore['snippet'].is_a?(Regexp) && snippet && ignore['snippet'] =~ snippet
+        return true if ignore['snippet'] == snippet
         false
       end
     end

data/lib/blinkr/engine.rb

@@ -109,7 +109,7 @@ module Blinkr
       end
 
       def <<(error)
-        if @config.ignored?(error.url, error.code, error.message)
+        if @config.ignored?(error)
           self
         else
           super

data/lib/blinkr/extensions/links.rb

@@ -63,13 +63,13 @@ module Blinkr
         end
         @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,
+          browser.process(url, @config.max_retrys, :method => :get, :followlocation => true, :timeout => 60,
                                                    :cookiefile => '_tmp/cookies', :cookiejar => '_tmp/cookies',
-                                                   :connecttimeout => 10, :maxredirs => 3) do |resp|
+                          :connecttimeout => 30, :maxredirs => 3) do |resp|
             puts "Loaded #{url} via #{browser.name} #{'(cached)' if resp.cached?}" if @config.verbose
 
             resp_code = resp.code.to_i
-            if resp_code < 200 || ((resp_code > 300 && resp_code < 400) && @config.warning_on_300s) || resp_code > 400
+            if ((resp_code > 300 && resp_code < 400) && @config.warning_on_300s) || resp_code > 400
               response = resp
 
               detail = nil

data/lib/blinkr/phantomjs_wrapper.rb

@@ -35,6 +35,10 @@ module Blinkr
       'phantomjs'
     end
 
+    def command
+      'phantomjs'
+    end
+
     private
 
     def _process url, limit, max, opts = {}, &block
@@ -47,7 +51,7 @@ module Blinkr
           return block.call response, @cache.get("#{url}-resourceErrors"), @cache.get("#{url}-javascriptErrors")
         end
 
-        output, status = Open3.capture2("#{name} #{SNAP_JS} #{url} #{@config.viewport}")
+        output, status = Open3.capture2("#{command} #{SNAP_JS} #{url} #{@config.viewport}")
         if status == 0
           json = JSON.load(output)
           response = Typhoeus::Response.new(:code => 200, :body => json['content'], :effective_url => json['url'],

data/lib/blinkr/slimer_js_wrapper.rb

@@ -3,5 +3,10 @@ module Blinkr
     def name
       'slimerjs'
     end
+
+    def command
+      return 'xvfb-run slimerjs' if @config.xvfb
+      'slimerjs'
+    end
   end
 end

data/lib/blinkr/typhoeus_wrapper.rb

@@ -77,7 +77,9 @@ module Blinkr
       unless @config.skipped? url
         req = Typhoeus::Request.new(
             url,
-            opts.merge(:followlocation => true)
+            opts.merge(:followlocation => true, :timeout => 60,
+                       :cookiefile => '_tmp/cookies', :cookiejar => '_tmp/cookies',
+                       :connecttimeout => 30, :maxredirs => 3)
         )
         req.on_complete do |resp|
           if retry? resp

data/lib/blinkr/version.rb

@@ -1,4 +1,4 @@
 module Blinkr
-  VERSION='0.3.8'
+  VERSION='0.3.9'
 end
 

metadata

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