url-checker 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dee2307b6ba536e8d6746743fd93fd4a493f83d
-  data.tar.gz: f1e7aaa8199849dbb915e87ba17568390a2d5ac2
+  metadata.gz: a2bf165ca3d374d6e4d02d052c6cfc30d25635fe
+  data.tar.gz: e9566829e980c1f4ba62d9fe2edf074af5faba70
 SHA512:
-  metadata.gz: c71406d935de3fa0f8accec18e37de3ce76588a287cf63c2c7bbba29921f8bc55b0ee8bcf0ca8648400645015575117c82ba776797265029eae02075e235fab1
-  data.tar.gz: dd7c89e550ae86e0493795c7868c3844f389f947ef53b8986722af0e222ca5026b8639ffd0304cab80b298b5d87a8f4757253163bbfbe7e8a799cc7726c7dcb0
+  metadata.gz: 3e98501fccf4a9032e663d95b88a4bca92071aa3b077f9b96c0fdb077e3c6803d1b730a0397bb312b3539f7f80985eb88571937542e9e9eec02d34f2dea12017
+  data.tar.gz: 0cb02fb2699afa40ab8ae7ed5800499b538a84dc69184ccbe02fcdf68ab7654f03096477705b46e3f43d64f4d521cdc20654c82acf751a70d44f501ae6f107a4

data/README.md

@@ -1,4 +1,5 @@
 [![Code Climate](https://codeclimate.com/github/HarlemSquirrel/url-checker/badges/gpa.svg)](https://codeclimate.com/github/HarlemSquirrel/url-checker)
+[![Build Status](https://travis-ci.org/HarlemSquirrel/url-checker.svg?branch=master)](https://travis-ci.org/HarlemSquirrel/url-checker)
 
 # URL Checker
 
@@ -6,7 +7,7 @@ A Ruby CLI for checking a list of URLs from a CSV file. Checkout the [RubGems pa
 
 ## Requirements
 
-- >= Ruby 2.4.0
+- Ruby 2.4+
 - Internet connection
 
 ## Getting started

data/config/environment.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require "addressable/uri"
+require 'addressable/uri'
 require 'benchmark'
 require 'colorize'
 require 'csv'
 require 'net/http'
+require 'openssl'
 
 require_relative '../lib/url_checker'
 require_relative '../lib/url_checker/cli'

data/lib/url_checker/cli.rb

@@ -4,7 +4,7 @@ module UrlChecker
   # The main class
   class Cli
     BAD_CALL_MSG = "Please call with one CSV file with URLs in the first column\n"
-    RESULTS_HEADERS = %w(Response URL).freeze
+    RESULTS_HEADERS = %w[Response URL].freeze
 
     attr_reader :file_path, :results_file_path
 
@@ -38,11 +38,15 @@ module UrlChecker
       display_result response
     end
 
+    def check_url_thread(url)
+      Thread.new { check_url(url) }
+    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?(/\Ahttp/)
+        threads << check_url_thread(url) if url.is_a?(String) && url.match?(/\Ahttp/)
       end
       threads.each(&:join)
     end
@@ -53,7 +57,7 @@ module UrlChecker
     end
 
     def display_result(response)
-      msg = " #{response.code} #{response.message} #{response.uri.to_s}\n"
+      msg = " #{response.code} #{response.message} #{response.uri}\n"
       case response
       when Net::HTTPSuccess, Net::HTTPRedirection
         print msg.green

data/lib/url_checker/rescued_response.rb

@@ -6,7 +6,6 @@ module UrlChecker
     attr_reader :code, :message, :uri
 
     def initialize(code:, message:, uri:)
-      raise TypeError, 'uri is not a URI' unless uri.is_a? Addressable::URI
       @code = code
       @message = message
       @uri = uri

data/lib/url_checker/single_checker.rb

@@ -3,9 +3,10 @@
 module UrlChecker
   # Checks a single URL and returns the result
   class SingleChecker
-    SCHEMES = %w[http https]
+    INVALID_URI_MSG = 'must begin with http and contain only valid characters'
+    SCHEMES = %w[http https].freeze
 
-    attr_reader :url_string, :uri
+    attr_reader :url_string
 
     def initialize(url:)
       @url_string = url
@@ -18,7 +19,6 @@ module UrlChecker
     private
 
     def check_url
-      @uri = Addressable::URI.parse url_string
       return invalid_uri_response unless valid_url?
       response = Net::HTTP.get_response uri
       response.uri ||= uri # sometimes the uri is not set
@@ -32,7 +32,11 @@ module UrlChecker
     end
 
     def invalid_uri_response
-      rescued_response('Invalid URL', 'URL must begin with http')
+      UrlChecker::RecuedResponse.new(
+        code: 'Invalid URL',
+        message: INVALID_URI_MSG,
+        uri: url_string
+      )
     end
 
     def rescued_response(code, message)
@@ -45,6 +49,12 @@ module UrlChecker
 
     def valid_url?
       SCHEMES.include? uri.scheme
+    rescue Addressable::URI::InvalidURIError
+      false
+    end
+
+    def uri
+      @uri ||= Addressable::URI.parse url_string
     end
   end
 end

data/lib/url_checker/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: url-checker
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Kevin McCormack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement