http_status_checker 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a39372c3765ae03312978566c678ba0f8e0358e
-  data.tar.gz: c7ecabc3effcd2cfefee29d7f0295e0ec84433a0
+  metadata.gz: 884c48b9bc2833265b0f97dac47f77017ea45a52
+  data.tar.gz: ef49ec1bf965d4b44749ac6011080405eb2ae197
 SHA512:
-  metadata.gz: 72a2303bf664b690b52de1a8cf85711f3f0bc123afc7e7de60d0fdd8b67bd46001afb2512615d84c77cb53cf9c826921a14fa20cf12e3f98d224c146de55c3e0
-  data.tar.gz: 8cf114f84f961c40cd9b7e9a768080c0af1a00ad2a114778800f0d8a4cb48f84710babe29e809d8a126ae4261a34d3f0fa75761fc761333504906da5f5e55775
+  metadata.gz: be1ef7e4b381ac1191e6f44a99be459120fe05b79475e1fdefcc0cb075b73d1a06efde356e5d71a14a3fc6c3cd4e0e6544fdeab011adc88a241338a83baa49ab
+  data.tar.gz: 4a050c9820dc02996038373e516b671ec072f6c742392b9e7d5fdf7fb237e70e9df9b3eb19b9b820a06d1ed52c63af77720d4b468498fb0f19d743e9d3ec7c53

data/lib/http_status_checker/base.rb

@@ -22,6 +22,13 @@ module HttpStatusChecker
 
     def get_response(url, redirect_url = nil, redirect_count = 0, retry_count = 0)
       result = HttpStatusChecker::Connection.get_header(redirect_url || url)
+      parse_response(redirect_count, redirect_url, result, url)
+    rescue => e
+      get_response(url, nil, redirect_count + 1, retry_count + 1) if retry_count < RETRY_MAX
+      { url => { code: result ? result.code : nil, is_alive: false, error: e.message } }
+    end
+
+    def parse_response(redirect_count, redirect_url, result, url)
       location_url = result['location']
       if !location_url.nil? && (redirect_url || url) != location_url
         raise InvalidRedirectError if redirect_count > REDIRECT_MAX
@@ -31,13 +38,6 @@ module HttpStatusChecker
       else
         raise InvalidResponseError, "Unknown class #{result.class} : #{result.to_s}"
       end
-    rescue => e
-      if retry_count < RETRY_MAX
-        retry_count += 1
-        retry
-      end
-      code = result ? result.code : nil
-      { url => { code: code, is_alive: false, error: e.message } }
     end
 
     def to_host_hash(urls)

data/lib/http_status_checker/version.rb

@@ -1,3 +1,3 @@
 module HttpStatusChecker
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/http_status_checker/base_spec.rb

@@ -78,6 +78,7 @@ describe HttpStatusChecker::Connection do
       let!(:morizyun_404) { 'http://morizyun.github.io/404/' }
       it 'returns is_alive = false, redirect = nil, error present' do
         response = HttpStatusChecker.check(morizyun_404)
+        expect(response.first[morizyun_404][:code]).to eq('404')
         expect(response.first[morizyun_404][:is_alive]).to eq(false)
         expect(response.first[morizyun_404][:redirect_url]).to be_nil
         expect(response.first[morizyun_404][:error]).not_to be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_status_checker
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - morizyun