berkeley_library-util 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71143c349265481e222ad5c0330ad1f995697139d114f9b9a2615c8d9cb8ea4b
-  data.tar.gz: 3ad66018de9e3ff7efe0d5637c9c79ea616da7510aff3c6f8f9bc07ed83cbb59
+  metadata.gz: fdc84acc6adb94fcfbbcf7d18b9a6bead8ef484ef40028f139b07964b565b4e2
+  data.tar.gz: 43e850e1ee541d777c07f546f789e576b45a44580734206c44cd2dce4d3293a1
 SHA512:
-  metadata.gz: f0563b8e84cdeff86055d4423ddf57a6559c7e9a80527b643fe9cf4c10db2a62cbd8e122fc0045da56778b00ac6486ebff8ab00a5452721f385a93e9f8fc6e12
-  data.tar.gz: c19e2f817542e98ec80b9e05faf6bdaad821ab8f6589638c3790611de8231cd7bbf2a68f3d0a520fb7b96a8b0c16ac06685ae547ad6c5b7023468bea50ec4f01
+  metadata.gz: dc47ba39cee501522db01aceeba7060f51ee4270ca03a2d4263e836190eddc2e953fd83eb292379ce4fcdbd5a9bac3831ec76c750cb2ecd9a375c86a60533079
+  data.tar.gz: 0dc4190292083d68066528c6a7efa815667ccc6ba79fb75ba0d0fa5e5f1ab354465447d1d7b53bbf825426e010bd4954b0ada17f3b935ae68095d8d0795940c1

data/.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1

data/CHANGES.md

