Upgrade: Ruby 3.1 → 4.0

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.1", "3.2", "3.3"]
+        ruby: ["3.2", "3.3", "3.4", "4.0"]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.2.9"
+        ruby-version: "4.0.1"
 
     - name: Build
       run: |

Gemfile.lock

@@ -1,72 +1,74 @@
 PATH
   remote: .
   specs:
-    bolognese (2.5.2)
-      activesupport (= 7.2.3)
-      benchmark_methods (~> 0.7)
+    bolognese (2.6.0)
+      activesupport (~> 8.1, >= 8.1.2)
       bibtex-ruby (>= 5.1.0)
       builder (~> 3.2, >= 3.2.2)
-      citeproc-ruby (~> 1.1, >= 1.1.12)
+      citeproc-ruby (~> 2.1, >= 2.1.8)
       colorize (~> 0.8.1)
-      concurrent-ruby (~> 1.1, >= 1.1.5)
-      csl-styles (~> 1.0, >= 1.0.1.10)
+      concurrent-ruby (~> 1.3, >= 1.3.6)
+      csl-styles (~> 2.0, >= 2.0.2)
+      csv (~> 3.3, >= 3.3.5)
       edtf (~> 3.0, >= 3.0.4)
       gender_detector (~> 0.1.2)
       iso8601 (~> 0.9.1)
       json-ld-preloaded (~> 3.1, >= 3.1.3)
       jsonlint (~> 0.3.0)
       loofah (~> 2.0, >= 2.0.3)
-      maremma (~> 5.0)
+      maremma (~> 6.0)
       namae (~> 1.0)
       nokogiri (~> 1.16, >= 1.16.2)
       oj (~> 3.10)
       oj_mimic_json (~> 1.0, >= 1.0.1)
-      postrank-uri (~> 1.0, >= 1.0.18)
       rdf-rdfxml (~> 3.1)
       rdf-turtle (~> 3.1)
       thor (>= 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.3)
+    activesupport (8.1.2)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+      uri (>= 0.13.1)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
     base64 (0.3.0)
-    benchmark (0.5.0)
-    benchmark_methods (0.7)
     bibtex-ruby (6.0.0)
       latex-decode (~> 0.0)
     bigdecimal (3.3.1)
     builder (3.2.4)
     byebug (11.1.3)
     citeproc (1.0.10)
       namae (~> 1.0)
-    citeproc-ruby (1.1.14)
+    citeproc-ruby (2.1.8)
       citeproc (~> 1.0, >= 1.0.9)
-      csl (~> 1.6)
+      csl (~> 2.0)
+      observer (< 1.0)
     colorize (0.8.1)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.6)
     connection_pool (2.5.5)
-    crack (0.4.5)
+    crack (1.0.1)
+      bigdecimal
       rexml
     crass (1.0.6)
-    csl (1.6.0)
+    csl (2.0.0)
       namae (~> 1.0)
       rexml
