berkeley_library-tind 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c86b743e236805c476a20d5c9c6e6599488072a60ed536b4118ad702c78be2
-  data.tar.gz: ab80cc155018e274118bf8e761912848b629bf81f711a2e486b76f10e7d04ca5
+  metadata.gz: f3c5ac2c784f31221ebf55a54b6a94852826de5604a7f84679f701280c5f6ffb
+  data.tar.gz: b39fcf43a9c2a02b3bb60a04b0e02de4ab16158d5aaca971d6aafefb117f2397
 SHA512:
-  metadata.gz: 877f071c79c71896a3f5e30480297ced5e2c759bff5a81e7bb32e715fec299f32e57fd0717a4944f4039f7528109836c6a604876cd25c5d1c751395ade320ee9
-  data.tar.gz: ab07a8052677ec0ef7cf8d91d5b15a411c3c2d8c2adaa4c45d4794b3e866b73f697b3b23f25dcf7839c2d44ba8fffcca3ccec17507d67761d99142d5245c2d56
+  metadata.gz: 1e7436d7db79bcffa0524adcccc3f318915509b9d5bc5321c6dfffa9586f10af7f627fe974a416f5310330beddeb751ccf21fd0974466343515c6a157a216f43
+  data.tar.gz: 96c1e8db0afea8db20d3f13db67e214212fa43ed0379a32a0f4a647436b7a9fdff148ea55e5806a7c0d90da7cf0b0f5fa7c518e16b8afb0c9c0d80926fb93679

data/.idea/tind.iml