@@ -1,3 +1,12 @@
+# 0.1.9 (2023-06-01)
+
+- `URIs#path_escape` now attempts to convert non-UTF-8 strings to UTF-8 rather than immediately
+  raising an error.
+
+# 0.1.8 (2023-03-20)
+
+- Add `Retry-After` support to `Requester` for `429 Too Many Requests` and `503 Service Unavailable`. 
+
 # 0.1.7 (2023-03-15)
 
 - Allow passing `log: false` to `Requester` methods (and corresponding `URIs` convenience

data/lib/berkeley_library/util/module_info.rb

@@ -7,7 +7,7 @@ module BerkeleyLibrary
       SUMMARY = 'Miscellaneous Ruby utilities for the UC Berkeley Library'.freeze
       DESCRIPTION = 'A collection of miscellaneous Ruby routines for the UC Berkeley Library.'.freeze
       LICENSE = 'MIT'.freeze
-      VERSION = '0.1.7'.freeze
+      VERSION = '0.1.9'.freeze
       HOMEPAGE = 'https://github.com/BerkeleyLibrary/util'.freeze
     end
   end

data/lib/berkeley_library/util/uris/exceptions.rb

@@ -0,0 +1,15 @@
+class RetryDelayTooLarge < RestClient::Exception
+  def initialize(response, delay:, max_delay:)
+    super(response, response.code)
+
+    self.message = 'Retry delay of %0.2gs exceeds limit of %0.2gs' % [delay, max_delay]
+  end
+end
+
+class RetryLimitExceeded < RestClient::Exception
+  def initialize(response, max_retries:)
+    super(response, response.code)
+
+    self.message = "Retry limit (#{max_retries}) exceeded"
+  end
+end

data/lib/berkeley_library/util/uris/requester/class_methods.rb

@@ -0,0 +1,89 @@
+module BerkeleyLibrary
+  module Util
+    module URIs
+      class Requester
+        # rubocop:disable Metrics/ParameterLists
+        module ClassMethods
+          # Performs a GET request and returns the response body as a string.
+          #
+          # @param uri [URI, String] the URI to GET
+          # @param params [Hash] the query parameters to add to the URI. (Note that the URI may already include query parameters.)
+          # @param headers [Hash] the request headers.
+          # @return [String] the body as a string.
+          # @param log [Boolean] whether to log each request URL and response code
+          # @param max_retries [Integer] the maximum number of times to retry after a 429 or 503 with Retry-After
+          # @param max_retry_delay [Integer] the maximum retry delay (in seconds) to accept in a Retry-After header
+          # @raise [RestClient::Exception] in the event of an unsuccessful request.
+          def get(uri, params: {}, headers: {}, log: true, max_retries: MAX_RETRIES, max_retry_delay: MAX_RETRY_DELAY_SECONDS)
+            resp = make_request(:get, uri, params, headers, log, max_retries, max_retry_delay)
+            resp.body
+          end
+
+          # Performs a HEAD request and returns the response status as an integer.
+          # Note that unlike {Requester#get}, this does not raise an error in the
+          # event of an unsuccessful request.
+          #
+          # @param uri [URI, String] the URI to HEAD
+          # @param params [Hash] the query parameters to add to the URI. (Note that the URI may already include query parameters.)
+          # @param headers [Hash] the request headers.
+          # @param log [Boolean] whether to log each request URL and response code
+          # @return [Integer] the response code as an integer.
+          def head(uri, params: {}, headers: {}, log: true, max_retries: MAX_RETRIES, max_retry_delay: MAX_RETRY_DELAY_SECONDS)
+            head_response(uri, params: params, headers: headers, log: log, max_retries: max_retries, max_retry_delay: max_retry_delay).code
+          end
+
+          # Performs a GET request and returns the response, even in the event of
+          # a failed request.
+          #
+          # @param uri [URI, String] the URI to GET
+          # @param params [Hash] the query parameters to add to the URI. (Note that the URI may already include query parameters.)
+          # @param headers [Hash] the request headers.
+          # @param log [Boolean] whether to log each request URL and response code
+          # @return [RestClient::Response] the response
+          def get_response(uri, params: {}, headers: {}, log: true, max_retries: MAX_RETRIES, max_retry_delay: MAX_RETRY_DELAY_SECONDS)
+            make_request(:get, uri, params, headers, log, max_retries, max_retry_delay)
+          rescue RestClient::Exception => e
+            e.response
+          end
+
+          # Performs a HEAD request and returns the response, even in the event of
+          # a failed request.
+          #
+          # @param uri [URI, String] the URI to HEAD
+          # @param params [Hash] the query parameters to add to the URI. (Note that the URI may already include query parameters.)
+          # @param headers [Hash] the request headers.
+          # @param log [Boolean] whether to log each request URL and response code
+          # @return [RestClient::Response] the response
+          def head_response(uri, params: {}, headers: {}, log: true, max_retries: MAX_RETRIES, max_retry_delay: MAX_RETRY_DELAY_SECONDS)
+            make_request(:head, uri, params, headers, log, max_retries, max_retry_delay)
+          rescue RestClient::Exception => e
+            e.response
+          end
+
+          private
+
+          def make_request(method, url, params, headers, log, max_retries, max_retry_delay)
+            Requester.new(
+              method,
+              url,
+              params: params,
+              headers: headers,
+              log: log,
+              max_retries: max_retries,
+              max_retry_delay: max_retry_delay
+            ).make_request
+          end
+
+        end
+        # rubocop:enable Metrics/ParameterLists
+
+        # ------------------------------------------------------------
+        # Class methods
+
+        class << self
+          include ClassMethods
+        end
+      end
+    end
+  end
+end

data/lib/berkeley_library/util/uris/requester.rb

@@ -1,6 +1,9 @@
+require 'time'
 require 'rest-client'
 require 'berkeley_library/util/uris/appender'
+require 'berkeley_library/util/uris/exceptions'
 require 'berkeley_library/util/uris/validator'
+require 'berkeley_library/util/uris/requester/class_methods'
 require 'berkeley_library/logging'
 
 module BerkeleyLibrary
@@ -9,80 +12,19 @@ module BerkeleyLibrary
       class Requester
         include BerkeleyLibrary::Logging
 
-        # ------------------------------------------------------------
-        # Class methods
-
-        class << self
-          # Performs a GET request and returns the response body as a string.
-          #
-          # @param uri [URI, String] the URI to GET
-          # @param params [Hash] the query parameters to add to the URI. (Note that the URI may already include query parameters.)
-          # @param headers [Hash] the request headers.
-          # @return [String] the body as a string.
-          # @param log [Boolean] whether to log each request URL and response code
-          # @raise [RestClient::Exception] in the event of an unsuccessful request.
-          def get(uri, params: {}, headers: {}, log: true)
-            resp = make_request(:get, uri, params, headers, log)
-            resp.body
-          end
-
-          # Performs a HEAD request and returns the response status as an integer.
-          # Note that unlike {Requester#get}, this does not raise an error in the
-          # event of an unsuccessful request.
-          #
-          # @param uri [URI, String] the URI to HEAD
-          # @param params [Hash] the query parameters to add to the URI. (Note that the URI may already include query parameters.)
-          # @param headers [Hash] the request headers.
-          # @param log [Boolean] whether to log each request URL and response code
-          # @return [Integer] the response code as an integer.
-          def head(uri, params: {}, headers: {}, log: true)
-            head_response(uri, params: params, headers: headers, log: log).code
-          end
-
-          # Performs a GET request and returns the response, even in the event of
-          # a failed request.
-          #
-          # @param uri [URI, String] the URI to GET
-          # @param params [Hash] the query parameters to add to the URI. (Note that the URI may already include query parameters.)
-          # @param headers [Hash] the request headers.
-          # @param log [Boolean] whether to log each request URL and response code
-          # @return [RestClient::Response] the body as a string.
-          def get_response(uri, params: {}, headers: {}, log: true)
-            make_request(:get, uri, params, headers, log)
-          rescue RestClient::Exception => e
-            e.response
-          end
-
-          # Performs a HEAD request and returns the response, even in the event of
-          # a failed request.
-          #
-          # @param uri [URI, String] the URI to HEAD
-          # @param params [Hash] the query parameters to add to the URI. (Note that the URI may already include query parameters.)
-          # @param headers [Hash] the request headers.
-          # @param log [Boolean] whether to log each request URL and response code
-          # @return [RestClient::Response] the response
-          def head_response(uri, params: {}, headers: {}, log: true)
-            make_request(:head, uri, params, headers, log)
-          rescue RestClient::Exception => e
-            e.response
-          end
-
-          private
-
-          def make_request(method, url, params, headers, log)
-            Requester.new(method, url, params: params, headers: headers, log: log).make_request
-          end
-        end
-
         # ------------------------------------------------------------
         # Constants
 
         SUPPORTED_METHODS = %i[get head].freeze
+        RETRY_HEADER = :retry_after
+        RETRY_STATUSES = [429, 503].freeze
+        MAX_RETRY_DELAY_SECONDS = 10
+        MAX_RETRIES = 3
 
         # ------------------------------------------------------------
         # Attributes
 
-        attr_reader :method, :url_str, :headers, :log
+        attr_reader :method, :url_str, :headers, :log, :max_retries, :max_retry_delay
 
         # ------------------------------------------------------------
         # Initializer
@@ -94,8 +36,11 @@ module BerkeleyLibrary
         # @param params [Hash] the query parameters to add to the URI. (Note that the URI may already include query parameters.)
         # @param headers [Hash] the request headers.
         # @param log [Boolean] whether to log each request URL and response code
+        # @param max_retries [Integer] the maximum number of times to retry after a 429 or 503 with Retry-After
+        # @param max_retry_delay [Integer] the maximum retry delay (in seconds) to accept in a Retry-After header
         # @raise URI::InvalidURIError if the specified URL is invalid
-        def initialize(method, url, params: {}, headers: {}, log: true)
+        # rubocop:disable Metrics/ParameterLists
+        def initialize(method, url, params: {}, headers: {}, log: true, max_retries: MAX_RETRIES, max_retry_delay: MAX_RETRY_DELAY_SECONDS)
           raise ArgumentError, "#{method} not supported" unless SUPPORTED_METHODS.include?(method)
           raise ArgumentError, 'url cannot be nil' unless (uri = Validator.uri_or_nil(url))
 
@@ -103,8 +48,12 @@ module BerkeleyLibrary
           @url_str = url_str_with_params(uri, params)
           @headers = headers
           @log = log
+          @max_retries = max_retries
+          @max_retry_delay = max_retry_delay
         end
 
+        # rubocop:enable Metrics/ParameterLists
+
         # ------------------------------------------------------------
         # Public instance methods
 
@@ -139,13 +88,30 @@ module BerkeleyLibrary
           Appender.new(*elements).to_url_str
         end
 
-        def execute_request
+        def execute_request(retries_remaining = max_retries)
+          try_execute_request
+        rescue RestClient::Exception => e
+          response = e.response
+          raise unless (retry_delay = retry_delay_from(response))
+
+          wait_for_retry(response, retry_delay, retries_remaining)
+          execute_request(retries_remaining - 1)
+        end
+
+        def try_execute_request
           RestClient::Request.execute(method: method, url: url_str, headers: headers).tap do |response|
             # Not all failed RestClient requests throw exceptions
             raise(exception_for(response)) unless response.code == 200
           end
         end
 
+        def wait_for_retry(response, retry_delay, retries_remaining)
+          raise RetryLimitExceeded.new(response, max_retries: max_retries) unless retries_remaining > 0
+          raise RetryDelayTooLarge.new(response, delay: retry_delay, max_delay: max_retry_delay) if retry_delay > max_retry_delay
+
+          sleep(retry_delay)
+        end
+
         def exception_for(resp)
           status = resp.code
           ex_class_for(status).new(resp, status).tap do |ex|
@@ -158,6 +124,43 @@ module BerkeleyLibrary
           RestClient::Exceptions::EXCEPTIONS_MAP[status] || RestClient::RequestFailed
         end
 
+        # Returns the retry interval for the specified exception, or `nil`
+        # if the response does not allow a retry.
+        #
+        # @param resp [RestClient::Response] the response
+        # @return [Integer, nil] the retry delay in seconds, or `nil` if the response
+        #         does not allow a retry
+        def retry_delay_from(resp)
+          return unless RETRY_STATUSES.include?(resp.code)
+          return unless (retry_header_value = resp.headers[RETRY_HEADER])
+          return unless (retry_delay_seconds = parse_retry_header_value(retry_header_value))
+
+          [1, retry_delay_seconds.ceil].max
+        end
+
+        # @return [Float, nil] the retry delay in seconds, or `nil` if the delay cannot be parsed
+        def parse_retry_header_value(v)
+          # start by assuming it's a delay in seconds
+          Float(v) # should be an integer but let's not count on it
+        rescue ArgumentError
+          # assume it's an HTTP-date
+          parse_retry_after_date(v)
+        end
+
+        # Parses the specified RFC2822 datetime string and returns the interval between that
+        # datetime and the current time in seconds
+        #
+        # @param date_str [String] an RFC2822 datetime string
+        # @return [Float, nil] the interval between the current time and the specified datetime,
+        #   or nil if `date_str` cannot be parsed
+        def parse_retry_after_date(date_str)
+          retry_after = DateTime.rfc2822(date_str).to_time
+          retry_after - Time.now
+        rescue ArgumentError
+          logger.warn("Can't parse #{RETRY_HEADER} value #{date_str}")
+          nil
+        end
+
       end
     end
   end

data/lib/berkeley_library/util/uris.rb

@@ -88,8 +88,8 @@ module BerkeleyLibrary
       # replacing disallowed characters (including /) with percent-encodings as needed.
       def path_escape(s)
         raise ArgumentError, "Can't escape #{s.inspect}: not a string" unless s.respond_to?(:encoding)
-        raise ArgumentError, "Can't escape #{s.inspect}: expected #{UTF_8}, was #{s.encoding}" unless s.encoding == UTF_8
 
+        s = s.encode(UTF_8) unless s.encoding == UTF_8
         ''.tap do |escaped|
           s.bytes.each do |b|
             escaped << (should_escape?(b, :path_segment) ? '%%%02X' % b : b.chr)

data/spec/berkeley_library/util/uris/requester_spec.rb

@@ -65,6 +65,250 @@ module BerkeleyLibrary
             result = Requester.get(url1)
             expect(result).to eq(expected_body)
           end
+
+          describe 'retries' do
+            let(:url) { 'https://example.org/' }
+            let(:expected_body) { 'Help! I am trapped in a unit test' }
+
+            context 'handling 429 Too Many Requests' do
+              context 'with Retry-After' do
+                context 'in seconds' do
+                  it 'retries after the specified delay' do
+                    retry_after_seconds = 1
+
+                    stub_request(:get, url)
+                      .to_return(status: 429, headers: { 'Retry-After' => retry_after_seconds.to_s })
+                      .to_return(status: 200, body: expected_body)
+
+                    requester = Requester.new(:get, url)
+                    expect(requester).to receive(:sleep).with(1).once
+
+                    result = requester.make_request
+                    expect(result).to eq(expected_body)
+                  end
+
+                  it 'handles a non-integer retry delay' do
+                    retry_after_seconds = 1.5
+                    stub_request(:get, url)
+                      .to_return(status: 429, headers: { 'Retry-After' => retry_after_seconds.to_s })
+                      .to_return(status: 200, body: expected_body)
+
+                    requester = Requester.new(:get, url)
+                    expect(requester).to receive(:sleep).with(2).once
+
+                    result = requester.make_request
+                    expect(result).to eq(expected_body)
+                  end
+
+                  it 'raises RetryDelayTooLarge if the delay is too large' do
+                    retry_after_seconds = 10 + BerkeleyLibrary::Util::URIs::Requester::MAX_RETRY_DELAY_SECONDS
+
+                    stub_request(:get, url)
+                      .to_return(status: 429, headers: { 'Retry-After' => retry_after_seconds.to_s })
+
+                    requester = Requester.new(:get, url)
+                    expect(requester).not_to receive(:sleep)
+
+                    expect { requester.make_request }.to raise_error(RetryDelayTooLarge) do |ex|
+                      expect(ex.cause).to be_a(RestClient::TooManyRequests)
+                    end
+                  end
+
+                  it 'raises RetryLimitExceeded if there are too many retries' do
+                    retry_after_seconds = 1
+
+                    stub_request(:get, url)
+                      .to_return(status: 429, headers: { 'Retry-After' => retry_after_seconds.to_s })
+                      .to_return(status: 429, headers: { 'Retry-After' => retry_after_seconds.to_s })
+
+                    requester = Requester.new(:get, url, max_retries: 1)
+                    expect(requester).to receive(:sleep).with(1).once
+
+                    expect { requester.make_request }.to raise_error(RetryLimitExceeded) do |ex|
+                      expect(ex.cause).to be_a(RestClient::TooManyRequests)
+                    end
+                  end
+                end
+
+                context 'as RFC2822 datetime' do
+                  it 'retries after the specified delay' do
+                    retry_after_seconds = 1
+                    retry_after_datetime = (Time.now + retry_after_seconds)
+
+                    stub_request(:get, url)
+                      .to_return(status: 429, headers: { 'Retry-After' => retry_after_datetime.rfc2822 })
+                      .to_return(status: 200, body: expected_body)
+
+                    requester = Requester.new(:get, url)
+                    expect(requester).to receive(:sleep).with(1).once
+
+                    result = requester.make_request
+                    expect(result).to eq(expected_body)
+                  end
+
+                  it 'handles a non-integer retry delay' do
+                    retry_after_seconds = 2.75
+                    retry_after_datetime = (Time.now + retry_after_seconds)
+
+                    stub_request(:get, url)
+                      .to_return(status: 429, headers: { 'Retry-After' => retry_after_datetime.rfc2822 })
+                      .to_return(status: 200, body: expected_body)
+
+                    requester = Requester.new(:get, url)
+                    expected_value = a_value_within(1).of(retry_after_seconds)
+                    expect(requester).to receive(:sleep).with(expected_value).once
+
+                    result = requester.make_request
+                    expect(result).to eq(expected_body)
+                  end
+
+                  it 'raises RetryDelayTooLarge if the delay is too large' do
+                    retry_after_seconds = 10 + BerkeleyLibrary::Util::URIs::Requester::MAX_RETRY_DELAY_SECONDS
+                    retry_after_datetime = (Time.now + retry_after_seconds)
+
+                    stub_request(:get, url)
+                      .to_return(status: 429, headers: { 'Retry-After' => retry_after_datetime.rfc2822 })
+
+                    requester = Requester.new(:get, url)
+                    expect(requester).not_to receive(:sleep)
+
+                    expect { requester.make_request }.to raise_error(RetryDelayTooLarge) do |ex|
+                      expect(ex.cause).to be_a(RestClient::TooManyRequests)
+                    end
+                  end
+
+                  it 'raises RetryLimitExceeded if there are too many retries' do
+                    retry_after_seconds = 1
+                    retry_after_datetime = (Time.now + retry_after_seconds)
+
+                    stub_request(:get, url)
+                      .to_return(status: 429, headers: { 'Retry-After' => retry_after_datetime.rfc2822 })
+                      .to_return(status: 429, headers: { 'Retry-After' => retry_after_datetime.rfc2822 })
+
+                    requester = Requester.new(:get, url, max_retries: 1)
+                    expect(requester).to receive(:sleep).with(1).once
+
+                    expect { requester.make_request }.to raise_error(RetryLimitExceeded) do |ex|
+                      expect(ex.cause).to be_a(RestClient::TooManyRequests)
+                    end
+                  end
+
+                end
+
+                it 'ignores an invalid Retry-After' do
+                  stub_request(:get, url)
+                    .to_return(status: 429, headers: { 'Retry-After' => 'the end of the world' })
+
+                  requester = Requester.new(:get, url)
+                  expect { requester.make_request }.to raise_error(RestClient::TooManyRequests)
+                end
+              end
+            end
+
+            context 'handling 503 Service Unavailable' do
+              context 'with Retry-After' do
+                context 'in seconds' do
+                  it 'retries after the specified delay' do
+                    retry_after_seconds = 1
+
+                    stub_request(:get, url)
+                      .to_return(status: 503, headers: { 'Retry-After' => retry_after_seconds.to_s })
+                      .to_return(status: 200, body: expected_body)
+
+                    requester = Requester.new(:get, url)
+                    expect(requester).to receive(:sleep).with(1).once
+
+                    result = requester.make_request
+                    expect(result).to eq(expected_body)
+                  end
+
+                  it 'handles a non-integer retry delay' do
+                    retry_after_seconds = 0.75
+                    stub_request(:get, url)
+                      .to_return(status: 503, headers: { 'Retry-After' => retry_after_seconds.to_s })
+                      .to_return(status: 200, body: expected_body)
+
+                    requester = Requester.new(:get, url)
+                    expect(requester).to receive(:sleep).with(1).once
+
+                    result = requester.make_request
+                    expect(result).to eq(expected_body)
+                  end
+
+                  it 'raises RetryDelayTooLarge if the delay is too large' do
+                    retry_after_seconds = 10 + BerkeleyLibrary::Util::URIs::Requester::MAX_RETRY_DELAY_SECONDS
+
+                    stub_request(:get, url)
+                      .to_return(status: 503, headers: { 'Retry-After' => retry_after_seconds.to_s })
+
+                    requester = Requester.new(:get, url)
+                    expect(requester).not_to receive(:sleep)
+
+                    expect { requester.make_request }.to raise_error(RetryDelayTooLarge) do |ex|
+                      expect(ex.cause).to be_a(RestClient::ServiceUnavailable)
+                    end
+                  end
+                end
+
+                context 'as RFC2822 datetime' do
+                  it 'retries after the specified delay' do
+                    retry_after_seconds = 1
+                    retry_after_datetime = (Time.now + retry_after_seconds)
+
+                    stub_request(:get, url)
+                      .to_return(status: 503, headers: { 'Retry-After' => retry_after_datetime.rfc2822 })
+                      .to_return(status: 200, body: expected_body)
+
+                    requester = Requester.new(:get, url)
+                    expect(requester).to receive(:sleep).with(1).once
+
+                    result = requester.make_request
+                    expect(result).to eq(expected_body)
+                  end
+
+                  it 'handles a non-integer retry delay' do
+                    retry_after_seconds = 1.75
+                    retry_after_datetime = (Time.now + retry_after_seconds)
+
+                    stub_request(:get, url)
+                      .to_return(status: 503, headers: { 'Retry-After' => retry_after_datetime.rfc2822 })
+                      .to_return(status: 200, body: expected_body)
+
+                    requester = Requester.new(:get, url)
+                    expected_value = a_value_within(1).of(retry_after_seconds)
+                    expect(requester).to receive(:sleep).with(expected_value).once
+
+                    result = requester.make_request
+                    expect(result).to eq(expected_body)
+                  end
+
+                  it 'raises RetryDelayTooLarge if the delay is too large' do
+                    retry_after_seconds = 10 + BerkeleyLibrary::Util::URIs::Requester::MAX_RETRY_DELAY_SECONDS
+                    retry_after_datetime = (Time.now + retry_after_seconds)
+
+                    stub_request(:get, url)
+                      .to_return(status: 503, headers: { 'Retry-After' => retry_after_datetime.rfc2822 })
+
+                    requester = Requester.new(:get, url)
+                    expect(requester).not_to receive(:sleep)
+
+                    expect { requester.make_request }.to raise_error(RetryDelayTooLarge) do |ex|
+                      expect(ex.cause).to be_a(RestClient::ServiceUnavailable)
+                    end
+                  end
+                end
+
+                it 'ignores an invalid Retry-After' do
+                  stub_request(:get, url)
+                    .to_return(status: 503, headers: { 'Retry-After' => 'the end of the world' })
+
+                  requester = Requester.new(:get, url)
+                  expect { requester.make_request }.to raise_error(RestClient::ServiceUnavailable)
+                end
+              end
+            end
+          end
+
         end
 
         describe :head do

data/spec/berkeley_library/util/uris_spec.rb

@@ -337,20 +337,14 @@ module BerkeleyLibrary::Util
         expect { URIs.path_escape(str.bytes) }.to raise_error(ArgumentError)
       end
 
-      it 'rejects non-UTF-8 strings' do
-        str = in_out.keys.last
-        expect { URIs.path_escape(str.encode(Encoding::Shift_JIS)) }.to raise_error(ArgumentError)
-      end
-
-      it 'accepts non-UTF-8 strings converted to UTF-8' do
-        in_str = in_out.keys.last
-        out_str = in_out[in_str]
-
-        # OK, we're really just testing String#encode here, but
-        # it's useful for documentation
-        in_str_sjis = in_str.encode(Encoding::Shift_JIS)
-        in_str_utf8 = in_str_sjis.encode(Encoding::UTF_8)
-        expect(URIs.path_escape(in_str_utf8)).to eq(out_str)
+      it 'converts non-UTF-8 strings to UTF-8' do
+        utf_16_be = Encoding.find('UTF-16BE')
+        aggregate_failures do
+          in_out.each do |in_str, out_str|
+            encoded = in_str.encode(utf_16_be)
+            expect(URIs.path_escape(encoded)).to eq(out_str)
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkeley_library-util
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - David Moles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkeley_library-logging
@@ -241,7 +241,9 @@ files:
 - lib/berkeley_library/util/times.rb
 - lib/berkeley_library/util/uris.rb
 - lib/berkeley_library/util/uris/appender.rb
+- lib/berkeley_library/util/uris/exceptions.rb
 - lib/berkeley_library/util/uris/requester.rb
+- lib/berkeley_library/util/uris/requester/class_methods.rb
 - lib/berkeley_library/util/uris/validator.rb
 - rakelib/.rubocop.yml
 - rakelib/coverage.rake