bolognese 2.3.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b12df51d1fcae47a692ca1bfa34c41f37837d48b6b341fb4669bd10cf545df
-  data.tar.gz: b2052486460de2fd1769d084116f3968430b532d08eb2e6a29608c8442553445
+  metadata.gz: 835ab3fe44434e73ae854befe4f6acb61ea005c5fdd95833103c7a692b19378c
+  data.tar.gz: 5b5085360ceae14323ae37e82d517dade2e87cc0c8b631a2a1dd8ea95eb5e7be
 SHA512:
-  metadata.gz: 3f08a7a5c7880372702b122bdf588dc1dd1c84512158961438fd8041eda547694188a6bbcc3f52c4e2234353bd07cc0506176483bb31084770f35583b9293c7c
-  data.tar.gz: 1ddf1ba488957f079c9889e4c2da169714de4fd17ce785eb882d5c76ac9b7a8e6279f8614d6ee04e96d911be0107794ea900acc05c2079afdbee63e3e3d2db0c
+  metadata.gz: 50d00d40e262c6175bee47c5443f8673dc2af21dce0bd97ee6e31abe62d0631073aa89bac32cd78610706e04662d6501aa1f4059466d2ba1f574353dc832de82
+  data.tar.gz: faa9c4ee7e4c5f1f9c4cd36139701dac10d6a4ec5f4a2bb13213618fff45bb32f14e7aebdee6d27cd27eac8524b731964d953ff45d3f95007e9f98abc3fbf39f

data/.github/workflows/ci.yml

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

data/.github/workflows/release.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Ruby 3.1.4
+    - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.1.4"
+        ruby-version: "4.0.1"
 
     - name: Build
       run: |

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec  

data/Gemfile.lock

@@ -1,238 +1,270 @@
 PATH
   remote: .
   specs:
-    bolognese (2.3.2)
-      activesupport (>= 4.2.5)
-      benchmark_methods (~> 0.7)
-      bibtex-ruby (>= 5.1.0)
-      builder (~> 3.2, >= 3.2.2)
-      citeproc-ruby (~> 1.1, >= 1.1.12)
-      colorize (~> 0.8.1)
-      concurrent-ruby (~> 1.1, >= 1.1.5)
-      csl-styles (~> 1.0, >= 1.0.1.10)
-      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)
-      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)
+    bolognese (2.7.0)
+      activesupport (~> 8.1, >= 8.1.2)
+      bibtex-ruby (~> 6.2)
+      builder (~> 3.3)
+      citeproc-ruby (~> 2.1, >= 2.1.8)
+      concurrent-ruby (~> 1.3, >= 1.3.6)
+      csl-styles (~> 2.0, >= 2.0.2)
+      csv (~> 3.3, >= 3.3.5)
+      edtf (~> 3.2)
+      gender_detector (~> 2.1)
+      iso8601 (~> 0.13.0)
+      json-ld-preloaded (~> 3.3, >= 3.3.2)
+      jsonlint (~> 0.4.0)
+      loofah (~> 2.25)
+      maremma (~> 6.0)
+      namae (~> 1.2)
+      nokogiri (~> 1.19, >= 1.19.1)
+      oj (~> 3.16, >= 3.16.15)
+      rdf-rdfxml (~> 3.3)
+      rdf-turtle (~> 3.3, >= 3.3.1)
+      thor (~> 1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.1.2)
+      base64
+      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)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
-    benchmark_methods (0.7)
-    bibtex-ruby (6.0.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
+    base64 (0.3.0)
+    bcp47_spec (0.2.1)
+    bibtex-ruby (6.2.0)
       latex-decode (~> 0.0)
-    builder (3.2.4)
+      logger (~> 1.7)
+      racc (~> 1.7)
+    bigdecimal (3.3.1)
+    builder (3.3.0)
     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)
-    colorize (0.8.1)
-    concurrent-ruby (1.2.2)
-    crack (0.4.5)
+      csl (~> 2.0)
+      observer (< 1.0)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.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)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    ebnf (2.3.3)
+    csl-styles (2.0.2)
+      csl (~> 2.0)
+    csv (3.3.5)
+    date (3.5.1)
+    diff-lcs (1.6.2)
+    docile (1.4.1)
+    drb (2.2.3)
+    ebnf (2.6.0)
+      base64 (~> 0.2)
       htmlentities (~> 4.3)
-      rdf (~> 3.2)
+      rdf (~> 3.3)
       scanf (~> 1.0)
-      sxp (~> 1.2)
+      sxp (~> 2.0)
       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)
-    gender_detector (0.1.2)
-      unicode_utils (>= 1.3.0)
-    haml (5.2.2)
-      temple (>= 0.8.0)
-      tilt
+    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 (2.1.0)
     hashdiff (1.0.1)
     htmlentities (4.3.4)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    iso8601 (0.9.1)
+    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.13.0)
     json (2.6.2)
-    json-canonicalization (0.3.1)
-    json-ld (3.2.4)
+    json-canonicalization (1.0.0)
+    json-ld (3.3.2)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.3)
+      json-canonicalization (~> 1.0)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (>= 2.2, < 4)
-      rdf (~> 3.2, >= 3.2.10)
-    json-ld-preloaded (3.2.2)
-      json-ld (~> 3.2)
-      rdf (~> 3.2)
-    jsonlint (0.3.0)
+      rdf (~> 3.3)
+      rexml (~> 3.2)
+    json-ld-preloaded (3.3.2)
+      json-ld (~> 3.3)
+      rdf (~> 3.3)
+    jsonlint (0.4.0)
       oj (~> 3)
       optimist (~> 3)
     latex-decode (0.4.0)
     link_header (0.0.8)
-    loofah (2.21.3)
+    logger (1.7.0)
+    loofah (2.25.0)
       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)
-    namae (1.1.1)
-    nokogiri (1.16.2)
+    multipart-post (2.4.1)
+    namae (1.2.0)
+      racc (~> 1.7)
+    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)
-    racc (1.6.0)
+    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.8.1)
     rack (2.2.4)
-    rack-test (0.8.3)
-      rack (>= 1.0, < 3)
-    rake (12.3.3)
-    rdf (3.2.11)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rake (13.3.1)
+    rdf (3.3.4)
+      bcp47_spec (~> 0.2)
+      bigdecimal (~> 3.1, >= 3.1.5)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-aggregate-repo (3.2.1)
-      rdf (~> 3.2)
-    rdf-rdfa (3.2.2)
-      haml (>= 5.2, < 7)
-      htmlentities (~> 4.3)
-      rdf (~> 3.2)
-      rdf-aggregate-repo (~> 3.2)
-      rdf-vocab (~> 3.2)
-      rdf-xsd (~> 3.2)
-    rdf-rdfxml (3.2.1)
-      haml (~> 5.2)
+      logger (~> 1.5)
+      ostruct (~> 0.6)
+      readline (~> 0.0)
+    rdf-rdfxml (3.3.0)
+      builder (~> 3.2, >= 3.2.4)
       htmlentities (~> 4.3)
-      rdf (~> 3.2)
-      rdf-rdfa (~> 3.2)
-      rdf-xsd (~> 3.2)
-    rdf-turtle (3.2.1)
-      ebnf (~> 2.3)
-      rdf (~> 3.2)
-    rdf-vocab (3.2.6)
-      rdf (~> 3.2, >= 3.2.4)
-    rdf-xsd (3.2.1)
-      rdf (~> 3.2)
+      rdf (~> 3.3)
+      rdf-xsd (~> 3.3)
+    rdf-turtle (3.3.1)
+      base64 (~> 0.2)
+      bigdecimal (~> 3.1, >= 3.1.5)
+      ebnf (~> 2.5)
+      rdf (~> 3.3)
+    rdf-xsd (3.3.0)
+      rdf (~> 3.3)
       rexml (~> 3.2)
