bolognese 1.9.18 → 2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a45d740ac30bb235316e61ad8650ae88bd789ca1bafcc09a004b1ac9bf76cc
-  data.tar.gz: 771f8867608f7b3984861f10ceecc0b48e8ac17763f1b936e1d9f79002e16f13
+  metadata.gz: 5490a2fbec4b0acaad6edf965cd5a7c27a9b9edc2e0f9c2e8bc1041e1f8701d8
+  data.tar.gz: d74808cfadf7fbc3469c56a248479d23526ad34d32af4e75bffb843846055bee
 SHA512:
-  metadata.gz: 1268a2e57636ec811b9004143c7092325e249050ffa4669119491e290604b5cc14c3e13983f2014196919b5bb97bb197e76c7620ced11dc34103e601b923ecb5
-  data.tar.gz: fc1a9df23987eb69d5797102fb537bcbe65a5f565d19413e7b018af8442effa295cbaf5efeba04450ac8ae017d8b017141f009694aabde102114bfccafcba5d1
+  metadata.gz: a7e9f5e56b9c1c5429bb32174b1392e46fb83208f07106f20ca56c86fe8f25847d7308cd490c897752b9812cabc934b0cac59b6f1d136340b50eb7635a24c37d
+  data.tar.gz: 34caaba62200f9e8c203f8e55d97acb3423e9f4d865c6726dc81aae3de2b15934cdef9cc26ae7dc6cf619baf63ee5cdbb5b6d5d6f50f307407fcb3c40a34765a

data/.github/workflows/build.yml

@@ -5,33 +5,5 @@ on:
     branches:
       - "master"
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    env:
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.6.x
-
-    - name: Build and test
-      run: |
-        gem install bundler
-        bundle install
-        bundle exec rspec
-
-    - name: Publish code coverage
-      uses: paambaati/codeclimate-action@v2.7.4
-      env:
-        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-
-    - name: Notify Slack
-      uses: adamkdean/simple-slack-notify@1.0.4
-      with:
-        channel: '#ops'
-        username: 'GitHub Actions'
-        color: 'good'
-        text: 'A new version of the bolognese gem has been built.'
-
+  ci:
+    uses: ./.github/workflows/ci.yml

data/.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: Run Tests
+on:
+  workflow_call:
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["3.0", "3.1", "3.2", "3.3"]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby ${{matrix.ruby}}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+        bundler-cache: true
+
+    - name: Run tests
+      run: |
+        bundle exec rspec

data/.github/workflows/pull-request.yml

@@ -5,17 +5,5 @@ on:
     branches:
       - master
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.6.x
-
-    - name: Install and test
-      run: |
-        gem install bundler
-        bundle install
-        bundle exec rspec
+  ci:
+    uses: ./.github/workflows/ci.yml

data/.github/workflows/release.yml

@@ -4,28 +4,21 @@ on:
   release:
     types: [published]
 jobs:
+  ci:
+    uses: ./.github/workflows/ci.yml
   build:
+    needs: ci
     runs-on: ubuntu-latest
-    env:
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 3.1.4
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
+        ruby-version: "3.1.4"
 
-    - name: Build and test
+    - name: Build
       run: |
-        gem install bundler
         bundle install
-        bundle exec rspec spec
-
-    - name: Code Climate Test Reporter
-      uses: aktions/codeclimate-test-reporter@v1
-      with:
-        codeclimate-test-reporter-id: ${{ secrets.CC_TEST_REPORTER_ID }}
-        command: after-build
 
     - name: Publish to RubyGems
       run: |
@@ -37,11 +30,3 @@ jobs:
         gem push *.gem
       env:
         GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
-
-    - name: Notify Slack
-      uses: adamkdean/simple-slack-notify@1.0.4
-      with:
-        channel: '#ops'
-        username: 'GitHub Actions'
-        color: 'good'
-        text: 'A new version of the bolognese gem has been released.'

data/CHANGELOG.md

@@ -1,20 +1,26 @@
 # Changelog
 
-## [Unreleased](https://github.com/datacite/bolognese/tree/HEAD)
+## [1.10.0](https://github.com/datacite/bolognese/tree/1.10.0) (2022-10-14)
 
