url-checker 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc8f608df4641ec27291dca1cc2170b2dde74210
-  data.tar.gz: 157d02f42cb51fd56272580b93ac5e87b6e3ad2b
+  metadata.gz: 5a3976012ff91534b59a8a2ed70550a453602fda
+  data.tar.gz: c09fdcd490bc26047cc0d9b86537b0b0b809a9c8
 SHA512:
-  metadata.gz: 54c89e9bd0322c92b915c8613ae60a3e65d414b1b349b468691a970ffc3a5e1bc5570fe2775f292da86bcb13305c6dbc6f6fc36c862590b73b34aa2756bc1fdd
-  data.tar.gz: 792b7708b2652eece3adfb76a354ca8156bd88fdf40178557bec69e7555f088941f8f2aaba5f6e8e3927bb55c63b30b230f5104314656d4a9b09ec50e0520601
+  metadata.gz: 537be50b970fcc977e920ed16e25bebf4c30815afa210ba977662daf35f8d45be309c1d9dd3b32cbeb558bb4074631a1ecb42b81134d00f8e731d6ec2ce338b5
+  data.tar.gz: c7c17c67f0f671e0c6bd2f23a1aaf2f841c4a00efad18759b24961a92cc203ecf797134bbcfb440d840248d730d844a360a4037ce8ca19b35af472e22bd81d7d

data/bin/checkurls

@@ -3,4 +3,4 @@
 
 require_relative '../lib/url_checker'
 
-UrlChecker::UrlChecker.call
+UrlChecker::Cli.call

data/config/environment.rb

@@ -6,5 +6,7 @@ require 'csv'
 require 'net/http'
 
 require_relative '../lib/url_checker'
-require_relative '../lib/url_checker/url_checker'
+require_relative '../lib/url_checker/cli'
+require_relative '../lib/url_checker/rescued_response'
+require_relative '../lib/url_checker/single_checker'
 require_relative '../lib/url_checker/version'

data/lib/url_checker/{url_checker.rb → cli.rb}

@@ -2,7 +2,7 @@
 
 module UrlChecker
   # The main class
-  class UrlChecker
+  class Cli
     BAD_CALL_MSG = 'Please call with one CSV file with URLs in the first column'
     RESULTS_HEADERS = %w(Response URL).freeze
 
@@ -33,28 +33,27 @@ module UrlChecker
     attr_accessor :num_issues, :results
 
     def check_url(url)
-      uri = URI(url)
-      response = Net::HTTP.get_response uri
-      collect_result response, url
-      display_result response, url
+      response = UrlChecker::SingleChecker.new(url: url).call
+      collect_result response
+      display_result response
     end
 
     def check_urls_from_csv
       threads = []
       CSV.foreach(file_path) do |row|
         url = row[0]
-        threads << Thread.new { check_url url } if url.match?(/http/)
+        threads << Thread.new { check_url url } if url.match?(/\Ahttp/)
       end
       threads.each(&:join)
     end
 
-    def collect_result(response, url)
-      line = ["#{response.code} #{response.message}", url]
+    def collect_result(response)
+      line = ["#{response.code} #{response.message}", response.uri.to_s]
       results << line
     end
 
-    def display_result(response, url)
-      msg = " #{response.code} #{response.message} #{url}"
+    def display_result(response)
+      msg = " #{response.code} #{response.message} #{response.uri.to_s}"
       case response
       when Net::HTTPSuccess, Net::HTTPRedirection
         puts msg.green

data/lib/url_checker/rescued_response.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module UrlChecker
+  # Checks a single URL and returns the result
+  class RecuedResponse
+    attr_reader :code, :message, :uri
+
+    def initialize(code:, message:, uri:)
+      raise TypeError, 'uri is not a URI' unless uri.is_a? URI
+      @code = code
+      @message = message
+      @uri = uri
+    end
+  end
+end

data/lib/url_checker/single_checker.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module UrlChecker
+  # Checks a single URL and returns the result
+  class SingleChecker
+    attr_reader :url_string, :uri
+
+    def initialize(url:)
+      @url_string = url
+    end
+
+    def call
+      check_url
+    end
+
+    private
+
+    def check_url
+      @uri = URI(url_string)
+      return invalid_uri_response unless valid_url?
+      response = Net::HTTP.get_response uri
+      response.uri ||= uri # sometimes the uri is not set
+      response
+    rescue Errno::ECONNREFUSED => e
+      rescued_response('Connection refused', e.message)
+    rescue Errno::EINVAL => e
+      rescued_response('Invalid argument', e.message)
+    end
+
+    def invalid_uri_response
+      rescued_response('Invalid URL', 'URL must begin with http')
+    end
+
+    def rescued_response(code, message)
+      UrlChecker::RecuedResponse.new(
+        code: code,
+        message: message,
+        uri: uri
+      )
+    end
+
+    def valid_url?
+      uri.kind_of?(URI::HTTP) || uri.kind_of?(URI::HTTPS)
+    end
+  end
+end

data/lib/url_checker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UrlChecker
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: url-checker
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Kevin McCormack
@@ -35,7 +35,9 @@ files:
 - bin/checkurls
 - config/environment.rb
 - lib/url_checker.rb
-- lib/url_checker/url_checker.rb
+- lib/url_checker/cli.rb
+- lib/url_checker/rescued_response.rb
+- lib/url_checker/single_checker.rb
 - lib/url_checker/version.rb
 homepage: https://github.com/HarlemSquirrel/url-checker
 licenses: