bolognese 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c9c9b6ae436d5c28cc42cf4d8016241d662f204513421100107336745aee23e
-  data.tar.gz: 651aae07a34751e4adf64939530641f42c6fb781741fbfab7284a92e079518f2
+  metadata.gz: 347b7bb3e8466ba382357816de4d0a07ef64424ec37244b98f12372c0d475ee8
+  data.tar.gz: a5cef69c662b4fa675951c37d175bde3ff4556252e0176309f2769cfb4544359
 SHA512:
-  metadata.gz: a68a022bf10284fd457cd4a0ac5a2f8189b9da5fb518997642c2c0e3589da1377cc8559fc39816bfb7a8754af4c1e7610038629e626579c4025c86bc1a636a02
-  data.tar.gz: 9bb5a682e638852461a0f7c87dfd5b75a634e80204047acaae50ae99c5e417bfd1fd07f704238e57bd626a309eab9d0ee177b94a205b45efc84b2804b3680423
+  metadata.gz: a49a0ddaf9749f22de36e8e3d941c664135c540d8815a4cbcefcbe64ebc4922b3ae138194c41df003dcdb194ea99c796dc726b339b27cbbae9d93fb880995a07
+  data.tar.gz: f1298514c8b8e175754502de187e067eb89da8692bce34cf8e76a17de9501275a9db465a47641538e6456317c4876a806996c5d4c17a271cc15b7e0a466b818d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.0.11)
+    bolognese (1.0.12)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)

data/lib/bolognese/readers/datacite_reader.rb

@@ -161,7 +161,7 @@ module Bolognese
                 "southBoundLatitude" => gl.dig("geoLocationBox", "southBoundLatitude"),
                 "northBoundLatitude" => gl.dig("geoLocationBox", "northBoundLatitude")
               }.compact.presence,
-              "geoLocationPlace" => gl["geoLocationPlace"],
+              "geoLocationPlace" => parse_attributes(gl["geoLocationPlace"], first: true).to_s.strip.presence
             }.compact
           end
         end.compact
@@ -177,16 +177,16 @@ module Bolognese
           "creator" => get_authors(Array.wrap(meta.dig("creators", "creator"))),
           "contributor" => get_authors(Array.wrap(meta.dig("contributors", "contributor"))),
           "periodical" => periodical,
-          "publisher" => meta.fetch("publisher", nil).to_s.strip.presence,
+          "publisher" => parse_attributes(meta.fetch("publisher", nil), first: true).to_s.strip.presence,
           "source" => "DataCite",
           "funding_references" => funding_references,
           "dates" => dates,
-          "publication_year" => meta.fetch("publicationYear", nil).to_s.presence,
+          "publication_year" => parse_attributes(meta.fetch("publicationYear", nil), first: true).to_s.strip.presence,
           "descriptions" => descriptions,
           "rights_list" => rights_list,
           "version" => meta.fetch("version", nil).to_s.presence,
           "subjects" => subjects,
-          "language" => meta.fetch("language", nil).to_s.presence,
+          "language" => parse_attributes(meta.fetch("language", nil), first: true).to_s.strip.presence,
           "geo_locations" => geo_locations,
           "related_identifiers" => related_identifiers,
           "formats" => formats,

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

data/spec/fixtures/datacite-xml-lang.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<resource
+    xmlns="http://datacite.org/schema/kernel-4"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4/metadata.xsd">
+    <identifier identifierType="DOI">10.15770/EUM_SAF_OSI_9999</identifier>
+    <creators>
+        <creator>
+            <creatorName>SAF on Ocean and Sea Ice</creatorName>
+        </creator>
+        <creator>
+            <creatorName>OSI SAF</creatorName>
+        </creator>
+    </creators>
+    <titles>
+        <title xml:lang="en">DOI Test 2 title content</title>
+        <title xml:lang="en">AAPP</title>
+    </titles>
+    <publisher>OSI SAF</publisher>
+    <publicationYear>2004</publicationYear>
+    <resourceType resourceTypeGeneral="Collection">Climate Data Record</resourceType>
+    <dates>
+        <date dateType="Created">2004-01-19</date>
+        <date dateType="Valid">2004-01-19/2015-12-31</date>
+    </dates>
+    <language>en</language>
+    <relatedIdentifiers>
+        <relatedIdentifier relatedIdentifierType="URL" relationType="HasMetadata" relatedMetadataScheme="http://schemas.opengis.net/iso/19139/20060504/gmd/gmd.xsd" schemeURI="http://schemas.opengis.net/csw/2.0.2/csw.xsd" schemeType="xsd">https://eumetsat.eggits.net/elastic-csw/download/EO:EUM:CM:MSG:DOI_TEST_2</relatedIdentifier>
+        <relatedIdentifier relatedIdentifierType="URL" relationType="IsDocumentedBy" schemeType="text/html">https://eumetsat.eggits.net/nextgen-pn/product/EO:EUM:CM:MSG:DOI_TEST_2</relatedIdentifier>
+    </relatedIdentifiers>
+    <rightsList>
+        <rights>copyright</rights>
+    </rightsList>
+    <descriptions>
+        <description descriptionType="Methods" xml:lang="en">This is the DOI TEST 2 product where this is the description field content.</description>
+    </descriptions>
+    <geoLocations>
+        <geoLocation>
+            <geoLocationBox>
+                <westBoundLongitude>-70.0</westBoundLongitude>
+                <eastBoundLongitude>70.0</eastBoundLongitude>
+                <southBoundLatitude>-70.0</southBoundLatitude>
+                <northBoundLatitude>70.0</northBoundLatitude>
+            </geoLocationBox>
+        </geoLocation>
+        <geoLocation>
+            <geoLocationPlace
+                xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Regional
+            </geoLocationPlace>
+        </geoLocation>
+    </geoLocations>
+</resource>

data/spec/readers/datacite_reader_spec.rb

@@ -180,9 +180,9 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + 'datacite-multiple-language.xml'
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.types["schemaOrg"]).to eq("Collection")
-      expect(subject.language).to eq("[\"de\", \"en\"]")
-      expect(subject.publisher).to eq("[\"Universitätsbibliothek Tübingen\", \"University Library Tübingen\"]")
-      expect(subject.publication_year).to eq("[\"2015\", \"2016\"]")
+      expect(subject.language).to eq("de")
+      expect(subject.publisher).to eq("Universitätsbibliothek Tübingen")
+      expect(subject.publication_year).to eq("2015")
       expect(subject.valid?).to be false
       expect(subject.errors).to eq("13:0: ERROR: Element '{http://datacite.org/schema/kernel-2.2}publisher': This element is not expected. Expected is ( {http://datacite.org/schema/kernel-2.2}publicationYear ).")
     end
@@ -195,6 +195,16 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.geo_locations).to eq([{"geoLocationPoint"=>{"pointLatitude"=>"-11.64583333", "pointLongitude"=>"-68.2975"}}])
     end
 
+    it "xml:lang attribute" do
+      input = fixture_path + 'datacite-xml-lang.xml'
+      subject = Bolognese::Metadata.new(input: input)
+      expect(subject.valid?).to be true
+      expect(subject.types["schemaOrg"]).to eq("Collection")
+      expect(subject.titles).to eq([{"lang"=>"en", "title"=>"DOI Test 2 title content"}, {"lang"=>"en", "title"=>"AAPP"}])
+      expect(subject.descriptions).to eq([{"description"=>"This is the DOI TEST 2 product where this is the description field content.", "descriptionType"=>"Methods", "lang"=>"en"}])
+      expect(subject.geo_locations).to eq([{"geoLocationBox"=>{"eastBoundLongitude"=>"70.0", "northBoundLatitude"=>"70.0", "southBoundLatitude"=>"-70.0", "westBoundLongitude"=>"-70.0"}}, {"geoLocationPlace"=>"Regional"}])
+    end
+
     it "schema 4.0" do
       input = fixture_path + 'schema_4.0.xml'
       subject = Bolognese::Metadata.new(input: input)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Martin Fenner
@@ -674,6 +674,7 @@ files:
 - spec/fixtures/datacite-geolocation-empty.xml
 - spec/fixtures/datacite-metadata-sample-complicated-v2.2.xml
 - spec/fixtures/datacite-multiple-language.xml
+- spec/fixtures/datacite-xml-lang.xml
 - spec/fixtures/datacite.json
 - spec/fixtures/datacite.xml
 - spec/fixtures/datacite_dataset.xml