linkey 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ddaf7abf726952442158a9cdee11371cec1a7f2
-  data.tar.gz: b12f32b17cda71b19d2a46a3d854528fe33ae376
+  metadata.gz: 306512d00f55ed9b6c74b858c087621c420ad225
+  data.tar.gz: c3e26fd44a31553ae0be10d6cdaacc6de53943d4
 SHA512:
-  metadata.gz: c11a6981001909f888f2790aa467082a1a06f19ed8913ad267ed93a1ae84fcffff09b9ada3d5d5ba5ebe2c9ee71fe24588031713244f4c0dd374d4591184d96d
-  data.tar.gz: 4fd8cd1b04ccd043920e2c3e6b74f3e1ca72b61af0d333826ba1323d0b6aa1ca5bdffaab2f93a077535c5e4656d71a46f97d176aea8f813cd3d03698d96045b9
+  metadata.gz: 5483ae20a70fb78194753c4ccb6fcbb28c4e2d1cfe753761ea2813b3828343b24200a8f5a7ac218bd3c0a5eb4efc9411cd88a3d0bc9f4cf05a28b3d9490bc797
+  data.tar.gz: 10935afa6b84e205a1fcf9158f7fda8cc845560827c605b9d45ebeb50456dc3c2e4539f7152e1045f458f1d6a031ca0f188b0d3c0382f9f889c1395e4795d3b1

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - "2.0.0"
 
-script: "bundle exec bin/linkey check http://www.bbc.com/news http://www.bbc.com /news news.md"
+script: "bundle exec bin/linkey check http://www.theguardian.com/technology/2014/feb/15/year-of-code-needs-reboot-teachers http://www.theguardian.com /technology news.md"
 
 notifications:
   email:

data/lib/linkey.rb

@@ -1,7 +1,7 @@
 require 'linkey/version'
-require 'open-uri'
 require 'yaml'
 require 'parallel'
+require 'typhoeus'
 
 module Linkey
   autoload :CLI, 'linkey/cli'
@@ -31,28 +31,32 @@ module Linkey
 
     def scan(page_links)
       urls = page_links.scan(/^#{Regexp.quote(reg)}(?:|.+)?$/)
-      status(urls)
+      Getter.status(urls, base)
     end
+  end
 
-    def status(urls)
+  class Getter
+    def self.status(urls, base, headers = {})
       @output = []
       puts 'Checking...'
       Parallel.each(urls, in_threads: 7) do |page_path|
-        begin
-          gets = open(base + page_path)
-          status = gets.status.first
-          puts "Status is #{status} for #{base}#{page_path}"
-        rescue OpenURI::HTTPError
-          if status != 200
-            puts "Status is NOT GOOD for #{base}#{page_path}"
-            @output << page_path
-          end
-        end
+        request = Typhoeus.get(base + page_path.chomp('/'), headers)
+        status = request.code
+        make_request(page_path, base, status)
       end
       check_for_broken
     end
 
-    def check_for_broken
+    def self.make_request(page_path, base, status)
+      if status != 200
+        puts "Status is NOT GOOD for #{base}#{page_path}, response is #{status}"
+        @output << page_path
+      else
+        puts "Status is #{status} for #{base}#{page_path}"
+      end
+    end
+
+    def self.check_for_broken
       puts 'Checking'
       if @output.empty?
         puts 'URL\'s are good, All Done!'
@@ -93,7 +97,9 @@ module Linkey
 
     def smoke
       urls = @smoke_urls['paths']
-      status(urls)
+      options = @smoke_urls['headers']
+      headers = Hash[*options]
+      Getter.status(urls, base, headers: headers)
     end
   end
 end

data/lib/linkey/version.rb

@@ -1,3 +1,3 @@
 module Linkey
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/linkey.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['david.blooman@gmail.com']
   spec.summary       = 'Linkey'
   spec.description   = 'Linkey'
-  spec.homepage      = 'http://responsivenews.co.uk'
+  spec.homepage      = 'https://github.com/DaveBlooman/linkey'
   spec.license       = 'Apache 2'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
@@ -19,4 +19,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'parallel'
+  spec.add_runtime_dependency 'typhoeus'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linkey
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dave Blooman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Linkey
 email:
 - david.blooman@gmail.com
@@ -58,7 +72,7 @@ files:
 - lib/linkey/javascript/snap.js
 - lib/linkey/version.rb
 - linkey.gemspec
-homepage: http://responsivenews.co.uk
+homepage: https://github.com/DaveBlooman/linkey
 licenses:
 - Apache 2
 metadata: {}