-[Full Changelog](https://github.com/datacite/bolognese/compare/1.9.18...HEAD)
+[Full Changelog](https://github.com/datacite/bolognese/compare/1.9.18...1.10.0)
 
-**Fixed bugs:**
+**Merged pull requests:**
 
-- Fix related items handling to not include elements when they are blank [\#140](https://github.com/datacite/bolognese/issues/140)
-- Related Items error out if RelatedItemIdentifier is nil [\#139](https://github.com/datacite/bolognese/issues/139)
+- Add DFG-to-FOS mappings utility function [\#147](https://github.com/datacite/bolognese/pull/147) ([jrhoads](https://github.com/jrhoads))
+- Test against multiple versions of ruby \(2.6, 2.7, 3.0, and 3.1\) [\#141](https://github.com/datacite/bolognese/pull/141) ([jrhoads](https://github.com/jrhoads))
 
 ## [1.9.18](https://github.com/datacite/bolognese/tree/1.9.18) (2022-10-11)
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/1.9.17...1.9.18)
 
+**Fixed bugs:**
+
+- Fix related items handling to not include elements when they are blank [\#140](https://github.com/datacite/bolognese/issues/140)
+- Related Items error out if RelatedItemIdentifier is nil [\#139](https://github.com/datacite/bolognese/issues/139)
+
 **Merged pull requests:**
 
+- bump version number [\#145](https://github.com/datacite/bolognese/pull/145) ([digitaldogsbody](https://github.com/digitaldogsbody))
 - Fix relatedItems handling [\#144](https://github.com/datacite/bolognese/pull/144) ([digitaldogsbody](https://github.com/digitaldogsbody))
 - Fixes normalization behavior that omitted non-URL funding identifiers when reading from DataCite XML. Adds normalization for Crossref Funder ID and ROR funderIdentifierTypes. [\#143](https://github.com/datacite/bolognese/pull/143) ([codycooperross](https://github.com/codycooperross))
 - Including a schemeURI with a nameIdentifier that is a URL will concat… [\#137](https://github.com/datacite/bolognese/pull/137) ([codycooperross](https://github.com/codycooperross))
@@ -130,6 +136,10 @@
 
 - Singular geoLocationPolygons are wrapped in additional array [\#110](https://github.com/datacite/bolognese/issues/110)
 
+**Merged pull requests:**
+
+- Support returning single geoLocationPolygon [\#111](https://github.com/datacite/bolognese/pull/111) ([richardhallett](https://github.com/richardhallett))
+
 ## [1.9.3](https://github.com/datacite/bolognese/tree/1.9.3) (2021-03-26)
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/1.9.2...1.9.3)
@@ -159,7 +169,6 @@
 
 **Merged pull requests:**
 
-- Support returning single geoLocationPolygon [\#111](https://github.com/datacite/bolognese/pull/111) ([richardhallett](https://github.com/richardhallett))
 - Change detection for crosscite format [\#107](https://github.com/datacite/bolognese/pull/107) ([richardhallett](https://github.com/richardhallett))
 - Add support for multiple geolocation polygons [\#106](https://github.com/datacite/bolognese/pull/106) ([richardhallett](https://github.com/richardhallett))
 - Support schema 4 4 [\#105](https://github.com/datacite/bolognese/pull/105) ([richardhallett](https://github.com/richardhallett))
@@ -1380,15 +1389,15 @@
 
 ## [v.0.9.70](https://github.com/datacite/bolognese/tree/v.0.9.70) (2018-01-12)
 
-[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.6.69...v.0.9.70)
+[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.69...v.0.9.70)
 
-## [v.0.6.69](https://github.com/datacite/bolognese/tree/v.0.6.69) (2018-01-11)
+## [v.0.9.69](https://github.com/datacite/bolognese/tree/v.0.9.69) (2018-01-11)
 
-[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.69...v.0.6.69)
+[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.6.69...v.0.9.69)
 
-## [v.0.9.69](https://github.com/datacite/bolognese/tree/v.0.9.69) (2018-01-11)
+## [v.0.6.69](https://github.com/datacite/bolognese/tree/v.0.6.69) (2018-01-11)
 
-[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.68...v.0.9.69)
+[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.68...v.0.6.69)
 
 ## [v.0.9.68](https://github.com/datacite/bolognese/tree/v.0.9.68) (2018-01-11)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.9.18)
+    bolognese (2.3.9)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -11,15 +11,14 @@ PATH
       concurrent-ruby (~> 1.1, >= 1.1.5)
       csl-styles (~> 1.0, >= 1.0.1.10)
       edtf (~> 3.0, >= 3.0.4)
-      faraday (~> 0.17.3)
       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 (>= 4.9.4, < 5)
+      maremma (~> 5.0)
       namae (~> 1.0)
-      nokogiri (>= 1.13.2, < 1.14)
+      nokogiri (~> 1.16, >= 1.16.2)
       oj (~> 3.10)
       oj_mimic_json (~> 1.0, >= 1.0.1)
       postrank-uri (~> 1.0, >= 1.0.18)
@@ -30,26 +29,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    amazing_print (1.4.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     benchmark_methods (0.7)
     bibtex-ruby (6.0.0)
       latex-decode (~> 0.0)
     builder (3.2.4)
+    byebug (11.1.3)
     citeproc (1.0.10)
       namae (~> 1.0)
     citeproc-ruby (1.1.14)
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.6)
     colorize (0.8.1)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -60,22 +59,31 @@ GEM
       csl (~> 1.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    ebnf (2.3.1)
-      amazing_print (~> 1.4)
+    ebnf (2.3.3)
       htmlentities (~> 4.3)
       rdf (~> 3.2)
       scanf (~> 1.0)
       sxp (~> 1.2)
-      unicode-types (~> 1.7)
-    edtf (3.1.0)
+      unicode-types (~> 1.8)
+    edtf (3.1.1)
       activesupport (>= 3.0, < 8.0)
     excon (0.71.1)
-    faraday (0.17.5)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.7.6)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
     faraday-encoding (0.0.5)
       faraday
-    faraday_middleware (0.14.0)
-      faraday (>= 0.7.4, < 1.0)
+    faraday-excon (2.1.0)
+      excon (>= 0.27.4)
+      faraday (~> 2.0)
+    faraday-follow_redirects (0.3.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)
@@ -83,19 +91,19 @@ GEM
       tilt
     hashdiff (1.0.1)
     htmlentities (4.3.4)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     iso8601 (0.9.1)
     json (2.6.2)
-    json-canonicalization (0.3.0)
-    json-ld (3.2.3)
+    json-canonicalization (0.3.1)
+    json-ld (3.2.4)
       htmlentities (~> 4.3)
       json-canonicalization (~> 0.3)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
-      rack (~> 2.2)
-      rdf (~> 3.2, >= 3.2.9)
-    json-ld-preloaded (3.2.1)
+      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)
@@ -103,30 +111,33 @@ GEM
       optimist (~> 3)
     latex-decode (0.4.0)
     link_header (0.0.8)
-    loofah (2.19.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    maremma (4.9.8)
+      nokogiri (>= 1.12.0)
+    maremma (5.0.0)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.71.0)
-      faraday (~> 0.17.3)
-      faraday-encoding (~> 0.0.4)
-      faraday_middleware (~> 0.14.0)
-      nokogiri (>= 1.11.2, < 1.14.0)
+      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)
       oj_mimic_json (~> 1.0, >= 1.0.1)
     matrix (0.4.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mini_portile2 (2.8.5)
+    minitest (5.18.0)
     multi_json (1.15.0)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     namae (1.1.1)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.16.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.13.21)
+    oj (3.14.2)
     oj_mimic_json (1.0.1)
     optimist (3.0.1)
     postrank-uri (1.0.24)
@@ -135,22 +146,23 @@ GEM
       public_suffix (>= 2.0.0, < 2.1)
     public_suffix (2.0.5)
     racc (1.6.0)
-    rack (2.2.3.1)
+    rack (2.2.4)
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
     rake (12.3.3)
-    rdf (3.2.9)
+    rdf (3.2.11)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (3.2.1)
       rdf (~> 3.2)
-    rdf-rdfa (3.2.0)
-      haml (~> 5.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.0)
+    rdf-rdfxml (3.2.1)
+      haml (~> 5.2)
       htmlentities (~> 4.3)
       rdf (~> 3.2)
       rdf-rdfa (~> 3.2)
@@ -158,7 +170,7 @@ GEM
     rdf-turtle (3.2.1)
       ebnf (~> 2.3)
       rdf (~> 3.2)
-    rdf-vocab (3.2.2)
+    rdf-vocab (3.2.6)
       rdf (~> 3.2, >= 3.2.4)
     rdf-xsd (3.2.1)
       rdf (~> 3.2)
@@ -170,38 +182,40 @@ GEM
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.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)
     scanf (1.0.0)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sxp (1.2.2)
-      matrix
+    sxp (1.2.4)
+      matrix (~> 0.4)
       rdf (~> 3.2)
-    temple (0.8.2)
-    thor (1.2.1)
-    tilt (2.0.11)
-    tzinfo (2.0.5)
+    temple (0.10.2)
+    thor (1.2.2)
+    tilt (2.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.14.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.8)
+    zlib (2.1.1)
 
 PLATFORMS
   ruby
@@ -209,7 +223,9 @@ PLATFORMS
 DEPENDENCIES
   bolognese!
   bundler (>= 1.0)
+  byebug
   hashdiff (>= 1.0.0.beta1, < 2.0.0)
+  json-canonicalization (= 0.3.1)
   rack-test (~> 0)
   rake (~> 12.0)
   rspec (~> 3.4)
@@ -219,4 +235,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   2.3.23
+   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,12 +13,12 @@ Gem::Specification.new do |s|
   s.version       = Bolognese::VERSION
   s.extra_rdoc_files = ["README.md"]
   s.license       = 'MIT'
-  s.required_ruby_version = '~> 2.3'
+  s.required_ruby_version = ['>=3.0']
 
   # Declare dependencies here, rather than in the Gemfile
-  s.add_dependency 'maremma', '>= 4.9.4', '< 5'
-  s.add_dependency 'faraday', '~> 0.17.3'
-  s.add_dependency 'nokogiri', '>= 1.13.2', '< 1.14'
+  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'
@@ -49,9 +49,10 @@ Gem::Specification.new do |s|
   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_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

@@ -30,19 +30,20 @@ module Bolognese
       name_type = parse_attributes(author.fetch("creatorName", nil), content: "nameType", first: true) || parse_attributes(author.fetch("contributorName", nil), content: "nameType", first: true)
 
       name_identifiers = Array.wrap(author.fetch("nameIdentifier", nil)).map do |ni|
+        name_identifier = ni["__content__"].strip if ni["__content__"].present?
         if ni["nameIdentifierScheme"] == "ORCID"
           {
-            "nameIdentifier" => normalize_orcid(ni["__content__"]),
+            "nameIdentifier" => normalize_orcid(name_identifier),
             "schemeUri" => "https://orcid.org",
             "nameIdentifierScheme" => "ORCID" }.compact
         elsif ni["nameIdentifierScheme"] == "ROR"
           {
-            "nameIdentifier" => normalize_ror(ni["__content__"]),
+            "nameIdentifier" => normalize_ror(name_identifier),
             "schemeUri" => "https://ror.org",
             "nameIdentifierScheme" => "ROR" }.compact
         else
           {
-            "nameIdentifier" => ni["__content__"],
+            "nameIdentifier" => name_identifier,
             "schemeUri" => ni.fetch("schemeURI", nil),
             "nameIdentifierScheme" => ni["nameIdentifierScheme"] }.compact
         end
@@ -99,7 +100,7 @@ module Bolognese
 
       # titleize strings
       # remove non-standard space characters
-      author.my_titleize.gsub(/[[:space:]]/, ' ')
+      author.gsub(/[[:space:]]/, ' ')
     end
 
     def is_personal_name?(author)
@@ -144,16 +145,28 @@ module Bolognese
           affiliation_identifier_scheme = nil
           scheme_uri = nil
         else
+          scheme_uri = a["schemeURI"]
           if a["affiliationIdentifier"].present?
             affiliation_identifier = a["affiliationIdentifier"]
             if a["schemeURI"].present?
               schemeURI = a["schemeURI"].end_with?("/") ? a["schemeURI"] : a["schemeURI"] + "/"
             end
             affiliation_identifier = !affiliation_identifier.to_s.start_with?("https://") && schemeURI.present? ? normalize_id(schemeURI + affiliation_identifier) : normalize_id(affiliation_identifier)
+            # The normalize_id(affiliation_identifier) method currently discards affiliation identifiers that don't start with a URL, 
+            # for example: affiliation_identifier = "05bp8ka05".
+            # To address this issue, we are introducing the following change to handle such affiliation identifiers.
+            # 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"]
+              end
+            end
           end
           name = a["__content__"].to_s.squish.presence
           affiliation_identifier_scheme = a["affiliationIdentifierScheme"]
-          scheme_uri = a["SchemeURI"]
         end
 
         { "name" => name,

data/lib/bolognese/datacite_utils.rb

@@ -69,7 +69,7 @@ module Bolognese
 
       xml.contributors do
         Array.wrap(contributors).each do |con|
-          xml.contributor("contributorType" => con["contributorType"] || "Other") do
+          xml.contributor("contributorType" => con["contributorType"]) do
             insert_person(xml, con, "contributor")
           end
         end
@@ -106,9 +106,19 @@ module Bolognese
         end
       end
     end
-
+    
     def insert_publisher(xml)
-      xml.publisher(publisher || container && container["title"])
+      if publisher.is_a?(Hash)
+        attributes = {
+          'publisherIdentifier' => publisher["publisherIdentifier"],
+          'publisherIdentifierScheme' => publisher["publisherIdentifierScheme"],
+          'schemeURI' => publisher["schemeUri"],
+          "xml:lang" => publisher["lang"]
+        }.compact
+        xml.publisher(publisher["name"] || container && container["title"], attributes)
+      else
+        xml.publisher(publisher || container && container["title"])
+      end
     end
 
     def insert_publication_year(xml)
@@ -118,7 +128,7 @@ module Bolognese
     def insert_resource_type(xml)
       return xml unless types.is_a?(Hash) && (types["schemaOrg"].present? || types["resourceTypeGeneral"])
 
-      xml.resourceType(types["resourceType"] || types["schemaOrg"],
+      xml.resourceType(types["resourceType"],
         'resourceTypeGeneral' => types["resourceTypeGeneral"] || Metadata::SO_TO_DC_TRANSLATIONS[types["schemaOrg"]] || "Other")
     end
 
@@ -171,7 +181,7 @@ module Bolognese
             s["subject"] = subject
           end
 
-          attributes = { "subjectScheme" => s["subjectScheme"], "schemeURI" => s["schemeUri"], "valueURI" => s["valueUri"], "xml:lang" => s["lang"] }.compact
+          attributes = { "subjectScheme" => s["subjectScheme"], "schemeURI" => s["schemeUri"], "valueURI" => s["valueUri"], "classificationCode" => s["classificationCode"], "xml:lang" => s["lang"] }.compact
 
           xml.subject(s["subject"], attributes)
         end
@@ -375,13 +385,18 @@ module Bolognese
               end
             end
             if geo_location["geoLocationPolygon"]
-              geo_location["geoLocationPolygon"].each do |geo_location_polygon|
-                xml.geoLocationPolygon do
-                  geo_location_polygon.each do |polygon_point|
+              xml.geoLocationPolygon do
+                Array.wrap(geo_location["geoLocationPolygon"]).each do |polygon_point|
+                  if polygon_point.has_key?("polygonPoint")
                     xml.polygonPoint do
                       xml.pointLatitude(polygon_point.dig("polygonPoint", "pointLatitude"))
                       xml.pointLongitude(polygon_point.dig("polygonPoint", "pointLongitude"))
                     end
+                  else
+                    xml.inPolygonPoint do
+                      xml.pointLatitude(polygon_point.dig("inPolygonPoint", "pointLatitude"))
+                      xml.pointLongitude(polygon_point.dig("inPolygonPoint", "pointLongitude"))
+                    end
                   end
                 end
               end