berkeley_library-util 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81d92682b9ea2f5466198ab26b0a31775704f3d52408e67453b1af8871367aa8
-  data.tar.gz: 296f6fd7ad69c125e732b423f9eb75f338cc866b9a7c19dae6c550d754a2c285
+  metadata.gz: fdc84acc6adb94fcfbbcf7d18b9a6bead8ef484ef40028f139b07964b565b4e2
+  data.tar.gz: 43e850e1ee541d777c07f546f789e576b45a44580734206c44cd2dce4d3293a1
 SHA512:
-  metadata.gz: f632ee12e255ca16fcd22effc3df7d1ddcf7cb4a93ac49c4ca7d3beef8ba29143b8bc1f96097236fdf9dde1802625423990052ac12a4920cb0e8a074715b3cf4
-  data.tar.gz: c9ab1aa8a055caf6ba968af662fdcf3dbe782fdce4c0e884032db10a427dae4049f48fde9297d415336374760183ec23058c355bed3ee8bb9f90593bf3844841
+  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,8 @@
+# 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`. 

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.8'.freeze
+      VERSION = '0.1.9'.freeze
       HOMEPAGE = 'https://github.com/BerkeleyLibrary/util'.freeze
     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

@@ -101,7 +101,7 @@ module BerkeleyLibrary
                   end
 
                   it 'raises RetryDelayTooLarge if the delay is too large' do
-                    retry_after_seconds = 1 + BerkeleyLibrary::Util::URIs::Requester::MAX_RETRY_DELAY_SECONDS
+                    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 })
@@ -163,7 +163,7 @@ module BerkeleyLibrary
                   end
 
                   it 'raises RetryDelayTooLarge if the delay is too large' do
-                    retry_after_seconds = 1 + BerkeleyLibrary::Util::URIs::Requester::MAX_RETRY_DELAY_SECONDS
+                    retry_after_seconds = 10 + BerkeleyLibrary::Util::URIs::Requester::MAX_RETRY_DELAY_SECONDS
                     retry_after_datetime = (Time.now + retry_after_seconds)
 
                     stub_request(:get, url)
@@ -236,7 +236,7 @@ module BerkeleyLibrary
                   end
 
                   it 'raises RetryDelayTooLarge if the delay is too large' do
-                    retry_after_seconds = 1 + BerkeleyLibrary::Util::URIs::Requester::MAX_RETRY_DELAY_SECONDS
+                    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 })
@@ -283,7 +283,7 @@ module BerkeleyLibrary
                   end
 
                   it 'raises RetryDelayTooLarge if the delay is too large' do
-                    retry_after_seconds = 1 + BerkeleyLibrary::Util::URIs::Requester::MAX_RETRY_DELAY_SECONDS
+                    retry_after_seconds = 10 + BerkeleyLibrary::Util::URIs::Requester::MAX_RETRY_DELAY_SECONDS
                     retry_after_datetime = (Time.now + retry_after_seconds)
 
                     stub_request(:get, url)

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.8
+  version: 0.1.9
 platform: ruby
 authors:
 - David Moles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkeley_library-logging