+    rdoc (7.2.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    readline (0.0.4)
+      reline
+    reline (0.6.3)
+      io-console (~> 0.5)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rspec-xsd (0.1.0)
-      nokogiri (~> 1.6)
-      rspec (~> 3)
-    ruby2_keywords (0.0.5)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
     scanf (1.0.0)
-    simplecov (0.17.1)
+    securerandom (0.4.1)
+    simplecov (0.22.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sxp (1.2.4)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.2)
+    simplecov_json_formatter (0.1.4)
+    stringio (3.2.0)
+    sxp (2.0.0)
       matrix (~> 0.4)
-      rdf (~> 3.2)
-    temple (0.10.2)
-    thor (1.2.2)
-    tilt (2.2.0)
+      rdf (~> 3.3)
+    thor (1.5.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)
-    zeitwerk (2.6.8)
-    zlib (2.1.1)
+    zlib (3.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bolognese!
-  bundler (>= 1.0)
+  bundler (>= 2.0)
   byebug
-  hashdiff (>= 1.0.0.beta1, < 2.0.0)
-  json-canonicalization (= 0.3.1)
-  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)
+  irb
+  rack-test (~> 2.2)
+  rake (~> 13.3, >= 13.3.1)
+  rspec (~> 3.13, >= 3.13.2)
+  simplecov (= 0.22.0)
+  vcr (~> 6.4)
+  webmock (~> 3.26, >= 3.26.1)
 
 BUNDLED WITH
    2.5.5

data/README.md

@@ -11,7 +11,7 @@ Ruby gem and command-line utility for conversion of DOI metadata from and to dif
 
 ## Features
 
-Bolognese reads and/or writes these metadata formats:
+Bolognese reads and/or writes these metadata formats: 
 
 <table class="table table-bordered table-striped">
   <thead>

data/bolognese.gemspec

@@ -13,47 +13,40 @@ Gem::Specification.new do |s|
   s.version       = Bolognese::VERSION
   s.extra_rdoc_files = ["README.md"]
   s.license       = 'MIT'
-  s.required_ruby_version = ['>=3.0']
+  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 'faraday', '~> 0.17.3'
-  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', '>= 4.2.5'
-  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 '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_development_dependency 'bundler', '>= 1.0'
-  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 'simplecov', '0.17.1'
-  s.add_development_dependency 'hashdiff', ['>= 1.0.0.beta1', '< 2.0.0']
+  s.add_dependency 'maremma', '~> 6.0'
+  s.add_dependency 'nokogiri', '~> 1.19', '>= 1.19.1'
+  s.add_dependency 'loofah', '~> 2.25'
+  s.add_dependency 'builder', '~> 3.3'
+  s.add_dependency 'activesupport', "~> 8.1", ">= 8.1.2"
+  s.add_dependency 'bibtex-ruby', '~> 6.2'
+  s.add_dependency 'thor', '~> 1.5'
+  s.add_dependency 'namae', '~> 1.2'
+  s.add_dependency 'edtf', '~> 3.2'
+  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.13.0'
+  s.add_dependency 'json-ld-preloaded', '~> 3.3', '>= 3.3.2'
+  s.add_dependency 'jsonlint', '~> 0.4.0'
+  s.add_dependency 'oj', '~> 3.16', '>= 3.16.15'
+  s.add_dependency 'rdf-turtle', '~> 3.3', '>= 3.3.1'
+  s.add_dependency 'rdf-rdfxml', '~> 3.3'
+  s.add_dependency 'gender_detector', '~> 2.1'
+  s.add_dependency 'concurrent-ruby', '~> 1.3', '>= 1.3.6'
+  s.add_dependency 'csv', '~> 3.3', '>= 3.3.5'
+  s.add_development_dependency 'bundler', '>= 2.0'
+  s.add_development_dependency 'irb'
+  s.add_development_dependency 'rspec', '~> 3.13', '>= 3.13.2'
+  s.add_development_dependency 'rake', '~> 13.3', '>= 13.3.1'
+  s.add_development_dependency 'rack-test', '~> 2.2'
+  s.add_development_dependency 'vcr', '~> 6.4'
+  s.add_development_dependency 'webmock', '~> 3.26', '>= 3.26.1'
+  s.add_development_dependency 'simplecov', '0.22.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($/)
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files = `git ls-files`.split($/).reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.executables = ["bolognese"]
 end

data/lib/bolognese/author_utils.rb

@@ -4,9 +4,6 @@ require 'namae'
 
 module Bolognese
   module AuthorUtils
-    # include BenchmarkMethods
-    #
-    # benchmark :get_authors
 
     IDENTIFIER_SCHEME_URIS = {
       "ORCID" => "https://orcid.org/"
@@ -24,7 +21,6 @@ module Bolognese
       given_name = parse_attributes(author.fetch("givenName", nil))
       family_name = parse_attributes(author.fetch("familyName", nil))
       name = cleanup_author(name)
-      name = [family_name, given_name].join(", ") if family_name.present? && given_name.present?
       contributor_type = parse_attributes(author.fetch("contributorType", nil))
 
       name_type = parse_attributes(author.fetch("creatorName", nil), content: "nameType", first: true) || parse_attributes(author.fetch("contributorName", nil), content: "nameType", first: true)
@@ -49,58 +45,21 @@ module Bolognese
         end
       end.presence
 
-      author = { "nameType" => name_type,
+      { "nameType" => name_type,
                  "name" => name,
                  "givenName" => given_name,
                  "familyName" => family_name,
                  "nameIdentifiers" => name_identifiers,
                  "affiliation" => get_affiliations(author.fetch("affiliation", nil)),
                  "contributorType" => contributor_type }.compact
-
-      return author if family_name.present?
-
-      if is_personal_name?(author)
-        Namae.options[:include_particle_in_family] = true
-        names = Namae.parse(name)
-        parsed_name = names.first
-
-        if parsed_name.present?
-          given_name = parsed_name.given
-          family_name = parsed_name.family
-          name = [family_name, given_name].join(", ")
-        else
-          given_name = nil
-          family_name = nil
-        end
-
-        { "nameType" => "Personal",
-          "name" => name,
-          "givenName" => given_name,
-          "familyName" => family_name,
-          "nameIdentifiers" => Array.wrap(name_identifiers),
-          "affiliation" => Array.wrap(author.fetch("affiliation", nil)),
-          "contributorType" => contributor_type }.compact
-      else
-        { "nameType" => name_type,
-          "name" => name,
-          "nameIdentifiers" => Array.wrap(name_identifiers),
-          "affiliation" => Array.wrap(author.fetch("affiliation", nil)),
-          "contributorType" => contributor_type }.compact
-      end
     end
 
     def cleanup_author(author)
       return nil unless author.present?
 
-      # detect pattern "Smith J.", but not "Smith, John K."
-      author = author.gsub(/[[:space:]]([A-Z]\.)?(-?[A-Z]\.)$/, ', \1\2') unless author.include?(",")
-
-      # remove spaces around hyphens
-      author = author.gsub(" - ", "-")
-
       # titleize strings
       # remove non-standard space characters
-      author.my_titleize.gsub(/[[:space:]]/, ' ')
+      author.gsub(/[[:space:]]/, ' ')
     end
 
     def is_personal_name?(author)
@@ -158,7 +117,6 @@ module Bolognese
             # when `normalize_id` method could not normalize, it returns nil, hence we have following condition
             if affiliation_identifier.nil?
               if a["affiliationIdentifierScheme"] == "ROR"
-                scheme_uri = "https://ror.org"
                 affiliation_identifier = normalize_ror(a["affiliationIdentifier"])
               else
                 affiliation_identifier = a["affiliationIdentifier"]