bolognese 1.11.0 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f87808df4f12983e33877e77b31bc8aee2e1fe6f0a7e888da3d7b67ce19ab87e
-  data.tar.gz: 5143917378eacceff49c3d0d6e5b71f634237d025a7dad867db79ae34ed737f5
+  metadata.gz: 55d900e332741ad66b6b4bc1d0abd62fc7f2f8fff4e3800fa80c9745d5366cce
+  data.tar.gz: 8d646dcaa3e7224387b49bb76102d979e2e8cd89f07e390a4b5ab296b5cbe907
 SHA512:
-  metadata.gz: 351c69b0b3b528bdbe5c89ec27a6f503e461c5acfb9060894d6822045193eb8a93cbc51fd952da023e5fb7cf9a52e0b710d03c92fd27ece9fb95062da0feaf6f
-  data.tar.gz: bf72537500650c6a963ea792af54d7d1ac18410e0160e6dd9088bdd9033fe2049a871367d76bf7f892fba03c20b2b9df75e744efaf03cd973305d3b75fff1d87
+  metadata.gz: 5b9b9e267bab3ffcbdd4b866867ca98e395b9222ce5bd396ac559a8133736562a31b382d2ddce0d75255ba6099ebcdd203f440a2c83ff20b86fd4072f0eda44e
+  data.tar.gz: 913398d14852b68b6e4c82cb373f288a8746bb39b80586cba43960657ab63dd367efeedb8bb8e507fa68ecd2bdbd4d0a54945e3765a1115bea7e1ea5fe63ee4c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.11.0)
+    bolognese (1.11.2)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -29,7 +29,7 @@ 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)
@@ -37,7 +37,6 @@ GEM
       zeitwerk (~> 2.3)
     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)
       latex-decode (~> 0.0)
@@ -48,7 +47,7 @@ GEM
       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)
@@ -59,17 +58,16 @@ 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 (2.6.0)
+    faraday (2.7.6)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-encoding (0.0.5)
@@ -84,7 +82,7 @@ GEM
       zlib (~> 2.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (3.0.1)
+    faraday-net_http (3.0.2)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
     haml (5.2.2)
@@ -92,19 +90,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.2)
+    json-ld (3.2.5)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.3)
+      json-canonicalization (~> 0.3, >= 0.3.2)
       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)
@@ -112,9 +110,9 @@ 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)
+      nokogiri (>= 1.12.0)
     maremma (4.9.9)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
@@ -131,14 +129,14 @@ GEM
       oj_mimic_json (~> 1.0, >= 1.0.1)
     matrix (0.4.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    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.9)
       mini_portile2 (~> 2.8.0)
       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)
@@ -151,18 +149,19 @@ GEM
     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)
@@ -170,7 +169,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)
@@ -199,13 +198,13 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sxp (1.2.3)
+    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)
@@ -214,7 +213,7 @@ GEM
       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

data/lib/bolognese/metadata.rb

@@ -156,6 +156,11 @@ module Bolognese
       @descriptions ||= meta.fetch("descriptions", nil)
     end
 
+    def abstract_description
+      # Fetch the first description with descriptionType "Abstract"
+      @abstract_description ||= descriptions&.find { |d| d["descriptionType"] == "Abstract" }
+    end
+
     def rights_list
       @rights_list ||= meta.fetch("rights_list", nil)
     end

data/lib/bolognese/utils.rb

@@ -1021,7 +1021,7 @@ module Bolognese
       Array.wrap(element).map do |a|
         if a["literal"].present?
           a["@type"] = "Organization"
-          a["name"] = a["literal"]
+          a["creatorName"] = a["literal"]
         else
           a["@type"] = "Person"
           a["name"] = [a["given"], a["family"]].compact.join(" ")

data/lib/bolognese/version.rb

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

data/lib/bolognese/writers/ris_writer.rb

@@ -11,7 +11,7 @@ module Bolognese
           "AU" => to_ris(creators),
           "DO" => doi,
           "UR" => url,
-          "AB" => parse_attributes(descriptions, content: "description", first: true),
+          "AB" => parse_attributes(abstract_description, content: "description", first: true),
           "KW" => Array.wrap(subjects).map { |k| parse_attributes(k, content: "subject", first: true) }.presence,
           "PY" => publication_year,
           "PB" => publisher,

data/lib/bolognese/writers/schema_org_writer.rb

@@ -13,7 +13,7 @@ module Bolognese
           "name" => parse_attributes(titles, content: "title", first: true),
           "author" => to_schema_org_creators(creators),
           "editor" => to_schema_org_contributors(contributors),
-          "description" => parse_attributes(descriptions, content: "description", first: true),
+          "description" => parse_attributes(abstract_description, content: "description", first: true),
           "license" => Array.wrap(rights_list).map { |l| l["rightsUri"] }.compact.unwrap,
           "version" => version_info,
           "keywords" => subjects.present? ? Array.wrap(subjects).map { |k| parse_attributes(k, content: "subject", first: true) }.join(", ") : nil,

data/spec/fixtures/citeproc.json

@@ -25,6 +25,8 @@
     },
     "author": [{
         "family": "Fenner",
-        "given": "Martin"
-    }]
+        "given": "Martin",
+        "literal": "Fenner, Martin"
+    }
+]
 }

data/spec/fixtures/datacite.json

@@ -43,7 +43,7 @@
     }
   ],
   "dates": [
-    { 
+    {
       "dateType": "Created",
       "date": "2016-12-20"
     },
@@ -74,10 +74,16 @@
     }
   ],
   "version": "1.0",
-  "descriptions": [{
+  "descriptions": [
+    {
+      "descriptionType": "SeriesInformation",
+      "description": "Volume(1) Series(3)"
+    },
+    {
     "descriptionType": "Abstract",
     "description": "Eating your own dog food is a slang term to describe that an organization should itself use the products and services it provides. For DataCite this means that we should use DOIs with appropriate metadata and strategies for long-term preservation for..."
-  }],
+    }
+  ],
   "schemaVersion": "http://datacite.org/schema/kernel-4",
   "agency": "datacite"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.2
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-19 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma