bolognese 1.9.11 → 1.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 849fb87ec530a7e1ec773da483f9c1c02e77f121452631484df813c29c3e15c1
-  data.tar.gz: 4bae2258180b888f2c730222b997b66ad9824019bddaddd99dbee4980539eb1c
+  metadata.gz: 809d529a1ec99aa9653b7532586134862f896e46338e33fd97ea54da86dd0ed1
+  data.tar.gz: 85532735a718977631655c991d2c545a9974e091e5d656ab389b953b6d608165
 SHA512:
-  metadata.gz: '00679fba333bc077b0c4f9562b017eccdd07e365f340d4f1c90da0e34049ad89a87d299fa0193a224282cdb594aa5113ab13e0f54aa794f195f33352487811e5'
-  data.tar.gz: f088ff9511beff4b6eb4f654923af62d4b3b47be8253314a05218b5e5453798b266035927d7350049deb5d5c85673fc79886c9faeb6dd9a540697711adc14b18
+  metadata.gz: 013f57c1d908072881e9736c29e2e623cc0b311789450a20abeb0930f2dd754a9c09cf5b69cca8647b5561ace43dec33ffe6623424f5c1e79eb5f59defc74edc
+  data.tar.gz: 22e534387e3a579ded5f1d4da6fa46193e44169c5df2c6eb2a8a7f7fd3ba1218ecd59f74e540be67125a1dc6ab49cbf817dbaca430d26c3d3c06e2507fe127e1

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [1.9.11](https://github.com/datacite/bolognese/tree/1.9.11) (2021-08-04)
+## [1.9.11](https://github.com/datacite/bolognese/tree/1.9.11) (2021-08-17)
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/1.9.10...1.9.11)
 
@@ -291,7 +291,6 @@
 
 - Map Fields of Research classification to OECD Fields of Science [\#93](https://github.com/datacite/bolognese/pull/93) ([mfenner](https://github.com/mfenner))
 - Don't try and normalise "Other" funder types. [\#91](https://github.com/datacite/bolognese/pull/91) ([richardhallett](https://github.com/richardhallett))
-- fixes missing version attribute when data comes from datacite\_json [\#85](https://github.com/datacite/bolognese/pull/85) ([kjgarza](https://github.com/kjgarza))
 
 ## [1.6](https://github.com/datacite/bolognese/tree/1.6) (2020-05-16)
 
@@ -321,6 +320,10 @@
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/1.5.17...1.5.18)
 
+**Merged pull requests:**
+
+- fixes missing version attribute when data comes from datacite\_json [\#85](https://github.com/datacite/bolognese/pull/85) ([kjgarza](https://github.com/kjgarza))
+
 ## [1.5.17](https://github.com/datacite/bolognese/tree/1.5.17) (2020-04-18)
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/1.5.16...1.5.17)
@@ -1353,6 +1356,10 @@
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.64...v.0.9.65)
 
+**Closed issues:**
+
+- inconsistent name parsing in JSON-LD conversion [\#16](https://github.com/datacite/bolognese/issues/16)
+
 **Merged pull requests:**
 
 - \[\#28\] Removing multi author support from parsing single author fields. [\#19](https://github.com/datacite/bolognese/pull/19) ([richardhallett](https://github.com/richardhallett))
@@ -1531,7 +1538,6 @@
 
 **Closed issues:**
 
-- inconsistent name parsing in JSON-LD conversion [\#16](https://github.com/datacite/bolognese/issues/16)
 - Fix error handling alternate names in ris writer [\#14](https://github.com/datacite/bolognese/issues/14)
 - Error displaying container-title [\#13](https://github.com/datacite/bolognese/issues/13)
 - Error parsing funding information [\#12](https://github.com/datacite/bolognese/issues/12)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.9.11)
+    bolognese (1.9.12)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -220,4 +220,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   2.2.25
+   2.2.26

data/lib/bolognese/readers/datacite_reader.rb

@@ -188,20 +188,24 @@ module Bolognese
         end
 
         related_items = Array.wrap(meta.dig("relatedItems", "relatedItem")).map do |ri|
+
           rii = ri["relatedItemIdentifier"]
-          if rii["relatedItemIdentifierType"] == "DOI"
-            rid = validate_doi(rii["__content__"].to_s.downcase)
-          else
-            rid = rii["__content__"]
-          end
+          relatedItemIdentifier = nil
+          if rii
+            if rii["relatedItemIdentifierType"] == "DOI"
+              rid = validate_doi(rii["__content__"].to_s.downcase)
+            else
+              rid = rii["__content__"]
+            end
 
-          relatedItemIdentifier = {
-            "relatedItemIdentifier" => rid,
-            "relatedItemIdentifierType" => rii["relatedItemIdentifierType"],
-            "relatedMetadataScheme" => rii["relatedMetadataScheme"],
-            "schemeURI" => rii["schemeURI"],
-            "schemeType" => rii["schemeType"]
-          }.compact
+            relatedItemIdentifier = {
+              "relatedItemIdentifier" => rid,
+              "relatedItemIdentifierType" => rii["relatedItemIdentifierType"],
+              "relatedMetadataScheme" => rii["relatedMetadataScheme"],
+              "schemeURI" => rii["schemeURI"],
+              "schemeType" => rii["schemeType"]
+            }.compact
+          end
 
           number = ri["number"]
           if number.is_a?(String)
@@ -212,7 +216,7 @@ module Bolognese
             numberType = ri.dig("number", "numberType")
           end
 
-          {
+          a = {
             "relationType" => ri["relationType"],
             "relatedItemType" => ri["relatedItemType"],
             "relatedItemIdentifier" => relatedItemIdentifier,

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.9.11"
+  VERSION = "1.9.12"
 end

data/spec/readers/datacite_reader_spec.rb

@@ -1482,6 +1482,47 @@ describe Bolognese::Metadata, vcr: true do
     )
   end
 
+
+  it "Schema 4.4 related items from string minus relatedIdentifier" do
+    input = fixture_path + "datacite-example-relateditems.xml"
+
+    # Remove relatedItemIdentifier from raw input
+    @doc = File.open(input) { |f| Nokogiri::XML(f) }
+    @doc.xpath("//xmlns:relatedItemIdentifier").each {|x| x.remove}
+
+    subject = Bolognese::Metadata.new(input: @doc.to_s)
+    expect(subject.valid?).to be true
+
+    expect(subject.related_items.last).to eq(
+      {
+        "relatedItemType"=>"Journal",
+        "relationType"=>"IsPublishedIn",
+        "creators" =>
+        [
+          {"nameType"=>"Personal", "name"=>"Smith, John", "givenName"=>"John", "familyName"=>"Smith"}
+        ],
+        "titles"=>
+        [
+          {"title"=>"Understanding the fictional John Smith"},
+          {"title"=>"A detailed look", "titleType"=>"Subtitle"}
+        ],
+        "volume"=>"776",
+        "issue"=>"1",
+        "number"=>"1",
+        "numberType"=>"Chapter",
+        "firstPage"=>"50",
+        "lastPage"=>"60",
+        "publisher"=>"Example Inc",
+        "publicationYear"=>"1776",
+        "edition"=>"1",
+        "contributors"=>
+        [
+          {"name"=>"Hallett, Richard", "givenName"=>"Richard", "familyName"=>"Hallett", "contributorType"=>"ProjectLeader"}
+        ]
+      }
+    )
+  end
+
   it "Schema 4.4 dissertation from string" do
     input = fixture_path + "datacite-example-dissertation-v4.4.xml"
     subject = Bolognese::Metadata.new(input: input)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.9.11
+  version: 1.9.12
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma