bolognese 2.3.9 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5490a2fbec4b0acaad6edf965cd5a7c27a9b9edc2e0f9c2e8bc1041e1f8701d8
-  data.tar.gz: d74808cfadf7fbc3469c56a248479d23526ad34d32af4e75bffb843846055bee
+  metadata.gz: 3f0239c99410f1942496bd26e40c9fe98884e7b850bafad0c20af747073d8828
+  data.tar.gz: a154ee1f051aeb20ab12f4131bff2776e77db6d9241af3940d70e80761fdf4bd
 SHA512:
-  metadata.gz: a7e9f5e56b9c1c5429bb32174b1392e46fb83208f07106f20ca56c86fe8f25847d7308cd490c897752b9812cabc934b0cac59b6f1d136340b50eb7635a24c37d
-  data.tar.gz: 34caaba62200f9e8c203f8e55d97acb3423e9f4d865c6726dc81aae3de2b15934cdef9cc26ae7dc6cf619baf63ee5cdbb5b6d5d6f50f307407fcb3c40a34765a
+  metadata.gz: d7fbdfd38162ac2d47143f2a296a6ec7d3a7d8799ec1c6d1b8b15bfaa6257bb4b19b13acb64b0abee782efb4f058ab96293705c106b75344c93110008ffdbe6a
+  data.tar.gz: 65a3c6ded83c62d019520a1dfd936ce0a23251679458cd2669e106541adcb506ced58e879d634579495ecdb16cda2e78684567b7232c34d861690700a3598743

data/.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.0", "3.1", "3.2", "3.3"]
+        ruby: ["3.1", "3.2", "3.3"]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

data/.github/workflows/release.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Ruby 3.1.4
+    - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.1.4"
+        ruby-version: "3.2.9"
 
     - name: Build
       run: |

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    bolognese (2.3.9)
-      activesupport (>= 4.2.5)
+    bolognese (2.5.0)
+      activesupport (= 7.2.3)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
       builder (~> 3.2, >= 3.2.2)
@@ -29,17 +29,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.3)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.3.0)
+    benchmark (0.5.0)
     benchmark_methods (0.7)
     bibtex-ruby (6.0.0)
       latex-decode (~> 0.0)
+    bigdecimal (3.3.1)
     builder (3.2.4)
     byebug (11.1.3)
     citeproc (1.0.10)
@@ -48,7 +57,8 @@ GEM
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.6)
     colorize (0.8.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.5)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -59,6 +69,7 @@ GEM
       csl (~> 1.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
+    drb (2.2.3)
     ebnf (2.3.3)
       htmlentities (~> 4.3)
       rdf (~> 3.2)
@@ -111,6 +122,7 @@ GEM
       optimist (~> 3)
     latex-decode (0.4.0)
     link_header (0.0.8)
+    logger (1.7.0)
     loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -194,6 +206,7 @@ GEM
       rspec (~> 3)
     ruby2_keywords (0.0.5)
     scanf (1.0.0)
+    securerandom (0.4.1)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -214,7 +227,6 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.8)
     zlib (2.1.1)
 
 PLATFORMS

data/bolognese.gemspec

@@ -13,15 +13,14 @@ Gem::Specification.new do |s|
   s.version       = Bolognese::VERSION
   s.extra_rdoc_files = ["README.md"]
   s.license       = 'MIT'
-  s.required_ruby_version = ['>=3.0']
+  s.required_ruby_version = ['>= 3.1', '<= 3.3.10']
 
   # Declare dependencies here, rather than in the Gemfile
   s.add_dependency 'maremma', '~> 5.0'
-  #s.add_dependency 'faraday', '~> 0.17.3'
   s.add_dependency 'nokogiri', '~> 1.16', '>= 1.16.2'
   s.add_dependency 'loofah', '~> 2.0', '>= 2.0.3'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
-  s.add_dependency 'activesupport', '>= 4.2.5'
+  s.add_dependency 'activesupport', '7.2.3'
   s.add_dependency 'bibtex-ruby', '>= 5.1.0'
   s.add_dependency 'thor', '>= 0.19'
   s.add_dependency 'colorize', '~> 0.8.1'

data/lib/bolognese/datacite_utils.rb

@@ -337,7 +337,7 @@ module Bolognese
       return xml unless descriptions.present? || container && container["title"].present?
 
       xml.descriptions do
-        if container && container["title"].present?
+        if (respond_to?(:from) && !from.to_s.include?("datacite")) && container && container["title"].present?
           issue = container["issue"].present? ? "(#{container["issue"]})" : nil
           volume_issue = container["volume"].present? ? [container["volume"], issue].join("") : nil
           pages = [container["firstPage"], container["lastPage"]].compact.join("-") if container["firstPage"].present?

data/lib/bolognese/metadata.rb

@@ -5,6 +5,7 @@ require_relative 'metadata_utils'
 module Bolognese
   class Metadata
     include Bolognese::MetadataUtils
+    include Bolognese::Utils
 
     attr_accessor :string, :from, :sandbox, :meta, :regenerate, :issue, :show_errors
     attr_reader :doc, :page_start, :page_end
@@ -205,7 +206,9 @@ module Bolognese
     end
 
     def container
-      @container ||= meta.fetch("container", nil)
+      @container ||= begin
+        generate_container(types, related_items, related_identifiers, descriptions) || meta.fetch("container", nil)
+      end
     end
 
     def geo_locations

data/lib/bolognese/metadata_utils.rb

@@ -153,15 +153,21 @@ module Bolognese
         "language" => language,
         "author" => author,
         "contributor" => to_citeproc(contributors),
