blinkr 0.2.9 → 0.3.0

data/lib/blinkr/report.rb

@@ -1,5 +1,6 @@
 require 'slim'
 require 'ostruct'
+require 'blinkr/error'
 
 module Blinkr
   class Report
@@ -17,31 +18,33 @@ module Blinkr
     end
 
     def render
-      @context.severities = {}
-      @context.categories = {}
-      @context.types = {}
-      @context.pages.each do |url, page|
-        page.max_severity = 'success'
+      @context.pages.delete_if { |_, page| page.errors.empty? }
+      @context.total = 0
+      @context.severity = {}
+      @context.category = {}
+      @context.type = {}
+      @context.pages.each do |_, page|
+        page.max_severity = ::Blinkr::SEVERITY.first # :success
         page.errors.each do |error|
-          raise "#{error.severity} not a valid severity. Must be one of #{SEVERITY.join(',')}" unless SEVERITY.include? error.severity
+          raise "#{error.severity} not a valid severity. Must be one of #{::Blinkr::SEVERITY.join(',')}" unless ::Blinkr::SEVERITY.include? error.severity
           raise "#{error.category} must be specified." if error.category.nil?
-          @context.severities[error.severity] ||= OpenStruct.new({ :id => error.severity, :count => 0 })
-          @context.severities[error.severity].count += 1
-          page.max_severity = error.severity if SEVERITY.index(error.severity) > SEVERITY.index(page.max_severity)
-          @context.categories[error.category] ||= OpenStruct.new({ :id => @context.categories.length, :count => 0, :severities => Hash.new(0), :types => {} })
-          @context.categories[error.category].severities[error.severity] += 1
-          @context.categories[error.category].types[error.type] ||= OpenStruct.new({ :id => @context.categories[error.category].types.length, :count => 0, :severities => Hash.new(0) })
-          @context.categories[error.category].types[error.type].severities[error.severity] += 1
+          @context.total += 1
+          @context.severity[error.severity] ||= OpenStruct.new({:count => 0})
+          @context.severity[error.severity].count += 1
+          page.max_severity = error.severity if ::Blinkr::SEVERITY.index(error.severity) > ::Blinkr::SEVERITY.index(page.max_severity)
+          @context.category[error.category] ||= OpenStruct.new({:count => 0})
+          @context.category[error.category].count += 1
+          @context.type[error.type] ||= OpenStruct.new({:count => 0})
+          @context.type[error.type].count += 1
         end
       end
-      @context.error_count = @context.severities.reduce(0){ |sum, (severity, metadata)| sum += metadata.count }
-      File.open(@config.report, 'w') { |file| file.write(Slim::Template.new(TMPL).render(OpenStruct.new({ :blinkr => @context, :engine => @engine }))) }
+      File.open(@config.report, 'w') do |file|
+        file.write(Slim::Template.new(TMPL).render(OpenStruct.new({:blinkr => @context, :engine => @engine,
+                                                                   :errors => @context.to_json})))
+      end
+      
       puts "Wrote report to #{@config.report}" if @config.verbose
     end
 
-    private 
-    
-    SEVERITY = ['success', 'info', 'warning', 'danger']
-
   end
 end

data/lib/blinkr/sitemap.rb

@@ -1,16 +1,17 @@
+require 'open-uri'
 module Blinkr
   module Sitemap
 
     def sitemap_locations
-      open.css('loc').collect { |loc| loc.content }
+      open_sitemap.css('loc').collect { |loc| loc.content }
     end
 
     private
-    
-    def open
+
+    def open_sitemap
       puts "Loading sitemap from #{@config.sitemap}"
       if @config.sitemap =~ URI::regexp
-        Nokogiri::XML(Typhoeus.get(@config.sitemap, followlocation: true).body)
+        Nokogiri::XML(open(@config.sitemap).read)
       else
         Nokogiri::XML(File.open(@config.sitemap))
       end

data/lib/blinkr/typhoeus_wrapper.rb

@@ -1,6 +1,3 @@
-require 'typhoeus/request'
-require 'typhoeus/response'
-require 'typhoeus/hydra'
 require 'typhoeus'
 require 'blinkr/cache'
 require 'blinkr/http_utils'
@@ -11,24 +8,30 @@ module Blinkr
 
     attr_reader :count, :hydra
 
-    def initialize config, context
+    def initialize(config, context)
       @config = config.validate
-      @hydra = Typhoeus::Hydra.new(max_concurrency: 200)      
+      # Configure Typhoeus a bit
+      Typhoeus::Config.verbose = true if config.vverbose
+      Typhoeus::Config.cache = Blinkr::Cache.new
+      @hydra = Typhoeus::Hydra.new(:maxconnects => (@config.maxconnects || 30),
+                                   :max_total_connections => (@config.maxconnects || 30),
+                                   :max_concurrency => (@config.maxconnects || 30))
       @count = 0
       @context = context
     end
 
-    def process_all urls, limit, &block
+    def process_all(urls, limit, opts = {}, &block)
       urls.each do |url|
-        process url, limit, &block
+        process url, limit, opts, &block
       end
+      @hydra.run
     end
 
-    def process url, limit, &block
-      _process url, limit, limit, &block
+    def process(url, limit, opts = {}, &block)
+      _process url, limit, limit, opts, &block
     end
 
-    def debug url
+    def debug(url)
       process(url, @config.max_retrys) do |resp|
         puts "\n++++++++++"
         puts "+ Blinkr +"
@@ -65,21 +68,21 @@ module Blinkr
 
     private
 
-    def _process url, limit, max, &block
+    def _process(url, limit, max, opts = {}, &block)
       unless @config.skipped? url
         req = Typhoeus::Request.new(
-          url,
-          followlocation: true,
-          verbose: @config.vverbose
+            url,
+            opts.merge(:followlocation => true)
         )
         req.on_complete do |resp|
           if retry? resp
-            if limit > 1 
+            if limit > 1
               puts "Loading #{url} via typhoeus (attempt #{max - limit + 2} of #{max})" if @config.verbose
               _process(url, limit - 1, max, &Proc.new)
             else
               puts "Loading #{url} via typhoeus failed" if @config.verbose
-              response = Typhoeus::Response.new(code: 0, status_message: "Server timed out after #{max} retries", mock: true)
+              response = Typhoeus::Response.new(:code => 0, :status_message => "Server timed out after #{max} retries",
+                                                :mock => true)
               response.request = Typhoeus::Request.new(url)
               Typhoeus.stub(url).and_return(response)
               block.call response, nil, nil

data/lib/blinkr/version.rb

@@ -1,4 +1,4 @@
 module Blinkr
-  VERSION='0.2.9'
+  VERSION='0.3.0'
 end
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: blinkr
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Pete Muir
+- Jason Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,14 +100,12 @@ description: A broken page and link checker for websites. Optionally uses phanto
   page load errors.
 email:
 - pmuir@bleepbleep.org.uk
+- lightguard.jp@gmail.com
 executables:
 - blinkr
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -117,6 +116,7 @@ files:
 - lib/blinkr/cache.rb
 - lib/blinkr/config.rb
 - lib/blinkr/engine.rb
+- lib/blinkr/error.rb
 - lib/blinkr/extensions/a_title.rb
 - lib/blinkr/extensions/empty_a_href.rb
 - lib/blinkr/extensions/img_alt.rb
@@ -127,7 +127,9 @@ files:
 - lib/blinkr/extensions/meta.rb
 - lib/blinkr/extensions/pipeline.rb
 - lib/blinkr/extensions/resources.rb
+- lib/blinkr/hacks.rb
 - lib/blinkr/http_utils.rb
+- lib/blinkr/manticore_wrapper.rb
 - lib/blinkr/phantomjs_wrapper.rb
 - lib/blinkr/report.html.slim
 - lib/blinkr/report.rb
@@ -147,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.swp

data/.ruby-gemset

@@ -1 +0,0 @@
-blink

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.1.2