bolognese 2.2.0 → 2.6.0

data/lib/bolognese/metadata.rb

@@ -1,10 +1,11 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 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
@@ -75,8 +76,8 @@ module Bolognese
       end
 
       # make sure input is encoded as utf8
-      string = string.force_encoding("UTF-8") if string.present?
-      @string = string
+      string1 = string.dup.force_encoding("UTF-8") if string.present?
+      @string = string1
 
       # input options for citation formatting
       @style = options[:style]
@@ -119,7 +120,7 @@ module Bolognese
 
       @regenerate = options[:regenerate] || read_options.present?
       # generate name for method to call dynamically
-      opts = { string: string, sandbox: options[:sandbox], doi: options[:doi], id: id, ra: ra }.merge(read_options)
+      opts = { string: string1, sandbox: options[:sandbox], doi: options[:doi], id: id, ra: ra }.merge(read_options)
       @meta = @from.present? ? send("read_" + @from, **opts) : {}
     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

@@ -33,7 +33,6 @@ require_relative 'writers/turtle_writer'
 
 module Bolognese
   module MetadataUtils
-    # include BenchmarkMethods
     include Bolognese::DoiUtils
     include Bolognese::AuthorUtils
     include Bolognese::DataciteUtils
@@ -153,14 +152,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/citeproc_reader.rb

@@ -52,6 +52,12 @@ module Bolognese
           [{ "nameType" => "Organizational", "name" => ":(unav)" }]
         end
         contributors = get_authors(from_citeproc(Array.wrap(meta.fetch("editor", nil))))
+        translators = get_authors(from_citeproc(Array.wrap(meta.fetch("translator", nil))))
+        translators.each do |translator|
+          translator["contributorType"] = "Translator"
+        end
+        contributors += translators
+
         dates = if date = get_date_from_date_parts(meta.fetch("issued", nil))
                   if Date.edtf(date).present?
                     [{ "date" => date,

data/lib/bolognese/readers/crossref_reader.rb

@@ -4,6 +4,12 @@ module Bolognese
   module Readers
     module CrossrefReader
       # CrossRef types from https://api.crossref.org/types
+
+      CR_TO_DC_CONTRIBUTOR_TYPES = {
+        "editor" => "Editor",
+        "translator" => "Translator",
+      }
+
       def get_crossref(id: nil, **options)
         return { "string" => nil, "state" => "not_found" } unless id.present?
 
@@ -138,7 +144,7 @@ module Bolognese
 
         state = meta.present? || read_options.present? ? "findable" : "not_found"
 
-        related_identifiers = Array.wrap(crossref_is_part_of(journal_metadata)) + Array.wrap(crossref_references(bibliographic_metadata))
+        related_identifiers = Array.wrap(crossref_is_part_of(journal_metadata)) + Array.wrap(crossref_references(bibliographic_metadata)) + Array.wrap(crossref_has_translation(program_metadata)) + Array.wrap(crossref_is_translation_of(program_metadata)) + Array.wrap(crossref_is_related_material(program_metadata))
 
         container = if journal_metadata.present?
                       issn = normalize_issn(journal_metadata.to_h.fetch("issn", nil))
@@ -187,7 +193,7 @@ module Bolognese
           "titles" => titles,
           "identifiers" => identifiers,
           "creators" => crossref_people(bibliographic_metadata, "author"),
-          "contributors" => crossref_people(bibliographic_metadata, "editor"),
+          "contributors" => crossref_people(bibliographic_metadata, "editor") + crossref_people(bibliographic_metadata, "translator"),
           "funding_references" => crossref_funding_reference(program_metadata),
           "publisher" => publisher,
           "container" => container,
@@ -282,10 +288,11 @@ module Bolognese
               "givenName" => given_name,
               "familyName" => family_name,
               "affiliation" => affiliation.presence,
-              "contributorType" => contributor_role == "editor" ? "Editor" : nil }.compact
+              "contributorType" => contributor_role == 'author' ? nil : CR_TO_DC_CONTRIBUTOR_TYPES[a["contributor_role"]] }.compact
           else
             { "nameType" => "Organizational",
-              "name" => a["name"] || a["__content__"] }
+              "name" => a["name"] || a["__content__"],
+              "contributorType" => contributor_role == 'author' ? nil : CR_TO_DC_CONTRIBUTOR_TYPES[a["contributor_role"]] }.compact
           end
         end
       end