+        "editor" => contributors ? to_citeproc(contributors.select { |c| c["contributorType"] == "Editor" }) : nil,
         "translator" => contributors ? to_citeproc(contributors.select { |c| c["contributorType"] == "Translator" }) : nil,
         "issued" => get_date(dates, "Issued") ? get_date_parts(get_date(dates, "Issued")) : get_date_parts(publication_year.to_s),
         "submitted" => Array.wrap(dates).find { |d| d["dateType"] == "Submitted" }.to_h.fetch("__content__", nil),
+        "available-date" => Array.wrap(dates).find { |d| d["dateType"] == "Available" }.to_h.fetch("__content__", nil),
         "abstract" => parse_attributes(descriptions, content: "description", first: true),
         "container-title" => container_title,
         "DOI" => doi,
         "volume" => container.to_h["volume"],
         "issue" => container.to_h["issue"],
+        "number" => container.to_h["number"],
+        "chapter-number" => container.to_h["chapterNumber"],
+        "edition" => container.to_h["edition"],
         "page" => page,
+        "page-first" => container.to_h["firstPage"],
         "publisher" => publisher["name"],
         "title" => parse_attributes(titles, content: "title", first: true),
         "URL" => url,

data/lib/bolognese/readers/datacite_reader.rb

@@ -298,7 +298,6 @@ module Bolognese
           "titles" => titles,
           "creators" => get_authors(Array.wrap(meta.dig("creators", "creator"))),
           "contributors" => get_authors(Array.wrap(meta.dig("contributors", "contributor"))),
-          "container" => set_container(meta),
           "publisher" => publisher,
           "agency" => "datacite",
           "funding_references" => funding_references,
@@ -319,28 +318,6 @@ module Bolognese
         }.merge(read_options)
       end
 
-      def set_container(meta)
-        series_information = Array.wrap(meta.dig("descriptions", "description")).find { |r| r["descriptionType"] == "SeriesInformation" }.to_h.fetch("__content__", nil)
-        si = get_series_information(series_information)
-
-        is_part_of = Array.wrap(meta.dig("relatedIdentifiers", "relatedIdentifier")).find { |ri| ri["relationType"] == "IsPartOf" }.to_h
-
-        if si["title"].present? || is_part_of.present?
-          {
-            "type" => meta.dig("resourceType", "resourceTypeGeneral") == "Dataset" ? "DataRepository" : "Series",
-            "identifier" => is_part_of["__content__"],
-            "identifierType" => is_part_of["relatedIdentifierType"],
-            "title" => si["title"],
-            "volume" => si["volume"],
-            "issue" => si["issue"],
-            "firstPage" => si["firstPage"],
-            "lastPage" => si["lastPage"]
-          }.compact
-        else
-          {}
-        end
-      end
-
       def get_titles(meta)
         titles = Array.wrap(meta.dig("titles", "title")).map do |r|
           if r.blank?

data/lib/bolognese/utils.rb

@@ -1434,5 +1434,47 @@ module Bolognese
       # Fetch the first description with descriptionType "Abstract"
       Array.wrap(descriptions)&.find { |d| d["descriptionType"] == "Abstract" }
     end
+
+    def generate_container(types, related_items, related_identifiers, descriptions)
+      container_type = (types.respond_to?(:dig) && types&.dig("resourceTypeGeneral")) == "Dataset" ? "DataRepository" : "Series"
+
+      # relatedItem container
+      related_item = Array.wrap(related_items).find { |ri| ri["relationType"] == "IsPublishedIn" }.to_h
+
+      if related_item.present?
+        return {
+          "type" => container_type,
+          "identifier" => related_item.dig("relatedItemIdentifier", "relatedItemIdentifier"),
+          "identifierType" => related_item.dig("relatedItemIdentifier", "relatedItemIdentifierType"),
+          "title" => related_item.dig("titles", 0).then { |t| t ? parse_attributes(t, content: "title", first: true) : nil },
+          "volume" => related_item["volume"],
+          "issue" => related_item["issue"],
+          "edition" => related_item["edition"],
+          "number" => related_item["number"],
+          "chapterNumber" => related_item["numberType"] == "Chapter" ? related_item["number"] : nil,
+          "firstPage" => related_item["firstPage"],
+          "lastPage" => related_item["lastPage"]
+        }.compact
+      end
+
+      # Legacy SeriesInformation/relatedIdentifier container fallback 
+      series_information = Array.wrap(descriptions).find { |r| r["descriptionType"] == "SeriesInformation" }.to_h.fetch("description", nil)
+      si = get_series_information(series_information)
+
+      is_part_of = Array.wrap(related_identifiers).find { |ri| ri["relationType"] == "IsPartOf" }.to_h
+
+      if si["title"].present?
+        return {
+          "type" => container_type,
+          "identifier" => is_part_of["relatedIdentifier"],
+          "identifierType" => is_part_of["relatedIdentifierType"],
+          "title" => si["title"],
+          "volume" => si["volume"],
+          "issue" => si["issue"],
+          "firstPage" => si["firstPage"],
+          "lastPage" => si["lastPage"]
+        }.compact
+      end
+    end
   end
 end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "2.3.9"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 2.3.9
+  version: 2.5.0
 platform: ruby
 authors:
 - Martin Fenner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-15 00:00:00.000000000 Z
+date: 2026-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -88,16 +88,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 7.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 7.2.3
 - !ruby/object:Gem::Dependency
   name: bibtex-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -796,14 +796,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
+  - - "<="
+    - !ruby/object:Gem::Version
+      version: 3.3.10
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Ruby client library for conversion of DOI Metadata