bolognese 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 532586fba70709be6c7581b595a2c0d72ad1000c9c54b951ad5e4758715e81c1
-  data.tar.gz: 3029c21ac460e41479459df642e3d501b1195e6cc8a0e26d6a4ba5bba91ce13f
+  metadata.gz: f87808df4f12983e33877e77b31bc8aee2e1fe6f0a7e888da3d7b67ce19ab87e
+  data.tar.gz: 5143917378eacceff49c3d0d6e5b71f634237d025a7dad867db79ae34ed737f5
 SHA512:
-  metadata.gz: 3893a351e49ad8e8acb0ef5265fb3acdc149e67a99174de0d0855d594e7d9c16f09baeda4d9b1aba7235aef661135e7d1bd1ac401df81601c99217e155153395
-  data.tar.gz: f6225b13dae84dcc897fa1dda7aadb266e667f8bf6a3a2da2e3f6ad134f314f17c3c6613ef8c2dec54091d9f4b4f055023bdb00ace39baf018b1654820cf7eff
+  metadata.gz: 351c69b0b3b528bdbe5c89ec27a6f503e461c5acfb9060894d6822045193eb8a93cbc51fd952da023e5fb7cf9a52e0b710d03c92fd27ece9fb95062da0feaf6f
+  data.tar.gz: bf72537500650c6a963ea792af54d7d1ac18410e0160e6dd9088bdd9033fe2049a871367d76bf7f892fba03c20b2b9df75e744efaf03cd973305d3b75fff1d87

data/CHANGELOG.md

@@ -7,6 +7,7 @@
 **Merged pull requests:**
 
 - 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)
 
@@ -64,6 +65,7 @@
 **Merged pull requests:**
 
 - update nokogiri to latest, including updating maremma [\#130](https://github.com/datacite/bolognese/pull/130) ([orangewolf](https://github.com/orangewolf))
+- mapping for DFG-to-OECD [\#125](https://github.com/datacite/bolognese/pull/125) ([kjgarza](https://github.com/kjgarza))
 
 ## [1.9.12](https://github.com/datacite/bolognese/tree/1.9.12) (2021-08-19)
 
@@ -79,7 +81,6 @@
 
 **Merged pull requests:**
 
-- 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))
 - Allow Orcid URLs to have been issued from the sandbox [\#121](https://github.com/datacite/bolognese/pull/121) ([prdanelli](https://github.com/prdanelli))
 
 ## [1.9.10](https://github.com/datacite/bolognese/tree/1.9.10) (2021-07-20)
@@ -115,7 +116,6 @@
 
 **Merged pull requests:**
 
-- mapping for DFG-to-OECD [\#125](https://github.com/datacite/bolognese/pull/125) ([kjgarza](https://github.com/kjgarza))
 - Fix missing affiliation identifier [\#117](https://github.com/datacite/bolognese/pull/117) ([richardhallett](https://github.com/richardhallett))
 - Add support for book title and additional metadata when reading Crossref Book Chapter DOI [\#115](https://github.com/datacite/bolognese/pull/115) ([prdanelli](https://github.com/prdanelli))
 - Valid Funder DOIs are being rejected for not starting with a 5 [\#114](https://github.com/datacite/bolognese/pull/114) ([prdanelli](https://github.com/prdanelli))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.10.0)
+    bolognese (1.11.0)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -11,7 +11,6 @@ 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)
@@ -36,8 +35,8 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     amazing_print (1.4.0)
     benchmark_methods (0.7)
     bibtex-ruby (6.0.0)
@@ -70,12 +69,22 @@ GEM
     edtf (3.1.0)
       activesupport (>= 3.0, < 8.0)
     excon (0.71.1)
-    faraday (0.17.5)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.6.0)
+      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.1)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
     haml (5.2.2)
@@ -106,15 +115,18 @@ GEM
     loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    maremma (4.9.8)
+    maremma (4.9.9)
       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.13.1, < 1.14.0)
       oj (>= 2.8.3)
       oj_mimic_json (~> 1.0, >= 1.0.1)
     matrix (0.4.2)
@@ -123,7 +135,7 @@ GEM
     multi_json (1.15.0)
     multipart-post (2.2.3)
     namae (1.1.1)
-    nokogiri (1.13.6)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oj (3.13.21)
@@ -135,7 +147,7 @@ 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)
@@ -170,24 +182,25 @@ 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.3)
+      matrix (~> 0.4)
       rdf (~> 3.2)
     temple (0.8.2)
     thor (1.2.1)
@@ -197,11 +210,12 @@ GEM
     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)
+    zlib (2.1.1)
 
 PLATFORMS
   ruby

data/bolognese.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   # 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 'faraday', '~> 0.17.3'
   s.add_dependency 'nokogiri', '>= 1.13.2', '< 1.14'
   s.add_dependency 'loofah', '~> 2.0', '>= 2.0.3'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'

data/lib/bolognese/readers/datacite_reader.rb

@@ -230,14 +230,14 @@ module Bolognese
             "creators" => get_authors(Array.wrap(ri.dig("creators", "creator"))),
             "titles" => get_titles(ri),
             "publicationYear" => ri["publicationYear"],