@@ -362,6 +369,45 @@ module Bolognese
           end
         end.compact.unwrap
       end
+    
+      def crossref_has_translation(program_metadata)
+        refs = program_metadata.dig("related_item") if program_metadata.is_a?(Hash)
+        Array.wrap(refs).select { |a| a.dig("intra_work_relation", "relationship_type") == "hasTranslation" }.map do |c|
+          if c.dig("intra_work_relation", "identifier_type") == "doi"
+            { "relatedIdentifier" => parse_attributes(c["intra_work_relation"]).downcase,
+              "relationType" => "HasTranslation",
+              "relatedIdentifierType" => "DOI" }.compact
+          else
+            nil
+          end
+        end.compact.unwrap
+      end
+
+      def crossref_is_translation_of(program_metadata)
+        refs = program_metadata.dig("related_item") if program_metadata.is_a?(Hash)
+        Array.wrap(refs).select { |a| a.dig("intra_work_relation", "relationship_type") == "isTranslationOf" }.map do |c|
+          if c.dig("intra_work_relation", "identifier_type") == "doi"
+            { "relatedIdentifier" => parse_attributes(c["intra_work_relation"]).downcase,
+              "relationType" => "IsTranslationOf",
+              "relatedIdentifierType" => "DOI" }.compact
+          else
+            nil
+          end
+        end.compact.unwrap
+      end
+
+      def crossref_is_related_material(program_metadata)
+        refs = program_metadata.dig("related_item") if program_metadata.is_a?(Hash)
+        Array.wrap(refs).select { |a| a.dig("interwork_relation", "relationship_type") == "isRelatedMaterial" }.map do |c|
+          if c.dig("inter_work_relation", "identifier_type") == "doi"
+            { "relatedIdentifier" => parse_attributes(c["inter_work_relation"]).downcase,
+              "relationType" => "Other",
+              "relatedIdentifierType" => "DOI" }.compact
+          else
+            nil
+          end
+        end.compact.unwrap
+      end
     end
   end
 end

data/lib/bolognese/readers/datacite_reader.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'base64'
+
 module Bolognese
   module Readers
     module DataciteReader
@@ -206,7 +208,8 @@ module Bolognese
             "resourceTypeGeneral" => ri["resourceTypeGeneral"],
             "relatedMetadataScheme" => ri["relatedMetadataScheme"],
             "schemeUri" => ri["schemeURI"],
-            "schemeType" => ri["schemeType"]
+            "schemeType" => ri["schemeType"],
+            "relationTypeInformation" => ri["relationTypeInformation"]
           }.compact
         end
 
@@ -226,7 +229,7 @@ module Bolognese
               "relatedItemIdentifierType" => rii["relatedItemIdentifierType"],
               "relatedMetadataScheme" => rii["relatedMetadataScheme"],
               "schemeURI" => rii["schemeURI"],
-              "schemeType" => rii["schemeType"]
+              "schemeType" => rii["schemeType"],
             }.compact
           end
 