-    csl-styles (1.0.1.11)
-      csl (~> 1.0)
+    csl-styles (2.0.2)
+      csl (~> 2.0)
+    csv (3.3.5)
+    date (3.5.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
     drb (2.2.3)
@@ -76,25 +78,29 @@ GEM
       scanf (~> 1.0)
       sxp (~> 1.2)
       unicode-types (~> 1.8)
-    edtf (3.1.1)
-      activesupport (>= 3.0, < 8.0)
-    excon (0.71.1)
-    faraday (2.7.6)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-encoding (0.0.5)
+    edtf (3.2.0)
+      activesupport (>= 3.0, < 9.0)
+    erb (6.0.2)
+    excon (1.4.0)
+      logger
+    faraday (2.14.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-encoding (0.0.6)
       faraday
-    faraday-excon (2.1.0)
-      excon (>= 0.27.4)
-      faraday (~> 2.0)
-    faraday-follow_redirects (0.3.0)
+    faraday-excon (2.4.0)
+      excon (>= 1.0.0)
+      faraday (>= 2.11.0, < 3)
+    faraday-follow_redirects (0.5.0)
       faraday (>= 1, < 3)
-    faraday-gzip (0.1.0)
-      faraday (>= 1.0)
-      zlib (~> 2.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (3.0.2)
+    faraday-gzip (3.1.0)
+      faraday (>= 2.0, < 3)
+      zlib (~> 3.0)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
     haml (5.2.2)
@@ -104,6 +110,12 @@ GEM
     htmlentities (4.3.4)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    io-console (0.8.2)
+    irb (1.17.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
     iso8601 (0.9.1)
     json (2.6.2)
     json-canonicalization (0.3.1)
@@ -126,37 +138,48 @@ GEM
     loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    maremma (5.0.0)
-      activesupport (>= 4.2.5)
-      addressable (>= 2.3.6)
+    maremma (6.0.0)
+      activesupport (~> 8.1, >= 8.1.2)
+      addressable (~> 2.8, >= 2.8.9)
       builder (~> 3.2, >= 3.2.2)
-      excon (~> 0.71.0)
+      excon (~> 1.3, >= 1.3.2)
       faraday (>= 2.0)
-      faraday-encoding (~> 0.0.5)
-      faraday-excon (~> 2.1.0)
-      faraday-follow_redirects (~> 0.3.0)
-      faraday-gzip (~> 0.1.0)
-      faraday-multipart (~> 1.0.4)
-      nokogiri (~> 1.16, >= 1.16.2)
-      oj (>= 2.8.3)
+      faraday-encoding (~> 0.0.6)
+      faraday-excon (~> 2.4.0)
+      faraday-follow_redirects (~> 0.5.0)
+      faraday-gzip (~> 3.1.0)
+      faraday-multipart (~> 1.2.0)
+      nokogiri (~> 1.19, >= 1.19.1)
+      oj (~> 3.16, >= 3.16.15)
       oj_mimic_json (~> 1.0, >= 1.0.1)
     matrix (0.4.2)
     mini_portile2 (2.8.5)
-    minitest (5.18.0)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.1)
     namae (1.1.1)
-    nokogiri (1.16.2)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    nokogiri (1.19.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.14.2)
+    observer (0.1.2)
+    oj (3.16.15)
+      bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
     oj_mimic_json (1.0.1)
     optimist (3.0.1)
-    postrank-uri (1.0.24)
-      addressable (>= 2.4.0)
-      nokogiri (>= 1.8.0)
-      public_suffix (>= 2.0.0, < 2.1)
-    public_suffix (2.0.5)
+    ostruct (0.6.3)
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    psych (5.3.1)
+      date
+      stringio
+    public_suffix (4.0.7)
     racc (1.6.0)
     rack (2.2.4)
     rack-test (0.8.3)
@@ -187,6 +210,12 @@ GEM
     rdf-xsd (3.2.1)
       rdf (~> 3.2)
       rexml (~> 3.2)
+    rdoc (7.2.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    reline (0.6.3)
+      io-console (~> 0.5)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -204,30 +233,32 @@ GEM
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
-    ruby2_keywords (0.0.5)
     scanf (1.0.0)
     securerandom (0.4.1)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    stringio (3.2.0)
     sxp (1.2.4)
       matrix (~> 0.4)
       rdf (~> 3.2)
     temple (0.10.2)
     thor (1.2.2)
     tilt (2.2.0)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-types (1.8.0)
     unicode_utils (1.4.0)
-    vcr (3.0.3)
-    webmock (3.18.1)
+    uri (1.1.1)
+    vcr (6.4.0)
+    webmock (3.26.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zlib (2.1.1)
+    zlib (3.2.2)
 
 PLATFORMS
   ruby
@@ -236,15 +267,14 @@ DEPENDENCIES
   bolognese!
   bundler (>= 1.0)
   byebug
-  hashdiff (>= 1.0.0.beta1, < 2.0.0)
-  json-canonicalization (= 0.3.1)
+  irb
   rack-test (~> 0)
   rake (~> 12.0)
   rspec (~> 3.4)
   rspec-xsd (~> 0.1.0)
   simplecov (= 0.17.1)
-  vcr (~> 3.0, >= 3.0.3)
-  webmock (~> 3.0, >= 3.0.1)
+  vcr (~> 6.4)
+  webmock (~> 3.26, >= 3.26.1)
 
 BUNDLED WITH
    2.5.5

bolognese.gemspec

@@ -13,43 +13,41 @@ Gem::Specification.new do |s|
   s.version       = Bolognese::VERSION
   s.extra_rdoc_files = ["README.md"]
   s.license       = 'MIT'
-  s.required_ruby_version = ['>= 3.1', '<= 3.3.10']
+  s.required_ruby_version = ['>= 3.2', '< 4.1']
 
   # Declare dependencies here, rather than in the Gemfile
-  s.add_dependency 'maremma', '~> 5.0'
+  s.add_dependency 'maremma', '~> 6.0'
   s.add_dependency 'nokogiri', '~> 1.16', '>= 1.16.2'
   s.add_dependency 'loofah', '~> 2.0', '>= 2.0.3'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
-  s.add_dependency 'activesupport', '7.2.3'
+  s.add_dependency 'activesupport', "~> 8.1", ">= 8.1.2"
   s.add_dependency 'bibtex-ruby', '>= 5.1.0'
   s.add_dependency 'thor', '>= 0.19'
   s.add_dependency 'colorize', '~> 0.8.1'
   s.add_dependency 'namae', '~> 1.0'
   s.add_dependency 'edtf', '~> 3.0', '>= 3.0.4'
-  s.add_dependency 'citeproc-ruby', '~> 1.1', '>= 1.1.12'
-  s.add_dependency 'csl-styles', '~> 1.0', '>= 1.0.1.10'
+  s.add_dependency 'citeproc-ruby', '~> 2.1', '>= 2.1.8'
+  s.add_dependency 'csl-styles', '~> 2.0', '>= 2.0.2'
   s.add_dependency 'iso8601', '~> 0.9.1'
-  s.add_dependency 'postrank-uri', '~> 1.0', '>= 1.0.18'
   s.add_dependency 'json-ld-preloaded', '~> 3.1', '>= 3.1.3'
   s.add_dependency 'jsonlint', '~> 0.3.0'
   s.add_dependency 'oj', '~> 3.10'
   s.add_dependency "oj_mimic_json", "~> 1.0", ">= 1.0.1"
   s.add_dependency 'rdf-turtle', '~> 3.1'
   s.add_dependency 'rdf-rdfxml', '~> 3.1'
-  s.add_dependency 'benchmark_methods', '~> 0.7'
   s.add_dependency 'gender_detector', '~> 0.1.2'
-  s.add_dependency 'concurrent-ruby', '~> 1.1', '>= 1.1.5'
+  s.add_dependency 'concurrent-ruby', '~> 1.3', '>= 1.3.6'
+  s.add_dependency 'csv', '~> 3.3', '>= 3.3.5'
   s.add_development_dependency 'bundler', '>= 1.0'
+  s.add_development_dependency 'irb'
   s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'rspec-xsd', '~> 0.1.0'
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rack-test', '~> 0'
-  s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
-  s.add_development_dependency 'webmock', '~> 3.0', '>= 3.0.1'
+  s.add_development_dependency 'vcr', '~> 6.4'
+  s.add_development_dependency 'webmock', '~> 3.26', '>= 3.26.1'
   s.add_development_dependency 'simplecov', '0.17.1'
-  s.add_development_dependency 'hashdiff', ['>= 1.0.0.beta1', '< 2.0.0']
   s.add_development_dependency 'byebug'
-  s.add_development_dependency 'json-canonicalization', '0.3.1'
 
   s.require_paths = ["lib"]
   s.files = `git ls-files`.split($/).reject { |f| f.match(%r{^(test|spec|features)/}) }

lib/bolognese.rb

@@ -3,7 +3,6 @@
 require 'active_support/all'
 require 'nokogiri'
 require 'maremma'
-require 'postrank-uri'
 require 'bibtex'
 require 'colorize'
 require 'loofah'
@@ -13,9 +12,7 @@
 require 'logger'
 require 'iso8601'
 require 'jsonlint'
-require 'benchmark_methods'
 require 'gender_detector'
-require 'citeproc/ruby'
 require 'citeproc'
 require 'csl/styles'
 require 'edtf'

lib/bolognese/author_utils.rb

@@ -4,9 +4,6 @@
 
 module Bolognese
   module AuthorUtils
-    # include BenchmarkMethods
-    #
-    # benchmark :get_authors
 
     IDENTIFIER_SCHEME_URIS = {
       "ORCID" => "https://orcid.org/"