berkeley_library-util 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eac060e7b0956b965455bddb8cc6c9721d5af784ac421766c2d791d99632927
-  data.tar.gz: a68fecb0b685ddffa3cb0fff6a46180e377efeb71b1cc5d23a389117c27be72d
+  metadata.gz: a17e4e3e2e6e03e0dda795450e724650a0a7f7ae44db3b7a558bc371d8bed1b7
+  data.tar.gz: 106ff7e21c1e9568f4bdabc116023c292878f4fd629e5ee3ada934b2c2a10b43
 SHA512:
-  metadata.gz: 052c93d1c09d569479d4bec70ffa9413e3ab0404f19482955b89552891c7058ab76ec11191456aa79016e1e2c98403eb355c89982ffe31f31d37f650517970b2
-  data.tar.gz: 530542deae99ffbd089cfc294b614d9560e2298ed4f7a20161970185935155a620b578bd99066a219e7d0410305d525e354c9b811162adbefdf3dda35c904427
+  metadata.gz: b4fbde8aa9e43a7ad7c414b92b488c5d2af1ae29c7f28a7ecd8f6ceb308e42c3c27a2256994362b15cba5133ec00feb32d5fe76f0b774577b292be6c2ba08528
+  data.tar.gz: 23c41cbed1b0befc458c8989792c45cf7429905b06e2deec72a88478f8eb7676a6e3be96dae5fa308239bb4f70b19acae421593711c20dd22d305f55262b0f64

data/.github/workflows/build.yml

@@ -1,18 +1,30 @@
 name: Build
-on: [ push, pull_request ]
+on: [ push, pull_request, workflow_dispatch ]
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        ruby: [ '2.7', '3.0' ]
+        ruby: [ '2.7', '3.0', '3.1' ]
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
+      - name: Check out repository
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - run: bundle exec rake
+
+      - name: Run checks
+        run: bundle exec rake
+
+      - name: Upload artifacts
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: artifacts
+          path: artifacts/**

data/.idea/inspectionProfiles/Project_Default.xml

@@ -11,6 +11,7 @@
     <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="RubyMismatchedArgumentType" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="RubyMismatchedReturnType" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="myCheckNilability" value="false" />
     </inspection_tool>

data/.idea/util.iml

@@ -5,83 +5,83 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/artifacts" />
+    </content>
     <orderEntry type="jdk" jdkName="RVM: ruby-2.7.4" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="actionpack (v7.0.3, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionview (v7.0.3, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activesupport (v7.0.3, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="addressable (v2.8.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionpack (v7.0.4.2, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionview (v7.0.4.2, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activesupport (v7.0.4.2, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="addressable (v2.8.1, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="amazing_print (v1.4.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.6, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="berkeley_library-logging (v0.2.7, 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.31, 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 (v2.1.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" />
-    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.10, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.2.2, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="crack (v0.4.5, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="crass (v1.0.6, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.5.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="docile (v1.4.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <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="dotenv (v2.8.1, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="erubi (v1.12.0, 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.10.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="http-cookie (v1.0.5, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="i18n (v1.12.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v2.6.3, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="lograge (v0.12.0, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="loofah (v2.18.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="loofah (v2.19.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.4.1, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2022.0105, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.15.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2023.0218.1, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.18.0, 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.13.6, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="oj (v3.13.11, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.14.2, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="oj (v3.14.2, 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.22.1, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parser (v3.1.2.0, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="public_suffix (v4.0.7, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="racc (v1.6.0, RVM: ruby-2.7.4) [gem]" level="application" />
-    <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="parser (v3.2.1.1, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="public_suffix (v5.0.1, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="racc (v1.6.2, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rack (v2.2.6.3, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rack-test (v2.0.2, 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.2, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="railties (v7.0.3, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.5.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="railties (v7.0.4.2, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.1.1, 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="regexp_parser (v2.3.1, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="regexp_parser (v2.7.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="request_store (v1.5.1, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rest-client (v2.1.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.5, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.11.0, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.11.0, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.11.0, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.11.1, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.11.0, 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.17.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.12.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.12.1, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.12.2, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.12.3, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.12.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.39.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.27.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="simplecov (v0.21.2, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.13.0, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.22.0, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.12.3, RVM: ruby-2.7.4) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov-rcov (v0.3.1, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="simplecov_json_formatter (v0.1.4, RVM: ruby-2.7.4) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="thor (v1.2.1, RVM: ruby-2.7.4) [gem]" level="application" />
-    <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="typesafe_enum (v0.3.1, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tzinfo (v2.0.6, 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.8.1, 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.5.4, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.8.2, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v2.4.2, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="webmock (v3.18.1, RVM: ruby-2.7.4) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="zeitwerk (v2.6.7, RVM: ruby-2.7.4) [gem]" level="application" />
   </component>
   <component name="RModuleSettingsStorage">
     <LOAD_PATH number="2" string0="$MODULE_DIR$/lib" string1="$MODULE_DIR$/spec" />
@@ -91,19 +91,16 @@
     <option name="myRootTask">
       <RakeTaskImpl id="rake">
         <subtasks>
-          <RakeTaskImpl id="bundle">
-            <subtasks>
-              <RakeTaskImpl description="Updates the ruby-advisory-db then runs bundle-audit" fullCommand="bundle:audit" id="audit" />
-            </subtasks>
-          </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-util.gemspec as berkeley_library-util-0.1.4.gem" fullCommand="gem" id="gem" />
+          <RakeTaskImpl description="Run tests, check test coverage, check code style, build gem" fullCommand="default" id="default" />
+          <RakeTaskImpl description="Build berkeley_library-util.gemspec as berkeley_library-util-0.1.6.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">
             <subtasks>
-              <RakeTaskImpl description="Auto-correct RuboCop offenses" fullCommand="rubocop:auto_correct" id="auto_correct" />
+              <RakeTaskImpl description="Autocorrect RuboCop offenses (only when it's safe)" fullCommand="rubocop:autocorrect" id="autocorrect" />
+              <RakeTaskImpl description="Autocorrect RuboCop offenses (safe and unsafe)" fullCommand="rubocop:autocorrect_all" id="autocorrect_all" />
+              <RakeTaskImpl description="" fullCommand="rubocop:auto_correct" id="auto_correct" />
             </subtasks>
           </RakeTaskImpl>
           <RakeTaskImpl description="Run RSpec code examples" fullCommand="spec" id="spec" />

data/.rubocop.yml

@@ -332,7 +332,162 @@ Style/SwapValues: # (new in 1.1)
 ############################################################
 # Added in RuboCop 1.10
 
-Gemspec/DateAssignment: # (new in 1.10)
-  Enabled: true
 Style/HashConversion: # (new in 1.10)
   Enabled: true
+
+############################################################
+# Added in RuboCop 1.12
+
+Style/StringChars: # (new in 1.12)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.16
+
+Lint/EmptyInPattern: # (new in 1.16)
+  Enabled: true
+Style/InPatternThen: # (new in 1.16)
+  Enabled: true
+Style/MultilineInPatternThen: # (new in 1.16)
+  Enabled: true
+Style/QuotedSymbols: # (new in 1.16)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.18
+
+Layout/LineEndStringConcatenationIndentation: # (new in 1.18)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.19
+
+Lint/AmbiguousRange: # (new in 1.19)
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # (new in 1.19)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.21
+
+Lint/AmbiguousOperatorPrecedence: # (new in 1.21)
+  Enabled: true
+Lint/IncompatibleIoSelectWithFiberScheduler: # (new in 1.21)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.22
+
+Lint/RequireRelativeSelfPath: # (new in 1.22)
+  Enabled: true
+Security/IoMethods: # (new in 1.22)
+  Enabled: true
+Style/NumberedParameters: # (new in 1.22)
+  Enabled: true
+Style/NumberedParametersLimit: # (new in 1.22)
+  Enabled: true
+Style/SelectByRegexp: # (new in 1.22)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.23
+
+Gemspec/RequireMFA: # (new in 1.23)
+  Enabled: true
+Lint/UselessRuby2Keywords: # (new in 1.23)
+  Enabled: true
+Style/OpenStructUse: # (new in 1.23)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.24
+
+Naming/BlockForwarding: # (new in 1.24)
+  Enabled: true
+Style/FileRead: # (new in 1.24)
+  Enabled: true
+Style/FileWrite: # (new in 1.24)
+  Enabled: true
+Style/MapToHash: # (new in 1.24)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.26
+
+Style/NestedFileDirname: # (new in 1.26)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.27
+
+Lint/RefinementImportMethods: # (new in 1.27)
+  Enabled: true
+Style/RedundantInitialize: # (new in 1.27)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.28
+
+Security/CompoundHash: # (new in 1.28)
+  Enabled: true
+Style/FetchEnvVar: # (new in 1.28)
+  Enabled: true
+Style/ObjectThen: # (new in 1.28)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.29
+
+Style/EnvHome: # (new in 1.29)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.30
+
+Gemspec/DeprecatedAttributeAssignment: # (new in 1.30)
+  Enabled: true
+Style/MapCompactWithConditionalBlock: # (new in 1.30)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.31
+
+Layout/LineContinuationLeadingSpace: # (new in 1.31)
+  Enabled: true
+Layout/LineContinuationSpacing: # (new in 1.31)
+  Enabled: true
+Lint/ConstantOverwrittenInRescue: # (new in 1.31)
+  Enabled: true
+Lint/NonAtomicFileOperation: # (new in 1.31)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.32
+
+Lint/RequireRangeParentheses: # (new in 1.32)
+  Enabled: true
+Style/EmptyHeredoc: # (new in 1.32)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.35
+
+Style/MagicCommentFormat: # (new in 1.35)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.37
+
+Lint/DuplicateMagicComment: # (new in 1.37)
+  Enabled: true
+Style/OperatorMethodCall: # (new in 1.37)
+  Enabled: true
+Style/RedundantStringEscape: # (new in 1.37)
+  Enabled: true
+
+############################################################
+# Added in RuboCop 1.38
+
+Style/RedundantEach: # (new in 1.38)
+  Enabled: true
+

data/.simplecov

@@ -1,8 +1,7 @@
-require 'simplecov-rcov'
-
-SimpleCov.start 'rails' do
+SimpleCov.start do
   add_filter 'module_info.rb'
-  coverage_dir 'artifacts'
-  formatter SimpleCov::Formatter::RcovFormatter
-  minimum_coverage 100
+  coverage_dir 'artifacts/coverage'
+
+  enable_coverage :branch
+  minimum_coverage line: 100, branch: 100
 end

data/CHANGES.md

@@ -1,3 +1,13 @@
+# 0.1.6 (2023-03-09)
+
+- Fix issue in `Requester` where query parameters would not be appended properly
+  to URLs that already included a query string.
+- Fix issue in `URIs#append` (and `Appender`) where `?` would not be accepted in
+  query strings or fragments, contrary to RFC 3986 §3.
+- Fix documentation for `Arrays#find_indices`.
+- Fix issue where `Arrays#find_index` would raise a confusing `NameError`
+  instead of a helpful `ArgumentError` if passed too many arguments.
+
 # 0.1.5 (2022-09-16)
 
 - Adds `URIs#path_escape` to escape URL path segments

data/Rakefile

@@ -16,5 +16,5 @@ ENV['RAILS_ENV'] = 'test' if ENV['CI']
 # ------------------------------------------------------------
 # Custom tasks
 
-desc 'Run tests, check test coverage, check code style, check for vulnerabilities, build gem'
-task default: %i[coverage rubocop bundle:audit gem]
+desc 'Run tests, check test coverage, check code style, build gem'
+task default: %i[coverage rubocop gem]

data/berkeley_library-util.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
   spec.homepage = BerkeleyLibrary::Util::ModuleInfo::HOMEPAGE
 
   spec.files = `git ls-files -z`.split("\x0")
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = ruby_version
@@ -26,17 +25,17 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rest-client', '~> 2.1'
   spec.add_dependency 'typesafe_enum', '~> 0.3'
 
-  spec.add_development_dependency 'bundle-audit', '~> 0.1'
   spec.add_development_dependency 'ci_reporter_rspec', '~> 1.0'
   spec.add_development_dependency 'colorize', '~> 0.8'
   spec.add_development_dependency 'dotenv', '~> 2.7'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.10'
-  spec.add_development_dependency 'rubocop', '= 1.11'
-  spec.add_development_dependency 'rubocop-rake', '~> 0.5'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
+  spec.add_development_dependency 'rubocop', '= 1.39'
+  spec.add_development_dependency 'rubocop-rake', '= 0.6.0'
+  spec.add_development_dependency 'rubocop-rspec', '= 2.4.0'
   spec.add_development_dependency 'ruby-prof', '~> 0.17.0'
   spec.add_development_dependency 'simplecov', '~> 0.21'
-  spec.add_development_dependency 'simplecov-rcov', '~> 0.2'
   spec.add_development_dependency 'webmock', '~> 3.12'
+
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/berkeley_library/util/arrays.rb

@@ -45,7 +45,7 @@ module BerkeleyLibrary
       # 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:)
+      # @overload find_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
@@ -53,7 +53,7 @@ module BerkeleyLibrary
       #   @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:)
+      # @overload find_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.
@@ -90,7 +90,7 @@ module BerkeleyLibrary
       #   @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
+        raise ArgumentError, "wrong number of arguments (given #{args.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))
 

data/lib/berkeley_library/util/files.rb

@@ -11,8 +11,8 @@ module BerkeleyLibrary
       end
 
       def parent_exists?(path)
-        path.respond_to?(:parent) && path.parent.exist? ||
-          path.respond_to?(:to_str) && Pathname.new(path).parent.exist?
+        (path.respond_to?(:parent) && path.parent.exist?) ||
+          (path.respond_to?(:to_str) && Pathname.new(path).parent.exist?)
       end
 
       # Returns true if `obj` is close enough to an IO object for Nokogiri

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

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

@@ -22,10 +22,7 @@ module BerkeleyLibrary
 
           @elements = elements.map(&:to_s)
           @elements.each_with_index do |element, elem_index|
-            next start_query_at(elem_index) if element.include?('?')
-            next start_fragment_at(elem_index) if element.include?('#')
-
-            add_element(element)
+            handle_element(element, elem_index)
           end
         end
 
@@ -44,6 +41,16 @@ module BerkeleyLibrary
 
         private
 
+        def handle_element(element, elem_index)
+          h_index = element.index('#')
+          q_index = element.index('?')
+          # per RFC 3986 §3, fragment (or query) can contain '?', but query can't contain '#'
+          return start_fragment_at(elem_index) if h_index && (q_index.nil? || h_index < q_index)
+          return start_query_at(elem_index) if q_index && !(in_query? || in_fragment?)
+
+          add_element(element)
+        end
+
         def state
           @state ||= :path
         end
@@ -77,24 +84,21 @@ module BerkeleyLibrary
         end
 
         def start_query_at(elem_index)
-          raise URI::InvalidComponentError, err_query_after_fragment(elem_index) if in_fragment?
-          raise URI::InvalidComponentError, err_too_many_queries(elem_index) unless query_elements.empty?
-
           handle_query_start(elem_index)
           @state = :query
         end
 
         def start_fragment_at(elem_index)
           raise URI::InvalidComponentError, err_too_many_fragments(elem_index) unless fragment_elements.empty?
-          raise URI::InvalidComponentError, err_query_after_fragment(elem_index) if query_after_fragment?(elem_index)
+          raise URI::InvalidComponentError, err_too_many_fragments(elem_index) if too_many_fragments?(elem_index)
 
           handle_fragment_start(elem_index)
           @state = :fragment
         end
 
-        def query_after_fragment?(elem_index)
+        def too_many_fragments?(elem_index)
           e = elements[elem_index]
-          e.index('?', e.index('#'))
+          e.index('#', 1 + e.index('#'))
         end
 
         def add_element(e)
@@ -122,7 +126,7 @@ module BerkeleyLibrary
           return q_start unless (f_index = q_start.index('#'))
 
           next_index = elem_index + 1
-          q_start, q_next = split_around(q_start, f_index)           # NOTE: this doesn't return the '#'
+          q_start, q_next = split_around(q_start, f_index) # NOTE: this doesn't return the '#'
           elements[next_index] = "##{q_next}#{elements[next_index]}" #       so we prepend one here
           q_start
         end
@@ -146,14 +150,6 @@ module BerkeleyLibrary
           [s[0...i], s[(i + 1)..]]
         end
 
-        def err_too_many_queries(elem_index)
-          "#{elements[elem_index].inspect}: URI already has a query string: #{query.inspect}"
-        end
-
-        def err_query_after_fragment(elem_index)
-          "#{elements[elem_index].inspect}: Query delimiter '?' cannot follow fragment delimeter '#'"
-        end
-
         def err_too_many_fragments(elem_index)
           "#{elements[elem_index].inspect}: URI already has a fragment: #{fragment.inspect}"
         end

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

@@ -68,14 +68,14 @@ module BerkeleyLibrary
             req_resp_or_raise(method, url_str, headers)
           end
 
-          def url_str_with_params(uri, params)
-            raise ArgumentError, 'uri cannot be nil' unless (url_str = Validator.url_str_or_nil(uri))
+          def url_str_with_params(url, params)
+            raise ArgumentError, 'url cannot be nil' unless (uri = Validator.uri_or_nil(url))
 
             elements = [].tap do |ee|
-              ee << url_str
+              ee << uri
               next if params.empty?
 
-              ee << '?' unless url_str.include?('?')
+              ee << (uri.query ? '&' : '?')
               ee << URI.encode_www_form(params)
             end
 

data/lib/berkeley_library/util/uris.rb

@@ -115,7 +115,7 @@ module BerkeleyLibrary
 
       def should_escape?(b, mode)
         return false if unreserved?(b)
-        return false if ALLOWED_BYTES_BY_MODE[mode]&.include?(b)
+        return false if ALLOWED_BYTES_BY_MODE[mode].include?(b)
 
         true
       end

data/rakelib/.rubocop.yml

@@ -0,0 +1,4 @@
+inherit_from: ../.rubocop.yml
+
+require:
+  - rubocop-rake

data/spec/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from: ../.rubocop.yml
 
+require:
+  - rubocop-rspec
+
 AllCops:
   # Exclude generated files
   Exclude:
@@ -38,3 +41,89 @@ Metrics/MethodLength:
 # Sometimes we're testing the operator
 Lint/BinaryOperatorWithIdenticalOperands:
   Enabled: false
+
+############################################################
+# rubocop-rspec
+
+# believe me, it wasn't by choice
+RSpec/AnyInstance:
+  Enabled: false
+
+# we meant to do that
+RSpec/BeforeAfterAll:
+  Enabled: false
+
+# more words != more readable
+RSpec/ContextWording:
+  Enabled: false
+
+# explicit >>> implicit
+RSpec/DescribedClass:
+  Enabled: false
+
+# more punctuation != more readable
+RSpec/DescribeSymbol:
+  Enabled: false
+
+# setup cost / time >>> failure granularity
+RSpec/ExampleLength:
+  Max: 15
+  CountAsOne:
+    - array
+    - hash
+    - heredoc
+
+# we meant to do that
+RSpec/ExpectInHook:
+  Enabled: false
+
+# your naming scheme is not in possession of all the facts
+RSpec/FilePath:
+  Enabled: false
+
+# explicit >>> implicit
+RSpec/InstanceVariable:
+  Enabled: false
+
+# maybe when 'all' has a corresponding 'none' matcher
+RSpec/IteratedExpectation:
+  Enabled: false
+
+# we meant to do that
+RSpec/MessageSpies:
+  Enabled: false
+
+# too late now
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
+# setup cost / time >>> failure granularity
+RSpec/MultipleExpectations:
+  Enabled: false
+
+# cure is worse than the disease
+RSpec/NestedGroups:
+  Enabled: false
+
+# more quotation marks != more readable
+RSpec/SharedExamples:
+  Enabled: false
+
+# we meant to do that
+RSpec/StubbedMock:
+  Enabled: false
+
+# we meant to do that
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+############################################################
+# rubocop-rspec
+
+# enable newer rubocop-rspec cops
+
+RSpec/IdenticalEqualityAssertion: # new in 2.4
+  Enabled: true
+
+RSpec/Rails/AvoidSetupHook: # new in 2.4
+  Enabled: true

data/spec/berkeley_library/util/arrays_spec.rb

@@ -113,12 +113,13 @@ module BerkeleyLibrary::Util
         ]
         sources.each do |source|
           expect(Arrays.find_indices(for_array: source, in_array: target)).to be_nil
+          expect(Arrays.find_indices(for_array: source, in_array: target) { |s, t| t == s.to_s }).to be_nil
         end
       end
 
       it 'takes a comparison block' do
         sub = %i[a c e]
-        expect(Arrays.find_indices(for_array: sub, in_array: target) { |source, target| target == source.to_s }).to eq([0, 2, 4])
+        expect(Arrays.find_indices(for_array: sub, in_array: target) { |s, t| t == s.to_s }).to eq([0, 2, 4])
       end
     end
 
@@ -145,6 +146,10 @@ module BerkeleyLibrary::Util
         expect(Arrays.find_index(in_array: arr, start_index: 2) { |x| x < 4 }).to be_nil
       end
 
+      it 'raises ArgumentError if given extra arguments' do
+        expect { Arrays.find_index(1, 2, 3, in_array: [1, 2, 3]) }.to raise_error(ArgumentError)
+      end
+
       # rubocop:disable Lint/Void
       it 'returns an enumerator if given no arguments' do
         e = Arrays.find_index(in_array: arr)
@@ -327,6 +332,10 @@ module BerkeleyLibrary::Util
         expect(Arrays.invert([0, 2, 3])).to eq([0, nil, 1, 2])
       end
 
+      it 'returns nil if given nil' do
+        expect(Arrays.invert(nil)).to be_nil
+      end
+
       it 'fails if values are not ints' do
         # noinspection RubyYardParamTypeMatch
         expect { Arrays.invert(%i[a b c]) }.to raise_error(TypeError)

data/spec/berkeley_library/util/files_spec.rb

@@ -8,6 +8,7 @@ module BerkeleyLibrary
       attr_reader :tmpdir
 
       before { @tmpdir = Dir.mktmpdir(basename) }
+
       after { FileUtils.remove_entry(tmpdir) }
 
       describe :file_exists? do

data/spec/berkeley_library/util/stringios_spec.rb

@@ -16,6 +16,13 @@ module BerkeleyLibrary
           end
         end
 
+        it 'reads from the end if given a negative index' do
+          bytes.reverse.each_with_index do |b, i|
+            end_offset = i + 1
+            expect(StringIOs.getbyte(sio, -end_offset)).to eq(b)
+          end
+        end
+
         it 'resets the current offset' do
           StringIOs.getbyte(sio, bytes.size / 2)
           expect(sio.pos).to eq(0)

data/spec/berkeley_library/util/strings_spec.rb

@@ -41,6 +41,10 @@ module BerkeleyLibrary
           expect(Strings.diff_index(s, s)).to be_nil
         end
 
+        it 'returns nil for non-strings' do
+          expect(Strings.diff_index(2, ['2'])).to be_nil
+        end
+
         it 'returns the index for different strings' do
           s1 = 'elvis aaron presley'
           s2 = 'elvis nikita presley'

data/spec/berkeley_library/util/times_spec.rb

@@ -33,6 +33,10 @@ module BerkeleyLibrary
           # noinspection RubyYardParamTypeMatch
           expect { Times.ensure_utc(Object.new) }.to raise_error(ArgumentError)
         end
+
+        it 'returns nil for nil' do
+          expect(Times.ensure_utc(nil)).to be_nil
+        end
       end
     end
   end

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

@@ -97,6 +97,17 @@ module BerkeleyLibrary
             expect(result).to eq(expected_status)
           end
 
+          it 'appends query parameters to URL with existing params' do
+            url = 'https://example.org/endpoint?foo=bar'
+            params = { p1: 1, p2: 2 }
+            url_with_query = "#{url}&#{URI.encode_www_form(params)}"
+            expected_status = 203
+            stub_request(:head, url_with_query).to_return(status: expected_status)
+
+            result = Requester.head(url, params: params)
+            expect(result).to eq(expected_status)
+          end
+
           it 'sends request headers' do
             url = 'https://example.org/'
             headers = { 'X-help' => 'I am trapped in a unit test' }
@@ -129,6 +140,10 @@ module BerkeleyLibrary
             result = Requester.head(url1)
             expect(result).to eq(expected_status)
           end
+
+          it 'rejects a nil URI' do
+            expect { Requester.head(nil) }.to raise_error(ArgumentError)
+          end
         end
       end
     end

data/spec/berkeley_library/util/uris_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 module BerkeleyLibrary::Util
   describe URIs do
     describe :append do
+      it 'rejects a nil URI' do
+        expect { URIs.append(nil, 'foo') }.to raise_error(ArgumentError)
+      end
+
       it 'appends paths' do
         original_uri = URI('https://example.org/foo/bar')
         new_uri = URIs.append(original_uri, 'qux', 'corge', 'garply')
@@ -92,29 +96,67 @@ module BerkeleyLibrary::Util
         expect(new_uri).to eq(URI('https://example.org/foo/bar/qux/corge/garply?baz=qux#grault'))
       end
 
-      it 'rejects a query string if the original URI already has one' do
-        original_uri = URI('https://example.org/foo/bar?baz=qux')
-        expect { URIs.append(original_uri, '/qux?corge') }.to raise_error(URI::InvalidComponentError)
-      end
-
       it 'rejects a fragment if the original URI already has one' do
         original_uri = URI('https://example.org/foo/bar#baz')
         expect { URIs.append(original_uri, '/qux#corge') }.to raise_error(URI::InvalidComponentError)
       end
 
-      it 'rejects appending multiple queries' do
+      # Per RFC3986, "3.4. Query"
+      it 'allows queries containing ?' do
+        original_uri = URI('https://example.org/foo/bar')
+        expected_url = "#{original_uri}/baz?qux=corge?grault?plugh=xyzzy"
+        expected_uri = URI.parse(expected_url)
+
+        uri1 = URIs.append(original_uri, 'baz?qux=corge', '?grault?plugh=xyzzy')
+        expect(uri1).to eq(expected_uri)
+
+        uri2 = URIs.append(original_uri, 'baz?qux=corge?grault?plugh=xyzzy')
+        expect(uri2).to eq(expected_uri)
+      end
+
+      # Per RFC3986, "3.4. Query"
+      it 'allows queries containing /' do
         original_uri = URI('https://example.org/foo/bar')
-        expect { URIs.append(original_uri, 'baz?qux=corge', 'grault?plugh=xyzzy') }.to raise_error(URI::InvalidComponentError)
+        expected_url = "#{original_uri}/baz?qux=corge/grault/plugh=xyzzy"
+        expected_uri = URI.parse(expected_url)
+
+        uri1 = URIs.append(original_uri, 'baz?qux=corge', '/grault/plugh=xyzzy')
+        expect(uri1).to eq(expected_uri)
+
+        uri2 = URIs.append(original_uri, 'baz?qux=corge/grault/plugh=xyzzy')
+        expect(uri2).to eq(expected_uri)
       end
 
-      it 'rejects appending multiple fragments' do
+      it 'rejects fragments containing #' do
         original_uri = URI('https://example.org/foo/bar')
         expect { URIs.append(original_uri, 'baz#qux', 'grault#plugh') }.to raise_error(URI::InvalidComponentError)
+        expect { URIs.append(original_uri, 'baz#qux#plugh') }.to raise_error(URI::InvalidComponentError)
       end
 
-      it 'rejects queries after fragments' do
+      # Per RFC3986, "3.5. Fragment"
+      it 'allows fragments containing ?' do
         original_uri = URI('https://example.org/foo/bar')
-        expect { URIs.append(original_uri, 'baz#qux', '?grault=plugh') }.to raise_error(URI::InvalidComponentError)
+        expected_url = "#{original_uri}/baz#qux?grault=plugh"
+        expected_uri = URI.parse(expected_url)
+
+        uri1 = URIs.append(original_uri, 'baz#qux', '?grault=plugh')
+        expect(uri1).to eq(expected_uri)
+
+        uri2 = URIs.append(original_uri, 'baz#qux?grault=plugh')
+        expect(uri2).to eq(expected_uri)
+      end
+
+      # Per RFC3986, "3.5. Fragment"
+      it 'allows fragments containing /' do
+        original_uri = URI('https://example.org/foo/bar')
+        expected_url = "#{original_uri}/baz#qux/grault=plugh"
+        expected_uri = URI.parse(expected_url)
+
+        uri1 = URIs.append(original_uri, 'baz#qux', '/grault=plugh')
+        expect(uri1).to eq(expected_uri)
+
+        uri2 = URIs.append(original_uri, 'baz#qux/grault=plugh')
+        expect(uri2).to eq(expected_uri)
       end
 
       it 'correctly handles fragments in mid-path-segment' do
@@ -147,6 +189,15 @@ module BerkeleyLibrary::Util
         expected_url = "https://example.org/#{encoded_segment}/foo.html"
         expect(new_uri).to eq(URI(expected_url))
       end
+
+      it 'accepts path segments with allowed punctuation' do
+        original_uri = URI('https://example.org/')
+        path = 'foo/bar/baz@qux&corge=garply+grault$waldo/fred'
+        new_uri = URIs.append(original_uri, path, 'plugh')
+        expected_url = "#{original_uri}#{path}/plugh"
+        expect(new_uri).to eq(URI(expected_url))
+      end
+
     end
 
     describe 'requests' do
@@ -266,6 +317,7 @@ module BerkeleyLibrary::Util
           'foo+bar' => 'foo+bar',
           'qux/quux' => 'qux%2Fquux',
           'foo bar baz' => 'foo%20bar%20baz',
+          'Corge-Grault.Fred_Waldo~Plugh' => 'Corge-Grault.Fred_Waldo~Plugh',
           '25%' => '25%25',
           "\t !\"#$%&'()*+,/:;<=>?@[\\]^`{|}☺" => '%09%20%21%22%23$%25&%27%28%29%2A+%2C%2F:%3B%3C=%3E%3F@%5B%5C%5D%5E%60%7B%7C%7D%E2%98%BA',
           '精力善用' => '%E7%B2%BE%E5%8A%9B%E5%96%84%E7%94%A8'

data/spec/spec_helper.rb

@@ -13,8 +13,8 @@ RSpec.configure do |config|
   config.color = true
   config.tty = true
   config.formatter = :documentation
-  config.before(:each) { WebMock.disable_net_connect!(allow_localhost: true) }
-  config.after(:each) { WebMock.allow_net_connect! }
+  config.before { WebMock.disable_net_connect!(allow_localhost: true) }
+  config.after { WebMock.allow_net_connect! }
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkeley_library-util
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - David Moles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkeley_library-logging
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: bundle-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: ci_reporter_rspec
   requirement: !ruby/object:Gem::Requirement
@@ -142,42 +128,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.39'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.39'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +243,7 @@ files:
 - 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/.rubocop.yml
 - rakelib/coverage.rake
 - rakelib/gem.rake
 - rakelib/rubocop.rake
@@ -290,7 +262,8 @@ files:
 homepage: https://github.com/BerkeleyLibrary/util
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -310,15 +283,4 @@ rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Miscellaneous Ruby utilities for the UC Berkeley Library
-test_files:
-- spec/.rubocop.yml
-- spec/berkeley_library/util/arrays_spec.rb
-- spec/berkeley_library/util/files_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/requester_spec.rb
-- spec/berkeley_library/util/uris/validator_spec.rb
-- spec/berkeley_library/util/uris_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/rakelib/bundle.rake

@@ -1,8 +0,0 @@
-namespace :bundle do
-  desc 'Updates the ruby-advisory-db then runs bundle-audit'
-  task :audit do
-    require 'bundler/audit/cli'
-    Bundler::Audit::CLI.start ['update']
-    Bundler::Audit::CLI.start %w[check --ignore CVE-2015-9284]
-  end
-end