@@ -241,6 +244,7 @@ module Bolognese
 
           a = {
             "relationType" => ri["relationType"],
+            "relationTypeInformation" => ri["relationTypeInformation"],
             "relatedItemType" => ri["relatedItemType"],
             "relatedItemIdentifier" => relatedItemIdentifier,
             "creators" => get_authors(Array.wrap(ri.dig("creators", "creator"))),
@@ -262,17 +266,13 @@ module Bolognese
           if !gl.is_a?(Hash) || gl["geoLocationPoint"].is_a?(String) || gl["geoLocationBox"].is_a?(String) || gl["geoLocationPolygon"].is_a?(String)
             nil
           else
-
-            # Handle scenario where multiple geoLocationPolygons are allowed within a single geoLocation
-            # we want to return an array if it's already an array (i.e. multiple geoLocationPolygons)
-            # vs if it's singular just return the object
-            # This is for backwards compatability to allow both scenarios.
+            ## Array of geoLocationPolygons within a geoLocation is Unsupported in JSON.
             if gl.dig("geoLocationPolygon").kind_of?(Array)
-              geoLocationPolygon = gl.dig("geoLocationPolygon").map do |glp|
-                Array.wrap(glp.dig("polygonPoint")).map { |glpp| { "polygonPoint" => glpp } }.compact.presence
-              end.compact.presence
+              geoLocationPolygon = nil
             else
-              geoLocationPolygon = Array.wrap(gl.dig("geoLocationPolygon", "polygonPoint")).map { |glp| { "polygonPoint" => glp } }.compact.presence
+              geoLocationPolygon = Array.wrap(gl.dig("geoLocationPolygon", "polygonPoint")).map { |glp| { "polygonPoint" => glp } }
+                .push(Array.wrap(gl.dig("geoLocationPolygon", "inPolygonPoint")).map { |glp| { "inPolygonPoint" => glp } }.first)
+                .compact.presence             
             end
 
             {
@@ -302,7 +302,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,
@@ -323,28 +322,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/readers/schema_org_reader.rb

@@ -10,7 +10,9 @@ module Bolognese
         "isPartOf" => "IsPartOf",
         "hasPart" => "HasPart",
         "isPredecessor" => "IsPreviousVersionOf",
-        "isSuccessor" => "IsNewVersionOf"
+        "isSuccessor" => "IsNewVersionOf",
+        "workTranslation" => "HasTranslation",
+        "translationOfWork" => "IsTranslationOf"
       }
 
       SO_TO_DC_REVERSE_RELATION_TYPES = {
@@ -74,6 +76,12 @@ module Bolognese
           creators = get_authors(from_schema_org_creators(Array.wrap(authors)))
         end
         contributors = get_authors(from_schema_org_contributors(Array.wrap(meta.fetch("editor", nil))))
+        translators = get_authors(from_schema_org_contributors(Array.wrap(meta.fetch("translator", nil))))
+        translators.map! do |translator|
+          translator["contributorType"] = "Translator"
+          translator
+        end
+        contributors += translators
 
         publisher = {
           "name" => parse_attributes(meta.fetch("publisher", nil), content: "name", first: true),
@@ -106,7 +114,9 @@ module Bolognese
           Array.wrap(schema_org_references(meta)) +
           Array.wrap(schema_org_is_referenced_by(meta)) +
           Array.wrap(schema_org_is_supplement_to(meta)) +
-          Array.wrap(schema_org_is_supplemented_by(meta))
+          Array.wrap(schema_org_is_supplemented_by(meta)) +
+          Array.wrap(schema_org_has_translation(meta)) +
+          Array.wrap(schema_org_is_translation_of(meta))
 
         rights_list = Array.wrap(meta.fetch("license", nil)).compact.map do |rl|
           hsh_to_spdx("__content__" => rl["name"], "rightsURI" => rl["id"])
@@ -127,6 +137,7 @@ module Bolognese
         dates << { "date" => meta.fetch("datePublished"), "dateType" => "Issued" } if Date.edtf(meta.fetch("datePublished", nil)).present?
         dates << { "date" => meta.fetch("dateCreated"), "dateType" => "Created" } if Date.edtf(meta.fetch("dateCreated", nil)).present?
         dates << { "date" => meta.fetch("dateModified"), "dateType" => "Updated" } if Date.edtf(meta.fetch("dateModified", nil)).present?
+        dates << { "date" => meta.fetch("temporalCoverage"), "dateType" => "Coverage" } if Date.edtf(meta.fetch("temporalCoverage", nil)).present?
         publication_year = meta.fetch("datePublished")[0..3] if meta.fetch("datePublished", nil).present?
 
         if meta.fetch("inLanguage", nil).is_a?(String)
@@ -240,6 +251,14 @@ module Bolognese
         schema_org_related_identifier(meta, relation_type: "isBasedOn")
       end
 
+      def schema_org_has_translation(meta)
+        schema_org_related_identifier(meta, relation_type: "workTranslation", )
+      end
+
+      def schema_org_is_translation_of(meta)
+        schema_org_related_identifier(meta, relation_type: "translationOfWork")
+      end
+
     end
   end
 end

data/lib/bolognese/utils.rb

@@ -32,7 +32,7 @@ module Bolognese
       "https://creativecommons.org/licenses/by-nd/2.0" => "https://creativecommons.org/licenses/by-nd/2.0/legalcode",
       "https://creativecommons.org/licenses/by-nd/2.5" => "https://creativecommons.org/licenses/by-nd/2.5/legalcode",
       "https://creativecommons.org/licenses/by-nd/3.0" => "https://creativecommons.org/licenses/by-nd/3.0/legalcode",
-      "https://creativecommons.org/licenses/by-nd/4.0" => "https://creativecommons.org/licenses/by-nd/2.0/legalcode",
+      "https://creativecommons.org/licenses/by-nd/4.0" => "https://creativecommons.org/licenses/by-nd/4.0/legalcode",
       "https://creativecommons.org/licenses/by-sa/1.0" => "https://creativecommons.org/licenses/by-sa/1.0/legalcode",
       "https://creativecommons.org/licenses/by-sa/2.0" => "https://creativecommons.org/licenses/by-sa/2.0/legalcode",
       "https://creativecommons.org/licenses/by-sa/2.5" => "https://creativecommons.org/licenses/by-sa/2.5/legalcode",
@@ -67,7 +67,9 @@ module Bolognese
       "OutputManagementPlan" => nil,
       "PeerReview" => "Review",
       "PhysicalObject" => nil,
+      "Poster" => "Poster",
       "Preprint" => nil,
+      "Presentation" => "PresentationDigitalDocument",
       "Report" => "Report",
       "Service" => "Service",
       "Software" => "SoftwareSourceCode",
@@ -78,7 +80,9 @@ module Bolognese
       "Other" => "CreativeWork",
       # not part of DataCite schema, but used internally
       "Periodical" => "Periodical",
-      "DataCatalog" => "DataCatalog"
+      "DataCatalog" => "DataCatalog",
+      "Award" => "Grant",
+      "Project" => "Project"
     }
 
     DC_TO_CP_TRANSLATIONS = {
@@ -101,7 +105,9 @@ module Bolognese
       "OutputManagementPlan" => nil,
       "PeerReview" => "review",
       "PhysicalObject" => nil,
+      "Poster" => "document",
       "Preprint" => nil,
+      "Presentation" => "presentation",
       "Report" => "report",
       "Service" => nil,
       "Sound" => "song",
@@ -278,6 +284,8 @@ module Bolognese
       "Event" => "Event",
       "ImageObject" => "Image",
       "Movie" => "Audiovisual",
+      "Poster" => "Poster",
+      "PresentationDigitalDocument" => "Presentation",
       "PublicationIssue" => "Text",
       "Report" => "Report",
       "ScholarlyArticle" => "Text",
@@ -324,6 +332,8 @@ module Bolognese
       "Event" => nil,
       "ImageObject" => "graphic",
       "Movie" => "motion_picture",
+      "Poster" => "document",
+      "PresentationDigitalDocument" => "presentation",
       "PublicationIssue" => nil,
       "Report" => "report",
       "ScholarlyArticle" => "article-journal",
@@ -346,8 +356,10 @@ module Bolognese
       "Event" => nil,
       "ImageObject" => "FIGURE",
       "Movie" => "MPCT",
-      "Report" => "RPRT",
+      "Poster" => "GEN",
+      "PresentationDigitalDocument" => "SLIDE",
       "PublicationIssue" => nil,
+      "Report" => "RPRT",
       "ScholarlyArticle" => "JOUR",
       "Service" => nil,
       "SoftwareSourceCode" => "COMP",
@@ -404,7 +416,9 @@ module Bolognese
       "OutputManagementPlan" => nil,
       "PeerReview" => nil,
       "PhysicalObject" => nil,
+      "Poster" => "GEN",
       "Preprint" => nil,
+      "Presentation" => "SLIDE",
       "Report" => "RRPT",
       "Service" => nil,
       "Software" => "COMP",
@@ -417,7 +431,7 @@ module Bolognese
 
     RIS_TO_DC_TRANSLATIONS = {
       "BLOG" => "Text",
-      "GEN" => "Text",
+      "GEN" => "Poster",
       "CTLG" => "Collection",
       "DATA" => "Dataset",
       "FIGURE" => "Image",
@@ -426,7 +440,8 @@ module Bolognese
       "JOUR" => "JournalArticle",
       "COMP" => "Software",
       "VIDEO" => "Audiovisual",
-      "ELEC" => "Text"
+      "ELEC" => "Text",
+      "SLIDE" => "Presentation"
     }
 
     BIB_TO_DC_TRANSLATIONS = {
@@ -450,7 +465,9 @@ module Bolognese
       "motion_picture" => "Audiovisual",
       "article-journal" => "JournalArticle",
       "broadcast" => "Audiovisual",
-      "webpage" => "Text"
+      "webpage" => "Text",
+      "document" => "Poster",
+      "presentation" => "Presentation"
     }
 
     SO_TO_BIB_TRANSLATIONS = {
@@ -466,6 +483,8 @@ module Bolognese
       "Event" => "misc",
       "ImageObject" => "misc",
       "Movie" => "misc",
+      "Poster" => "misc",
+      "PresentationDigitalDocument" => "misc",
       "PublicationIssue" => "misc",
       "ScholarlyArticle" => "article",
       "Service" => "misc",
@@ -649,7 +668,7 @@ module Bolognese
       return nil unless uri && uri.host && %w(http https).include?(uri.scheme)
 
       # clean up URL
-      PostRank::URI.clean(id)
+      normalize_uri_with_path_cleanup(uri)
     rescue Addressable::URI::InvalidURIError
       nil
     end
@@ -669,9 +688,7 @@ module Bolognese
       uri.scheme = "https" if options[:https]
 
       # clean up URL
-      uri.path = PostRank::URI.clean(uri.path)
-
-      uri.to_s
+      normalize_uri_with_path_cleanup(uri)
     rescue Addressable::URI::InvalidURIError
       nil
     end
@@ -825,7 +842,8 @@ module Bolognese
 
     def to_schema_org_contributors(element)
       element = Array.wrap(element).map do |c|
-        c["affiliation"] = Array.wrap(c["affiliation"]).map do |a|
+        transformed_c = c.dup
+        transformed_c["affiliation"] = Array.wrap(c["affiliation"]).map do |a|
           if a.is_a?(String)
             name = a
             affiliation_identifier = nil
@@ -839,10 +857,10 @@ module Bolognese
             "@id" => affiliation_identifier,
             "name" => name }.compact
         end.unwrap
-        c["@type"] = c["nameType"].present? ? c["nameType"][0..-3] : nil
-        c["@id"] = Array.wrap(c["nameIdentifiers"]).first.to_h.fetch("nameIdentifier", nil)
-        c["name"] = c["familyName"].present? ? [c["givenName"], c["familyName"]].join(" ") : c["name"]
-        c.except("nameIdentifiers", "nameType").compact
+        transformed_c["@type"] = c["nameType"].present? ? c["nameType"][0..-3] : nil
+        transformed_c["@id"] = Array.wrap(c["nameIdentifiers"]).first.to_h.fetch("nameIdentifier", nil)
+        transformed_c["name"] = c["familyName"].present? ? [c["givenName"], c["familyName"]].join(" ") : c["name"]
+        transformed_c.except("nameIdentifiers", "nameType").compact
       end.unwrap
     end
 
@@ -929,8 +947,10 @@ module Bolognese
               "address" => gl["geoLocationPlace"],
               "polygon" => Array.wrap(gl.dig("geoLocationPolygon")).map do |glp|
                 Array.wrap(glp).map do |glpp|
-                  [glpp.dig("polygonPoint", "pointLongitude"), glpp.dig("polygonPoint", "pointLatitude")].compact
-                end.compact
+                  if glpp.dig("polygonPoint")
+                    [glpp.dig("polygonPoint", "pointLongitude"), glpp.dig("polygonPoint", "pointLatitude")].compact
+                  end
+                end.compact.presence
               end.compact.presence,
               }
           }
@@ -1234,7 +1254,9 @@ module Bolognese
         "urn" => "URN",
         "md5" => "md5",
         "minid" => "minid",
-        "dataguid" => "dataguid"
+        "dataguid" => "dataguid",
+        "cstr" => "CSTR",
+        "rrid" => "RRID"
       }
 
       identifierTypes[identifier_type.downcase] || identifier_type
@@ -1425,7 +1447,57 @@ module Bolognese
 
     def abstract_description
       # Fetch the first description with descriptionType "Abstract"
-      descriptions&.find { |d| d["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
+
+    private
+
+    def normalize_uri_with_path_cleanup(uri)
+      normalized_uri = uri.normalize
+      normalized_uri.path = normalized_uri.path.sub(%r{/\z}, "") if normalized_uri.path.present?
+      normalized_uri.to_s
     end
   end
 end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "2.2.0"
+  VERSION = "2.6.0"
 end

data/lib/bolognese/writers/csv_writer.rb

@@ -4,18 +4,16 @@ module Bolognese
       require "csv"
 
       def csv
-        return nil unless valid?
-
         bib = {
           doi: doi,
           url: url,
           registered: get_iso8601_date(date_registered),
           state: state,
-          resource_type_general: types["resourceTypeGeneral"],
-          resource_type: types["resourceType"],
+          resource_type_general: types.respond_to?(:to_h) ? types.to_h["resourceTypeGeneral"] : nil,
+          resource_type: types.respond_to?(:to_h) ? types.to_h["resourceType"] : nil,
           title: parse_attributes(titles, content: "title", first: true),
           author: authors_as_string(creators),
-          publisher: publisher["name"],
+          publisher: publisher.respond_to?(:to_h) ? publisher.to_h["name"] : nil,
           publication_year: publication_year
         }.values
 

data/lib/bolognese/writers/schema_org_writer.rb

@@ -13,6 +13,7 @@ module Bolognese
           "name" => parse_attributes(titles, content: "title", first: true),
           "author" => to_schema_org_creators(creators),
           "editor" => to_schema_org_contributors(contributors),
+          "translator" => contributors ? to_schema_org_contributors(contributors.select { |c| c["contributorType"] == "Translator" }) : nil,
           "description" => parse_attributes(abstract_description, content: "description", first: true),
           "license" => Array.wrap(rights_list).map { |l| l["rightsUri"] }.compact.unwrap,
           "version" => version_info,
@@ -23,6 +24,7 @@ module Bolognese
           "dateCreated" => get_date(dates, "Created"),
           "datePublished" => get_date(dates, "Issued") || publication_year,
           "dateModified" => get_date(dates, "Updated"),
+          "temporalCoverage" => get_date(dates, "Coverage"),
           "pageStart" => container.to_h["firstPage"],
           "pageEnd" => container.to_h["lastPage"],
           "spatialCoverage" => to_schema_org_spatial_coverage(geo_locations),
@@ -32,6 +34,8 @@ module Bolognese
           "predecessor_of" => to_schema_org_relation(related_identifiers: related_identifiers, relation_type: "IsPreviousVersionOf"),
           "successor_of" => to_schema_org_relation(related_identifiers: related_identifiers, relation_type: "IsNewVersionOf"),
           "citation" => to_schema_org_relation(related_identifiers: related_identifiers, relation_type: "References"),
+          "workTranslation" => to_schema_org_relation(related_identifiers: related_identifiers, relation_type: "HasTranslation"),
+          "translationOfWork" => to_schema_org_relation(related_identifiers: related_identifiers, relation_type: "IsTranslationOf"),
           "@reverse" => reverse.presence,
           "contentUrl" => Array.wrap(content_url).unwrap,
           "schemaVersion" => schema_version,

data/lib/bolognese.rb

@@ -3,9 +3,7 @@
 require 'active_support/all'
 require 'nokogiri'
 require 'maremma'
-require 'postrank-uri'
 require 'bibtex'
-require 'colorize'
 require 'loofah'
 require 'json/ld'
 require 'rdf/turtle'
@@ -13,9 +11,7 @@ require 'rdf/rdfxml'
 require 'logger'
 require 'iso8601'
 require 'jsonlint'
-require 'benchmark_methods'
 require 'gender_detector'
-require 'citeproc/ruby'
 require 'citeproc'
 require 'csl/styles'
 require 'edtf'