ruby-link-checker 0.1.0 → 0.2.0

data/lib/ruby-link-checker/net/http/checker.rb

@@ -9,7 +9,6 @@ module LinkChecker
             request = ::Net::HTTPGenericRequest.new(method, false, true, uri)
             request['User-Agent'] = checker.user_agent
             response = http.request(request)
-            logger.debug "#{method} #{uri}: #{response.code}"
             result! Result.new(uri, method, original_uri, request, response, options)
           end
         end

data/lib/ruby-link-checker/tasks.rb

@@ -28,7 +28,6 @@ module LinkChecker
         _queue_task(uri, method, original_uri || uri, options)
       elsif methods_left.any?
         @method = methods_left.shift
-        @redirects = [uri]
         @uri = URI(@uri) unless @uri.is_a?(URI)
         _queue_task(uri, method, original_uri || uri, options)
       elsif @result && result.error?
@@ -72,9 +71,20 @@ module LinkChecker
       _handle_result ResultError.new(uri, method, original_uri, e, options)
     end
 
+    def _retries_left_s
+      return nil unless retry? && retries_left > 0
+
+      if retries_left == 1
+        '1 retry left'
+      else
+        "#{retries_left} retries left"
+      end
+    end
+
     def _handle_result(result)
       @result = result
-      logger.info "#{' ' * (redirects.count - 1)}#{result}"
+      retry_text = " (#{_retries_left_s})" if retry? && (result.error? || result.failure?)
+      logger.info "#{' ' * (redirects.count - 1)}#{result}#{retry_text}"
       result! result
       if result.redirect?
         redirect! result
@@ -89,6 +99,7 @@ module LinkChecker
       elsif result.success?
         success! result
       else
+        @redirects = [uri]
         execute!
       end
     rescue StandardError => e

data/lib/ruby-link-checker/typhoeus/hydra/checker.rb

@@ -16,10 +16,8 @@ module LinkChecker
           )
           request.on_complete do |response|
             if response.timed_out?
-              logger.debug "#{method} #{uri}: #{response.return_code}"
               result! ResultError.new(uri, method, original_uri, Timeout::Error.new, options)
             else
-              logger.debug "#{method} #{uri}: #{response.code}"
               result! Result.new(uri, method, original_uri, request, response, options)
             end
           end

data/lib/ruby-link-checker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LinkChecker
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/fixtures/308_429.yml

@@ -0,0 +1,108 @@
+---
+http_interactions:
+- request:
+    method: head
+    uri: https://www.example.org/
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Ruby Link Checker/0.2.0
+      Expect:
+      - ''
+  response:
+    status:
+      code: 308
+      message: ''
+    headers:
+      server:
+      - CloudFront
+      date:
+      - Mon, 03 Apr 2023 00:01:15 GMT
+      content-length:
+      - '0'
+      location:
+      - https://www.dblock.org/
+      x-cache:
+      - FunctionGeneratedResponse from cloudfront
+      via:
+      - 1.1 49830f6fdfb2c3519e81248d6d19f450.cloudfront.net (CloudFront)
+      x-amz-cf-pop:
+      - EWR52-C4
+      x-amz-cf-id:
+      - BRpz7eXeEToGF8Ytac3rGh6DHQZLwnZBdNOxnDICSUPoHDN6wHDxWQ==
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: '2'
+    adapter_metadata:
+      effective_url: https://www.example.org/
+  recorded_at: Mon, 03 Apr 2023 00:01:15 GMT
+- request:
+    method: head
+    uri: https://www.dblock.org/
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Ruby Link Checker/0.2.0
+      Expect:
+      - ''
+  response:
+    status:
+      code: 429
+      message: ''
+    headers:
+      server:
+      - nginx
+      date:
+      - Mon, 03 Apr 2023 00:01:15 GMT
+      content-type:
+      - text/html; charset=utf-8
+      vary:
+      - Accept-Encoding
+      - Accept
+      x-frame-options:
+      - SAMEORIGIN
+      x-xss-protection:
+      - '0'
+      x-content-type-options:
+      - nosniff
+      x-download-options:
+      - noopen
+      x-permitted-cross-domain-policies:
+      - none
+      referrer-policy:
+      - strict-origin-when-cross-origin
+      x-discourse-route:
+      - users/show
+      cache-control:
+      - no-cache, no-store
+      content-security-policy:
+      - upgrade-insecure-requests; base-uri 'self'; object-src 'none'; script-src
+        https://forum.opensearch.org/logs/ https://forum.opensearch.org/sidekiq/ https://forum.opensearch.org/mini-profiler-resources/
+        https://global.discourse-cdn.com/business5/assets/ https://global.discourse-cdn.com/business5/brotli_asset/
+        https://forum.opensearch.org/extra-locales/ https://sea1.discourse-cdn.com/business5/highlight-js/
+        https://sea1.discourse-cdn.com/business5/javascripts/ https://sea1.discourse-cdn.com/business5/plugins/
+        https://sea1.discourse-cdn.com/business5/theme-javascripts/ https://sea1.discourse-cdn.com/business5/svg-sprite/
+        'sha256-Gty3/aPWFfSvz7pdT39HY97/+2opLup9V0L19ZF0IwY=' https://forum.opensearch.org/plugins/discourse-client-performance/javascripts/discourse-client-performance.js;
+        worker-src 'self' https://global.discourse-cdn.com/business5/assets/ https://global.discourse-cdn.com/business5/brotli_asset/
+        https://sea1.discourse-cdn.com/business5/javascripts/ https://sea1.discourse-cdn.com/business5/plugins/;
+        frame-ancestors 'self'; manifest-src 'self'
+      x-request-id:
+      - a54de95c-ab20-4f9a-81a0-93908fc94357
+      cdck-proxy-id:
+      - app-router-tiehunter03.sea1
+      - app-balancer-tieinterceptor1b.sea1
+      strict-transport-security:
+      - max-age=31536000
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: '2'
+    adapter_metadata:
+      effective_url: https://www.dblock.org/
+  recorded_at: Mon, 03 Apr 2023 00:01:15 GMT
+recorded_with: VCR 6.1.0

data/spec/support/link_checker.rb

@@ -240,6 +240,19 @@ shared_context 'a link checker' do
             end
           end
 
+          context 'a failed retry on a redirect', vcr: { cassette_name: '308+429', allow_playback_repeats: true } do
+            subject do
+              described_class.new(methods: %w[HEAD], retries: 2)
+            end
+
+            it 'calls redirect callback' do
+              expect(result.success?).to be false
+              expect(result.failure?).to be true
+              expect(result.error?).to be false
+              expect(result.error).not_to be_a LinkChecker::Errors::RedirectLoopError
+            end
+          end
+
           context 'an invalid URI' do
             let(:url) { '\/invalid-url' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-link-checker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -100,6 +100,7 @@ files:
 - spec/fixtures/301_301.yml
 - spec/fixtures/301_400_301_200.yml
 - spec/fixtures/301_403.yml
+- spec/fixtures/308_429.yml
 - spec/fixtures/404.yml
 - spec/fixtures/404_200.yml
 - spec/fixtures/404_404.yml