-            "volume" => ri["volume"],
-            "issue" => ri["issue"],
+            "volume" => parse_attributes(ri["volume"]),
+            "issue" => parse_attributes(ri["issue"]),
             "number" => number,
             "numberType" => numberType,
-            "firstPage" => ri["firstPage"],
-            "lastPage" => ri["lastPage"],
-            "publisher" => ri["publisher"],
-            "edition" => ri["edition"],
+            "firstPage" => parse_attributes(ri["firstPage"]),
+            "lastPage" => parse_attributes(ri["lastPage"]),
+            "publisher" => parse_attributes(ri["publisher"]),
+            "edition" => parse_attributes(ri["edition"]),
             "contributors" => get_authors(Array.wrap(ri.dig("contributors", "contributor"))),
           }.compact
         end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.10.0"
+  VERSION = "1.11.0"
 end

data/spec/fixtures/datacite-example-relateditems-with-attributes.xml

@@ -0,0 +1,61 @@
+<?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://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4.4/metadata.xsd">
+  <identifier identifierType="DOI">10.5072/example-full</identifier>
+  <creators>
+    <creator>
+      <creatorName nameType="Personal">Hallett, Richard</creatorName>
+      <givenName>Richard</givenName>
+      <familyName>Hallett</familyName>
+    </creator>
+  </creators>
+  <titles>
+    <title xml:lang="en-US">Example for related items</title>
+  </titles>
+  <publisher xml:lang="en">DataCite</publisher>
+  <publicationYear>2021</publicationYear>
+  <dates>
+    <date dateType="Updated" dateInformation="Updated with 4.4 properties">2021-01-26</date>
+  </dates>
+  <language>en-US</language>
+  <resourceType resourceTypeGeneral="Software">XML</resourceType>
+  <version>1</version>
+  <descriptions>
+    <description xml:lang="en-US" descriptionType="Abstract">A test example for related items</description>
+  </descriptions>
+  <relatedItems>
+    <relatedItem relationType="IsPublishedIn" relatedItemType="Journal">
+      <relatedItemIdentifier
+        relatedItemIdentifierType="DOI"
+        relatedMetadataScheme="citeproc+json"
+        schemeURI="https://github.com/citation-style-language/schema/raw/master/csl-data.json"
+        schemeType="URL">10.5072/john-smiths-1234</relatedItemIdentifier>
+      <creators>
+          <creator>
+              <creatorName nameType="Personal">Smith, John</creatorName>
+              <givenName>John</givenName>
+              <familyName>Smith</familyName>
+          </creator>
+      </creators>
+      <titles>
+        <title>Understanding the fictional John Smith</title>
+        <title titleType="Subtitle">A detailed look</title>
+      </titles>
+      <publicationYear>1776</publicationYear>
+      <volume xml:lang="en">776</volume>
+      <issue xml:lang="en">1</issue>
+      <number numberType="Chapter">1</number>
+      <firstPage xml:lang="en">50</firstPage>
+      <lastPage xml:lang="en">60</lastPage>
+      <publisher xml:lang="en">Example Inc</publisher>
+      <edition xml:lang="en">1</edition>
+      <contributors>
+        <contributor contributorType="ProjectLeader">
+            <contributorName>Richard, Hallett</contributorName>
+            <givenName>Richard</givenName>
+            <familyName>Hallett</familyName>
+        </contributor>
+      </contributors>
+    </relatedItem>
+  </relatedItems>
+</resource>

data/spec/readers/datacite_reader_spec.rb

@@ -1555,6 +1555,49 @@ describe Bolognese::Metadata, vcr: true do
     )
   end
 
+  it "Schema 4.4 related items from string with attributes" do
+    input = fixture_path + "datacite-example-relateditems-with-attributes.xml"
+    subject = Bolognese::Metadata.new(input: input)
+    expect(subject.valid?).to be true
+
+    expect(subject.related_items.last).to eq(
+      {
+        "relatedItemType"=>"Journal",
+        "relationType"=>"IsPublishedIn",
+        "relatedItemIdentifier"=>
+        {
+          "relatedItemIdentifier"=>"10.5072/john-smiths-1234",
+          "relatedItemIdentifierType"=>"DOI",
+          "relatedMetadataScheme"=>"citeproc+json",
+          "schemeURI"=>"https://github.com/citation-style-language/schema/raw/master/csl-data.json",
+          "schemeType"=>"URL"
+        },
+        "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.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -30,20 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -785,6 +771,7 @@ files:
 - spec/fixtures/datacite-example-geolocation.xml
 - spec/fixtures/datacite-example-nameIdentifier-with-schemeURI.xml
 - spec/fixtures/datacite-example-polygon-v4.1.xml
+- spec/fixtures/datacite-example-relateditems-with-attributes.xml
 - spec/fixtures/datacite-example-relateditems.xml
 - spec/fixtures/datacite-example-xs-string.xml
 - spec/fixtures/datacite-formats-with-xs.xml