@@ -17,12 +17,13 @@
     <orderEntry type="library" scope="PROVIDED" name="addressable (v2.8.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="amazing_print (v1.3.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.2, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="berkeley_library-logging (v0.2.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="berkeley_library-logging (v0.2.3, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="berkeley_library-marc (v0.2.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="berkeley_library-util (v0.1.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.4, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundle-audit (v0.1.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v2.2.14, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler-audit (v0.8.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler-audit (v0.9.0.1, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ci_reporter (v2.0.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ci_reporter_rspec (v1.0.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="colorize (v0.8.1, RVM: ruby-2.7.4) [gem]" level="application" />
@@ -34,25 +35,23 @@
     <orderEntry type="library" scope="PROVIDED" name="domain_name (v0.5.20190701, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="dotenv (v2.7.6, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="erubi (v1.10.0, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.15.3, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="hashdiff (v1.0.1, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="http-accept (v1.7.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="http-cookie (v1.0.4, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v1.8.10, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ice_nine (v0.11.2, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="listen (v3.1.5, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="lograge (v0.11.2, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="loofah (v2.12.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="marc (v1.1.1, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="method_source (v1.0.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.3.1, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2021.0704, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2021.0901, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.4, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="netrc (v0.11.0, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.12.3, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="oj (v3.13.2, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.12.4, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="oj (v3.13.7, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ougai (v1.9.1, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.20.1, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.21.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="parser (v3.0.2.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="parslet (v2.0.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="public_suffix (v4.0.6, RVM: ruby-2.7.4) [gem]" level="application" />
@@ -60,12 +59,10 @@
     <orderEntry type="library" scope="PROVIDED" name="rack (v2.2.3, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rack-test (v1.1.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.4.1, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.4.2, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="railties (v6.1.4.1, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.6, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.11.0, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.10.1, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rchardet (v1.8.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="regexp_parser (v2.1.1, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="request_store (v1.5.0, RVM: ruby-2.7.4) [gem]" level="application" />
@@ -78,12 +75,11 @@
     <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.10.2, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.10.2, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.11.0, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.10.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.11.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop-rake (v0.6.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v2.4.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-prof (v0.17.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.11.0, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby_dep (v1.5.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubyzip (v2.3.2, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="scrub_rb (v1.0.1, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.21.2, RVM: ruby-2.7.4) [gem]" level="application" />
@@ -94,8 +90,8 @@
     <orderEntry type="library" scope="PROVIDED" name="typesafe_enum (v0.3.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="tzinfo (v2.0.4, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="unf (v0.1.4, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.7.7, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v2.0.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.8, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v2.1.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="webmock (v3.14.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="zeitwerk (v2.4.2, RVM: ruby-2.7.4) [gem]" level="application" />
   </component>
@@ -110,7 +106,7 @@
           </RakeTaskImpl>
           <RakeTaskImpl description="Run all specs in spec directory, with coverage" fullCommand="coverage" id="coverage" />
           <RakeTaskImpl description="Run tests, check test coverage, check code style, check for vulnerabilities, build gem" fullCommand="default" id="default" />
-          <RakeTaskImpl description="Build berkeley_library-tind.gemspec as berkeley_library-tind-0.4.0.gem" fullCommand="gem" id="gem" />
+          <RakeTaskImpl description="Build berkeley_library-tind.gemspec as berkeley_library-tind-0.4.1.gem" fullCommand="gem" id="gem" />
           <RakeTaskImpl description="Run RuboCop with auto-correct, and output results to console" fullCommand="ra" id="ra" />
           <RakeTaskImpl description="Run rubocop with HTML output" fullCommand="rubocop" id="rubocop" />
           <RakeTaskImpl id="rubocop">

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.4.2 (2021-09-23)
+
+- Extract `BerkeleyLibrary::Util` module to [separate gem](https://github.com/BerkeleyLibrary/util)
+
 # 0.4.1 (2021-08-26)
 
 - Add explicit double splat to prevent

data/berkeley_library-tind.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'berkeley_library-logging', '~> 0.2'
   spec.add_dependency 'berkeley_library-marc', '~> 0.2'
+  spec.add_dependency 'berkeley_library-util', '~> 0.1'
   spec.add_dependency 'ice_nine', '~> 0.11'
   spec.add_dependency 'marc', '~> 1.0'
   spec.add_dependency 'rchardet', '~> 1.8'

data/lib/berkeley_library/tind/api/api.rb

@@ -2,7 +2,7 @@ require 'stringio'
 require 'open-uri'
 
 require 'berkeley_library/util/uris'
-require 'berkeley_library/util/logging'
+require 'berkeley_library/logging'
 require 'berkeley_library/tind/config'
 require 'berkeley_library/tind/api/api_exception'
 
@@ -105,16 +105,22 @@ module BerkeleyLibrary
         private
 
         def do_get(endpoint_uri, params)
-          raise APIKeyNotSet.new(endpoint_uri, params) if Config.blank?(api_key)
-
-          begin
-            URIs.get(endpoint_uri, params, {
-                       'Authorization' => "Token #{api_key}",
-                       'User-Agent' => user_agent
-                     })
-          rescue RestClient::RequestFailed => e
-            raise APIException.wrap(e, url: endpoint_uri, params: params)
-          end
+          headers = auth_headers(endpoint_uri, params)
+          URIs.get(endpoint_uri, params: params, headers: headers)
+        rescue RestClient::RequestFailed => e
+          raise APIException.wrap(e, url: endpoint_uri, params: params)
+        end
+
+        def auth_headers(endpoint_uri, params)
+          key = ensure_api_key(endpoint_uri, params)
+          {
+            'Authorization' => "Token #{key}",
+            'User-Agent' => user_agent
+          }
+        end
+
+        def ensure_api_key(endpoint_uri, params)
+          api_key.tap { |k| raise APIKeyNotSet.new(endpoint_uri, params) if Config.blank?(k) }
         end
 
         # TODO: make real body streaming work

data/lib/berkeley_library/tind/api/collection.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'berkeley_library/util/logging'
+require 'berkeley_library/logging'
 require 'berkeley_library/tind/api/api_exception'
 
 module BerkeleyLibrary

data/lib/berkeley_library/tind/api/search.rb

@@ -1,4 +1,4 @@
-require 'berkeley_library/util/logging'
+require 'berkeley_library/logging'
 require 'berkeley_library/tind/marc/xml_reader'
 require 'berkeley_library/tind/api/date_range'
 require 'berkeley_library/tind/api/format'

data/lib/berkeley_library/tind/export/exporter.rb

@@ -1,4 +1,4 @@
-require 'berkeley_library/util/logging'
+require 'berkeley_library/logging'
 require 'berkeley_library/tind/api/search'
 require 'berkeley_library/tind/export/table'
 

data/lib/berkeley_library/tind/export/table.rb

@@ -2,7 +2,7 @@ require 'csv'
 require 'stringio'
 
 require 'marc_extensions'
-require 'berkeley_library/util/logging'
+require 'berkeley_library/logging'
 require 'berkeley_library/tind/export/column_group_list'
 
 module BerkeleyLibrary

data/lib/berkeley_library/tind/export/table_metrics.rb

@@ -1,4 +1,4 @@
-require 'berkeley_library/util/logging'
+require 'berkeley_library/logging'
 require 'berkeley_library/tind/export/row_metrics'
 require 'berkeley_library/tind/export/config'
 

data/lib/berkeley_library/tind/module_info.rb

@@ -7,7 +7,7 @@ module BerkeleyLibrary
       SUMMARY = 'TIND DA utilities for the UC Berkeley Library'.freeze
       DESCRIPTION = 'UC Berkeley Library utility gem for working with the TIND DA digital archive.'.freeze
       LICENSE = 'MIT'.freeze
-      VERSION = '0.4.1'.freeze
+      VERSION = '0.4.2'.freeze
       HOMEPAGE = 'https://github.com/BerkeleyLibrary/tind'.freeze
     end
   end

data/lib/berkeley_library/util/ods/spreadsheet.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'zip'
-require 'berkeley_library/util/logging'
+require 'berkeley_library/logging'
 require 'berkeley_library/util/ods/xml/content_doc'
 require 'berkeley_library/util/ods/xml/styles_doc'
 require 'berkeley_library/util/ods/xml/manifest_doc'

data/lib/berkeley_library/util/ods/xml/element_node.rb

@@ -1,5 +1,5 @@
 require 'nokogiri'
-require 'berkeley_library/util/logging'
+require 'berkeley_library/logging'
 require 'berkeley_library/util/ods/xml/namespace'
 
 module BerkeleyLibrary

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkeley_library-tind
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - David Moles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkeley_library-logging
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: berkeley_library-util
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
@@ -377,8 +391,6 @@ files:
 - lib/berkeley_library/tind/marc.rb
 - lib/berkeley_library/tind/marc/xml_reader.rb
 - lib/berkeley_library/tind/module_info.rb
-- lib/berkeley_library/util/arrays.rb
-- lib/berkeley_library/util/logging.rb
 - lib/berkeley_library/util/ods/spreadsheet.rb
 - lib/berkeley_library/util/ods/xml/content_doc.rb
 - lib/berkeley_library/util/ods/xml/document_node.rb
@@ -418,15 +430,6 @@ files:
 - lib/berkeley_library/util/ods/xml/table/table_column.rb
 - lib/berkeley_library/util/ods/xml/table/table_row.rb
 - lib/berkeley_library/util/ods/xml/text/p.rb
-- lib/berkeley_library/util/paths.rb
-- lib/berkeley_library/util/stringios.rb
-- lib/berkeley_library/util/strings.rb
-- lib/berkeley_library/util/sys_exits.rb
-- lib/berkeley_library/util/times.rb
-- lib/berkeley_library/util/uris.rb
-- lib/berkeley_library/util/uris/appender.rb
-- lib/berkeley_library/util/uris/requester.rb
-- lib/berkeley_library/util/uris/validator.rb
 - rakelib/bundle.rake
 - rakelib/coverage.rake
 - rakelib/gem.rake
@@ -451,7 +454,6 @@ files:
 - spec/berkeley_library/tind/export/row_spec.rb
 - spec/berkeley_library/tind/export/table_spec.rb
 - spec/berkeley_library/tind/marc/xml_reader_spec.rb
-- spec/berkeley_library/util/arrays_spec.rb
 - spec/berkeley_library/util/ods/spreadsheet_spec.rb
 - spec/berkeley_library/util/ods/xml/content_doc_spec.rb
 - spec/berkeley_library/util/ods/xml/manifest/file_entry_spec.rb
@@ -461,11 +463,6 @@ files:
 - spec/berkeley_library/util/ods/xml/style/family_spec.rb
 - spec/berkeley_library/util/ods/xml/table/table_row_spec.rb
 - spec/berkeley_library/util/ods/xml/table/table_spec.rb
-- spec/berkeley_library/util/paths_spec.rb
-- spec/berkeley_library/util/stringios_spec.rb
-- spec/berkeley_library/util/strings_spec.rb
-- spec/berkeley_library/util/times_spec.rb
-- spec/berkeley_library/util/uris_spec.rb
 - spec/data/collection-names.txt
 - spec/data/collections.json
 - spec/data/disjoint-records.xml
@@ -528,7 +525,6 @@ test_files:
 - spec/berkeley_library/tind/export/row_spec.rb
 - spec/berkeley_library/tind/export/table_spec.rb
 - spec/berkeley_library/tind/marc/xml_reader_spec.rb
-- spec/berkeley_library/util/arrays_spec.rb
 - spec/berkeley_library/util/ods/spreadsheet_spec.rb
 - spec/berkeley_library/util/ods/xml/content_doc_spec.rb
 - spec/berkeley_library/util/ods/xml/manifest/file_entry_spec.rb
@@ -538,11 +534,6 @@ test_files:
 - spec/berkeley_library/util/ods/xml/style/family_spec.rb
 - spec/berkeley_library/util/ods/xml/table/table_row_spec.rb
 - spec/berkeley_library/util/ods/xml/table/table_spec.rb
-- spec/berkeley_library/util/paths_spec.rb
-- spec/berkeley_library/util/stringios_spec.rb
-- spec/berkeley_library/util/strings_spec.rb
-- spec/berkeley_library/util/times_spec.rb
-- spec/berkeley_library/util/uris_spec.rb
 - spec/data/collection-names.txt
 - spec/data/collections.json
 - spec/data/disjoint-records.xml

data/lib/berkeley_library/util/arrays.rb

@@ -1,178 +0,0 @@
-module BerkeleyLibrary
-  module Util
-    module Arrays
-      class << self
-        # Clients can chose to call class methods directly, or include the module
-        include Arrays
-      end
-
-      # Recursively checks whether the specified list contains, in the
-      # same order, all values in the other specified list (additional codes
-      # in between are fine)
-      #
-      # @param subset [Array] the values to look for
-      # @param superset [Array] the list of values to look in
-      # @return boolean True if all values were found, false otherwise
-      def ordered_superset?(superset:, subset:)
-        !find_indices(in_array: superset, for_array: subset).nil?
-      end
-
-      # Counts how many contiguous elements from the start of an
-      # sequence of values satisfy the given block.
-      #
-      # @overload count_while(arr:)
-      #   Returns an enumerator.
-      #   @param values [Enumerable] the values
-      #   @return [Enumerator] the enumerator.
-      # @overload count_while(arr:, &block)
-      #   Passes elements to the block until the block returns nil or false,
-      #   then stops iterating and returns the count of matching elements.
-      #   @param values [Enumerable] the values
-      #   @return [Integer] the count
-      def count_while(values:)
-        return to_enum(:count_while, values: values) unless block_given?
-
-        values.inject(0) do |count, x|
-          matched = yield x
-          break count unless matched
-
-          count + 1
-        end
-      end
-
-      # Given two lists, one of which is a superset of the other, with elements
-      # in the same order (but possibly with additional elements in the superset),
-      # returns an array the length of the subset, containing for each element in
-      # the subset the index of the corresponding element in the superset.
-      #
-      # @overload find_matching_indices(for_array:, in_array:)
-      #   For each value in `for_array`, finds the index of the first equal value
-      #   in `in_array` after the previously matched value.
-      #   @param in_array [Array] the list of values to look in
-      #   @param for_array [Array] the values to look for
-      #   @return [Array<Integer>, nil] the indices in `in_array` of each value in `for_array`,
-      #     or `nil` if not all values could be found
-      #
-      # @overload find_matching_indices(for_array:, in_array:)
-      #   For each value in `for_array`, finds the index of the first value
-      #   in `in_array` after the previously matched value that matches
-      #   the specified match function.
-      #   @param in_array [Array] the list of values to look in
-      #   @param for_array [Array] the values to look for
-      #   @yieldparam source [Object] the value to compare
-      #   @yieldparam target [Object] the value to compare against
-      #   @return [Array<Integer>, nil] the indices in `in_array` of each value in `for_array`,
-      #     or `nil` if not all values could be found
-      def find_indices(for_array:, in_array:, &block)
-        return find_indices_matching(for_array, in_array, &block) if block_given?
-
-        find_all_indices(for_array, in_array)
-      end
-
-      # Given a block or a value, finds the index of the first matching value
-      # at or after the specified start index.
-      #
-      # @overload find_index(value, in_array:, start_index:)
-      #   Finds the first index of the specified value.
-      #   @param value [Object] the value to find
-      #   @param in_array [Array] the array to search
-      #   @param start_index [Integer] the index to start with
-      #   @return [Integer, nil] the index, or `nil` if no value matches
-      # @overload find_index(&block)
-      #   Finds the index of the first value matching
-      #   the specified block.
-      #   @param in_array [Array] the array to search
-      #   @param start_index [Integer] the index to start with
-      #   @yieldreturn [Boolean] whether the element matches
-      #   @return [Integer, nil] the index, or `nil` if no value matches
-      # @overload find_index
-      #   @param in_array [Array] the array to search
-      #   @param start_index [Integer] the index to start with
-      #   @return [Enumerator] a new enumerator
-      def find_index(*args, in_array:, start_index: 0, &block)
-        raise ArgumentError, "wrong number of arguments (given #{value.length}, expected 0..1" if args.size > 1
-        return Enumerator.new { |y| find_index(in_array: in_array, start_index: start_index, &y) } if args.empty? && !block_given?
-        return unless (relative_index = in_array[start_index..].find_index(*args, &block))
-
-        relative_index + start_index
-      end
-
-      # Given an array of unique integers _a<sub>1</sub>_, returns a new array
-      # _a<sub>2</sub>_ in which the value at each index _i<sub>2</sub>_ is the
-      # index _i<sub>1</sub>_ at which that value was found in _a<sub>1</sub>_.
-      # E.g., given `[0, 2, 3]`, returns `[0, nil, 1, 2]`. The indices need
-      # not be in order but must be unique.
-      #
-      # @param arr [Array<Integer>, nil] the array to invert.
-      # @return [Array<Integer, nil>, nil] the inverted array, or nil if the input array is nil
-      # @raise TypeError if `arr` is not an array of integers
-      # @raise ArgumentError if `arr` contains duplicate values
-      def invert(arr)
-        return unless arr
-
-        # noinspection RubyNilAnalysis
-        Array.new(arr.size).tap do |inv|
-          arr.each_with_index do |v, i|
-            next inv[v] = i unless (prev_index = inv[v])
-
-            raise ArgumentError, "Duplicate value #{v} at index #{i} already found at #{prev_index}"
-          end
-        end
-      end
-
-      # Merges two arrays in an order-preserving manner.
-      # @param a1 [Array] the first array
-      # @param a2 [Array] the second array
-      # @return [Array] a merged array that is an ordered superset of both `a1` and `a2`
-      # @see Arrays#ordered_superset?
-      def merge(a1, a2)
-        return a1 if a2.empty?
-        return a2 if a1.empty?
-
-        shorter, longer = a1.size > a2.size ? [a2, a1] : [a1, a2]
-        do_merge(shorter, longer)
-      end
-
-      private
-
-      def do_merge(shorter, longer)
-        shorter.each_with_index do |v, ix_s|
-          next unless (ix_l = longer.find_index(v))
-
-          shorter_unmatched = shorter[0...ix_s]
-          longer_unmatched = longer[0...ix_l]
-          all_unmatched = sort_by_first_and_flatten(shorter_unmatched, longer_unmatched)
-          return (all_unmatched << v) + merge(shorter[ix_s + 1..], longer[ix_l + 1..])
-        end
-
-        sort_by_first_and_flatten(longer, shorter)
-      end
-
-      def sort_by_first_and_flatten(a1, a2)
-        return a1 if a2.empty?
-        return a2 if a1.empty?
-        return a2 + a1 if a1.first.respond_to?(:>) && a1.first > a2.first
-
-        a1 + a2
-      end
-
-      def find_all_indices(source, target)
-        source.each_with_object([]) do |src, target_indices|
-          target_offset = (target_indices.last&.+ 1) || 0
-          return nil unless (target_index = find_index(src, in_array: target, start_index: target_offset))
-
-          target_indices << target_index
-        end
-      end
-
-      def find_indices_matching(source, target)
-        source.each_with_object([]) do |src, target_indices|
-          target_offset = (target_indices.last&.+ 1) || 0
-          return nil unless (target_index = find_index(in_array: target, start_index: target_offset) { |tgt| yield src, tgt })
-
-          target_indices << target_index
-        end
-      end
-    end
-  end
-end

data/lib/berkeley_library/util/logging.rb

@@ -1 +0,0 @@
-require 'berkeley_library/logging'

data/lib/berkeley_library/util/paths.rb

@@ -1,111 +0,0 @@
-require 'berkeley_library/util/stringios'
-
-module BerkeleyLibrary
-  module Util
-    # This module, modeled on the {https://golang.org/pkg/path/ Go `path` package},
-    # provides utility routines for modifying paths separated by forward slashes,
-    # such as URL paths. For system-dependent file paths, use
-    # {https://ruby-doc.org/stdlib-2.7.0/libdoc/pathname/rdoc/Pathname.html `Pathname`}
-    # instead.
-    module Paths
-      include BerkeleyLibrary::Util::StringIOs
-
-      class << self
-        include Paths
-      end
-
-      # Returns the shortest path name equivalent to `path` by purely lexical
-      # processing by:
-      #
-      # 1. replacing runs of multiple `/` with a single `/`
-      # 2. eliminating all `.` (current directory) elements
-      # 3. eliminating all `<child>/..` in favor of directly
-      #    referencing the parent directory
-      # 4. replaing all `/..` at the beginning of the path
-      #    with a single leading `/`
-      #
-      # The returned path ends in a slash only if it is the root `/`.
-      # @see https://9p.io/sys/doc/lexnames.html Rob Pike, "Lexical File Names in Plan 9 or Getting Dot-Dot Right"
-      #
-      # @param path [String, nil] the path to clean
-      # @return [String, nil] the cleaned path, or `nil` for a nil path.
-      def clean(path)
-        return unless path
-        return '.' if ['', '.'].include?(path)
-
-        StringIO.new.tap do |out|
-          out << '/' if path[0] == '/'
-          dotdot = (r = out.size)
-          r, dotdot = process_next(r, dotdot, path, out) while r < path.size
-          out << '.' if out.pos == 0
-        end.string
-      end
-
-      # Joins any number of path elements into a single path, separating
-      # them with slashes, ignoring empty elements and passing the result
-      # to {Paths#clean}.
-      #
-      # @param elements [Array<String>] the elements to join
-      # @return [String] the joined path
-      def join(*elements)
-        elements = elements.reject { |e| [nil, ''].include?(e) }
-        joined_raw = elements.join('/')
-        return '' if joined_raw == ''
-
-        clean(joined_raw)
-      end
-
-      private
-
-      def process_next(r, dotdot, path, out)
-        # empty path element, or .
-        return r + 1, dotdot if empty_or_dot?(r, path)
-        # .. element: remove to last /
-        return handle_dotdot(r, dotdot, path, out) if dotdot?(r, path)
-
-        # real path element
-        [append_from(r, path, out), dotdot]
-      end
-
-      def handle_dotdot(r, dotdot, path, out)
-        if out.pos > dotdot
-          backtrack_to_dotdot(out, dotdot)
-        elsif path[0] != '/'
-          dotdot = append_dotdot(out)
-        end
-
-        [r + 2, dotdot]
-      end
-
-      def dotdot?(r, path)
-        path[r] == '.' && (r + 2 == path.size || path[r + 2] == '/')
-      end
-
-      def empty_or_dot?(r, path)
-        path[r] == '/' || (path[r] == '.' && (r + 1 == path.size || path[r + 1] == '/'))
-      end
-
-      def append_from(r, path, out)
-        out << '/' if (path[0] == '/' && out.pos != 1) || (path[0] != '/' && out.pos != 0)
-        while r < path.size && path[r] != '/'
-          out << path[r]
-          r += 1
-        end
-        r
-      end
-
-      def append_dotdot(out)
-        out << '/' if out.pos > 1
-        out << '..'
-        out.pos
-      end
-
-      def backtrack_to_dotdot(out, dotdot)
-        out.seek(-1, IO::SEEK_CUR)
-        out.seek(-1, IO::SEEK_CUR) while out.pos > dotdot && getbyte(out, out.pos) != 47 # '/' is ASCII 37
-        out.truncate(out.pos)
-      end
-
-    end
-  end
-end