berkeley_library-util 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2d3fd2a0a839a3d733b0280ebff5b9b260b4cec4c2b06c6bdbe065d1b25871
-  data.tar.gz: dcd700d56670c53e894e59239b9b90ab740d9761f7c80e67340428d357c290d1
+  metadata.gz: 8f8cd7e16b30baef3d05f38a78b698dfbc3a603b67f3573c8a2bbec9e2cac9b3
+  data.tar.gz: ebf19dd8fee5fe57a78942432d3f08e8bc486ac1ae69ba7a7ebad070ece90331
 SHA512:
-  metadata.gz: 662ad15a9f80a79a379d70aa7fb4672b2f6e7adf3232796b6e814d238cb984ee8ebbc8e481d188d9fa92316929eb9e826a569eb5ccf6eb5892d96e6f0fa37d60
-  data.tar.gz: 3bee84460660635c47f88102b0dc554ae0d5120089541d5733a45e785ab0ac8cfd56269beecf1d324b6174a594ab68b8133f4bc2a66db75d31d928c2c7390101
+  metadata.gz: 4ec9705be8f0b44019205a2bc72b5d24b982ddf463f88676e395de277cb6ff20687d3c4a5efc88de6f450a862e4351558dd9409bd35971970034c6b8e85ecea1
+  data.tar.gz: 0e77b5e7d5221ee6498ffba856d01ffa2faf216f3838bdd41db724e4207191cd97919bc1e24ba0ea5e483cc6ba83dea3672b258465ebe136bad1e5e3bd296b35

data/.idea/inspectionProfiles/Project_Default.xml

@@ -11,6 +11,10 @@
     <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="RubyCaseWithoutElseBlockInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RubyMismatchedReturnType" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myCheckNilability" value="false" />
+    </inspection_tool>
+    <inspection_tool class="RubyNilAnalysis" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="RubyStringKeysInHashInspection" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.1.1 (2021-09-23)
+
+- `URIs.append` now handles bare URLs with empty paths, with the caveat that
+  a root path `/` will always be added, even if there are no path elements to append.
+
 # 0.1.0 (2021-09-23)
 
-Initial extraction of code from [`berkeley_library/tind`](https://github.com/BerkeleyLibrary/tind).
+- Initial extraction of code from [`berkeley_library/tind`](https://github.com/BerkeleyLibrary/tind).

data/README.md

@@ -7,15 +7,15 @@ Miscellaneous utility code for the UC Berkeley Library.
 
 ### Notable modules
 
-## [BerkeleyLibrary::Util::Arrays](lib/berkeley_library/util/arrays.rb)]
+## [BerkeleyLibrary::Util::Arrays](lib/berkeley_library/util/arrays.rb)
 
 Routines for comparing, merging, and examining the contents of arrays.
 
-## [BerkeleyLibrary::Util::Paths](lib/berkeley_library/util/paths.rb)] 
+## [BerkeleyLibrary::Util::Paths](lib/berkeley_library/util/paths.rb)
 
 Routines for modifying paths separated by forward slashes,
 (such as URL paths), modeled on the [Go `path` package](https://golang.org/pkg/path/).
 
-## [BerkeleyLibrary::Util::URIs](lib/berkeley_library/util/uris.rb)]
+## [BerkeleyLibrary::Util::URIs](lib/berkeley_library/util/uris.rb)
 
 Routines for constructing, validating, and retrieving the content from URIs.

data/lib/berkeley_library/util/module_info.rb

@@ -9,7 +9,7 @@ module BerkeleyLibrary
         A collection of miscellaneous Ruby routines for the UC Berkeley Library.
       DESC
       LICENSE = 'MIT'.freeze
-      VERSION = '0.1.0'.freeze
+      VERSION = '0.1.1'.freeze
       HOMEPAGE = 'https://github.com/BerkeleyLibrary/util'.freeze
     end
   end

data/lib/berkeley_library/util/paths.rb

@@ -55,6 +55,14 @@ module BerkeleyLibrary
         clean(joined_raw)
       end
 
+      def abs?(path)
+        path.to_s.start_with?('/')
+      end
+
+      def ensure_abs(path)
+        abs?(path) ? path : "/#{path}"
+      end
+
       private
 
       def process_next(r, dotdot, path, out)

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

@@ -35,7 +35,8 @@ module BerkeleyLibrary
         # @raise URI::InvalidComponentError if appending the specified elements would create an invalid URI
         def to_uri
           original_uri.dup.tap do |new_uri|
-            new_uri.path = Paths.join(original_uri.path, *path_elements)
+            new_path = Paths.join(new_uri.path, *path_elements)
+            new_uri.path = Paths.ensure_abs(new_path)
             new_uri.query = query unless query_elements.empty?
             new_uri.fragment = fragment unless fragment_elements.empty?
           end

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

@@ -30,6 +30,8 @@ module BerkeleyLibrary
 
             elements = [].tap do |ee|
               ee << url_str
+              next if params.empty?
+
               ee << '?' unless url_str.include?('?')
               ee << URI.encode_www_form(params)
             end

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

@@ -44,18 +44,15 @@ module BerkeleyLibrary
             expect(result).to eq(expected_body)
           end
 
-          it 'raises an error for a failure status' do
-            url = 'https://example.org/'
-            stub_request(:get, url).to_return(status: 404)
-
-            expect { Requester.get(url) }.to raise_error(RestClient::RequestFailed)
-          end
-
-          it 'raises an error for a weird non-failure status' do
-            url = 'https://example.org/'
-            stub_request(:get, url).to_return(status: 207)
+          it "raises #{RestClient::Exception} in the event of an invalid response" do
+            aggregate_failures 'responses' do
+              [207, 400, 401, 403, 404, 405, 418, 451, 500, 503].each do |code|
+                url = "http://example.edu/#{code}"
+                stub_request(:get, url).to_return(status: code)
 
-            expect { Requester.get(url) }.to raise_error(RestClient::RequestFailed)
+                expect { Requester.get(url) }.to raise_error(RestClient::Exception)
+              end
+            end
           end
 
           it 'handles redirects' do

data/spec/berkeley_library/util/uris_spec.rb

@@ -9,6 +9,29 @@ module BerkeleyLibrary::Util
         expect(new_uri).to eq(URI('https://example.org/foo/bar/qux/corge/garply'))
       end
 
+      it 'appends paths to bare URIs without root' do
+        original_url = 'https://example.org'
+        new_uri = URIs.append(original_url, 'foo', 'bar')
+        expected_uri = URI('https://example.org/foo/bar')
+        expect(new_uri).to eq(expected_uri)
+      end
+
+      # TODO: make this work
+      xit "doesn't append to a bare URI when there's nothing to append" do
+        original_url = 'https://example.org'
+        new_uri = URIs.append(original_url)
+        expected_uri = URI(original_url)
+        expect(new_uri).to eq(expected_uri)
+      end
+
+      # TODO: make this work
+      xit "doesn't append to a bare URI when there's only a query string" do
+        original_url = 'https://example.org'
+        new_uri = URIs.append(original_url, '?foo=bar')
+        expected_uri = URI("#{original_url}?foo=bar")
+        expect(new_uri).to eq(expected_uri)
+      end
+
       it 'does not modify the original URI' do
         original_uri = URI('https://example.org/foo/bar')
         original_url = original_uri.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkeley_library-util
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - David Moles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkeley_library-logging