bolognese 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23ccf372b59b7d9c8919ec7ad7137eef6e99512eed488977e847f938f389aa2f
-  data.tar.gz: 390e56023d57e637a52776a98dcd0bea4fa0acd8b8459ced05cbc6785f69fe0a
+  metadata.gz: a2147a3c32ec026e4c0ce722966ec41f3c0e01438327aaba531145783c6a05c5
+  data.tar.gz: 30784c9ba1c00c6a32b99776344acae20013825d2f83f47ccc6c90c787271131
 SHA512:
-  metadata.gz: 3a7364a75d69846ada1320bc0e8954b72695216d2807ec39ab1694ac4d120d97806addb9ceed8b9da8c1eb06ae28740cf6d2c118cb76a05e15ca993bf81ad470
-  data.tar.gz: 6281527f6b312d398a96b9f1df9be55de991f6ac939417131633b24ddaa24741c3b86c3b2e4e73408ca1350e0b17addf9439ae30dff998bc6dda07e8c4459db7
+  metadata.gz: 9e44e0aa498541fa0b906e4251748cd6efd8920f087fff13c46da45d31c863bf1dedcfe60808b9abf6e177610c55af95edb5b725ba07c9686c5c15535d55beec
+  data.tar.gz: d6895acf2c12a883160082a06d80256fd3c73c03b02b5675eb311aedd12a4dbfc975bd42daea9c43ad051577a3951954ee26ac5c40a31345c63349dd1331a9b5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (2.0.0)
+    bolognese (2.0.2)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -95,10 +95,10 @@ GEM
       concurrent-ruby (~> 1.0)
     iso8601 (0.9.1)
     json (2.6.2)
-    json-canonicalization (0.3.2)
-    json-ld (3.2.5)
+    json-canonicalization (0.3.1)
+    json-ld (3.2.4)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.3, >= 0.3.2)
+      json-canonicalization (~> 0.3)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (>= 2.2, < 4)
@@ -225,6 +225,7 @@ DEPENDENCIES
   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)
@@ -234,4 +235,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   2.4.20
+   2.4.10

data/bolognese.gemspec

@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
   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($/)

data/lib/bolognese/author_utils.rb

@@ -30,20 +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|
-        ni["__content__"] = ni["__content__"].strip
+        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

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

data/spec/fixtures/datacite_blank_name_identifier.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://datacite.org/schema/kernel-4" xsi:schemaLocation="http://schema.datacite.org/meta/kernel-4.3/metadata.xsd">
+  <identifier identifierType="DOI">10.15148/3b68dac4-7688-4fbb-ba64-5f9b3bbab954</identifier>
+  <creators>
+    <creator>
+      <creatorName>SNO KARST</creatorName>
+      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="https://orcid.org"/>
+    </creator>
+  </creators>
+  <publisher>OSU OREME</publisher>
+  <titles>
+    <title>Time series of type chemistry in Le Tarn basin - PARC NATIONAL CEVENNES observatory - KARST observatory network -  OZCAR Critical Zone network Research Infrastructure</title>
+  </titles>
+  <publicationYear>2023</publicationYear>
+  <contributors>
+    <contributor contributorType="ProjectMember">
+      <contributorName>Manche, Yannick</contributorName>
+      <nameIdentifier schemeURI="http://orcid.org/" nameIdentifierScheme="ORCID"></nameIdentifier>
+    </contributor>
+  </contributors>
+  <resourceType resourceTypeGeneral="Dataset">Dataset</resourceType>
+</resource>

data/spec/readers/datacite_reader_spec.rb

@@ -1759,4 +1759,46 @@ describe Bolognese::Metadata, vcr: true do
       )
     end
   end
+
+  it "blank nameIdentifier" do
+    input = fixture_path + "datacite_blank_name_identifier.xml"
+    subject = Bolognese::Metadata.new(input: input)
+    expect(subject.creators).to eq(
+      [
+        {
+          "nameType" => "Personal",
+          "name" => "KARST, SNO",
+          "givenName" => "SNO",
+          "familyName" => "KARST",
+          "nameIdentifiers" =>
+            [
+              {
+                "schemeUri" => "https://orcid.org",
+                "nameIdentifierScheme" => "ORCID"
+              }
+            ],
+          "affiliation" => []
+        }
+      ]
+    )
+    expect(subject.contributors).to eq(
+      [
+        {
+          "nameType" => "Personal",
+          "name" => "Manche, Yannick",
+          "givenName" => "Yannick",
+          "familyName" => "Manche",
+          "nameIdentifiers" =>
+            [
+              {
+                "schemeUri" => "https://orcid.org",
+                "nameIdentifierScheme" => "ORCID"
+              }
+            ],
+          "affiliation" => [],
+          "contributorType" => "ProjectMember"
+        }
+      ]
+    )
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -556,6 +556,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json-canonicalization
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: Ruby gem and command-line utility for conversion of DOI metadata from
   and to different metadata formats, including schema.org.
 email: mfenner@datacite.org
@@ -814,6 +828,7 @@ files:
 - spec/fixtures/datacite-xml-lang.xml
 - spec/fixtures/datacite.json
 - spec/fixtures/datacite.xml
+- spec/fixtures/datacite_blank_name_identifier.xml
 - spec/fixtures/datacite_dataset.xml
 - spec/fixtures/datacite_malformed_creator.xml
 - spec/fixtures/datacite_missing_creator.xml