linkey 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cf7d38db7c5c755398ed59a5523d7d33051e1d8
-  data.tar.gz: 8b4751d3e83b5021b1a794b99e7389d51003f960
+  metadata.gz: aecb337d1fc6a5912ddbfdb8d5ab85571680eb19
+  data.tar.gz: 7f3e4c32377465f87300ef4324e3fa9612c4b836
 SHA512:
-  metadata.gz: 6c9780f42a16f54e4f9c5a272e72ecd5b3d0fe798e834ec1d9722709f533e965e4a9e5a8d338df667334d07bd7e630d14b1434e14bdac343a0a03f125cbbc181
-  data.tar.gz: 4dea5a21089542399ae016d129ca922fb9ed36071a404d2b1d78f12187aa8927e3fc0070b0c8690d97de64ab11c5529605a3143c246a897f2c7bd336194895d5
+  metadata.gz: 749aa652254f43d038ca1199d8b8a4107612a0381847b38c0b33e451185d355cd30f0b2f66ff95fc6924687b3f836ae69c47874d1a872ac3e4834b1dc92a48b0
+  data.tar.gz: 36b71fc3fa9d8e7c3f83d796a511da1a21884b8f42495804e9a5cff80c1c11ad6dd4d456c782392b99e79c1e663634ce473ceff2ccc6b400960b70aa548b7508

data/lib/linkey.rb

@@ -28,7 +28,7 @@ module Linkey
 
     def scan(page_links)
       urls = page_links.scan(/^#{Regexp.quote(reg)}(?:|.+)?$/)
-      Getter.status(urls, base)
+      Getter.new(urls, base).check
     end
   end
 
@@ -63,63 +63,87 @@ module Linkey
       options = @smoke_urls["headers"]
       headers = Hash[*options]
       @smoke_urls["status_code"] ? status_code = @smoke_urls["status_code"] : status_code = 200
-      Getter.status(urls, base, { :headers => headers }, status_code)
+      Getter.new(urls, base, { :headers => headers }, status_code).check
     end
   end
 
   class Getter
-    HYDRA = Typhoeus::Hydra.new(:max_concurrency => 100)
+    def initialize(paths, base, headers = {}, status = 200)
+      @paths   = paths
+      @base    = base
+      @headers = headers
+      @status  = status
+    end
 
-    def self.status(urls, base, headers = {}, status_code = 200)
-      @output = []
+    def check
       puts "Checking..."
 
-      options = { :followlocation => true, :ssl_verifypeer => false, :headers => headers[:headers] }
-
-      requests = urls.map do |page_paths|
+      paths.each do |path|
         begin
-          request = Typhoeus::Request.new(base + page_paths, options)
-          HYDRA.queue(request)
-          request
+          Typhoeus::Request.new(url(path), options).tap do |req|
+            req.on_complete { |r| parse_response(r, status) }
+            HYDRA.queue req
+          end
         rescue
-          puts "Error with URL #{page_paths}, please check config"
+          puts "Error with URL #{path}, please check config"
         end
       end
 
       HYDRA.run
-
-      requests.map do |request|
-        begin
-          status = request.response.code
-          url = request.response.options[:effective_url]
-          make_request(url, status, status_code)
-        rescue
-          puts "Unable to get status code"
-        end
-      end
-
       check_for_broken
     end
 
-    def self.make_request(url, status, status_code)
-      if status != status_code
-        puts "Status is NOT GOOD for #{url}, response is #{status}"
-        @output << url
-      else
-        puts "Status is #{status} for #{url}"
-      end
-    end
+    private
 
-    def self.check_for_broken
+    attr_reader :base, :headers, :paths, :status
+
+    HYDRA = Typhoeus::Hydra.new(:max_concurrency => 100)
+
+    def check_for_broken
       puts "Checking"
-      if @output.empty?
+      if output.empty?
         puts 'URL\'s are good, All Done!'
         exit 0
       else
         puts "Buddy, you got a bad link"
-        puts @output
+        puts output
         exit 1
       end
     end
+
+    def make_request(url, status, status_code)
+      if status != status_code
+        puts "Status is NOT GOOD for #{url}, response is #{status}"
+        output << url
+      else
+        puts "Status is #{status} for #{url}"
+      end
+    end
+
+    def options
+      {
+        :followlocation => true,
+        :ssl_verifypeer => false,
+        :headers        => headers[:headers]
+      }
+    end
+
+    def output
+      @output ||= []
+    end
+
+    def parse_response(resp, status)
+      make_request(
+        resp.options[:effective_url],
+        resp.code,
+        status
+      )
+    rescue
+      puts "Unable to get status code"
+    end
+
+    def url(path)
+      "#{base}#{path}"
+    end
   end
 end

data/lib/linkey/version.rb

@@ -1,3 +1,3 @@
 module Linkey
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/linkey.gemspec

@@ -19,4 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "typhoeus"
+
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linkey
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Dave Blooman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-20 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: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Linkey
 email:
 - david.blooman@gmail.com