bolognese 2.3.2 → 2.6.1

data/lib/bolognese/datacite_utils.rb

@@ -69,7 +69,7 @@ module Bolognese
 
       xml.contributors do
         Array.wrap(contributors).each do |con|
-          xml.contributor("contributorType" => con["contributorType"] || "Other") do
+          xml.contributor("contributorType" => con["contributorType"]) do
             insert_person(xml, con, "contributor")
           end
         end
@@ -128,7 +128,7 @@ module Bolognese
     def insert_resource_type(xml)
       return xml unless types.is_a?(Hash) && (types["schemaOrg"].present? || types["resourceTypeGeneral"])
 
-      xml.resourceType(types["resourceType"] || types["schemaOrg"],
+      xml.resourceType(types["resourceType"],
         'resourceTypeGeneral' => types["resourceTypeGeneral"] || Metadata::SO_TO_DC_TRANSLATIONS[types["schemaOrg"]] || "Other")
     end
 
@@ -209,7 +209,9 @@ module Bolognese
           attributes = {
             'relatedIdentifierType' => related_identifier["relatedIdentifierType"],
             'relationType' => related_identifier["relationType"],
-            'resourceTypeGeneral' => related_identifier["resourceTypeGeneral"] }.compact
+            'relationTypeInformation' => related_identifier["relationTypeInformation"],
+            'resourceTypeGeneral' => related_identifier["resourceTypeGeneral",
+            ] }.compact
 
           attributes.merge({ 'relatedMetadataScheme' => related_identifier["relatedMetadataSchema"],
             'schemeURI' => related_identifier["schemeUri"],
@@ -228,6 +230,7 @@ module Bolognese
           attributes = {
             'relatedItemType' => related_item["relatedItemType"],
             'relationType' => related_item["relationType"],
+            'relationTypeInformation' => related_item["relationTypeInformation"],
           }.compact
 
           xml.relatedItem(related_item["relatedItem"], attributes) do
@@ -337,7 +340,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?
@@ -387,9 +390,16 @@ module Bolognese
             if geo_location["geoLocationPolygon"]
               xml.geoLocationPolygon do
                 Array.wrap(geo_location["geoLocationPolygon"]).each do |polygon_point|
-                  xml.polygonPoint do
-                    xml.pointLatitude(polygon_point.dig("polygonPoint", "pointLatitude"))
-                    xml.pointLongitude(polygon_point.dig("polygonPoint", "pointLongitude"))
+                  if polygon_point.has_key?("polygonPoint")
+                    xml.polygonPoint do
+                      xml.pointLatitude(polygon_point.dig("polygonPoint", "pointLatitude"))
+                      xml.pointLongitude(polygon_point.dig("polygonPoint", "pointLongitude"))
+                    end
+                  else
+                    xml.inPolygonPoint do
+                      xml.pointLatitude(polygon_point.dig("inPolygonPoint", "pointLatitude"))
+                      xml.pointLongitude(polygon_point.dig("inPolygonPoint", "pointLongitude"))
+                    end
                   end
                 end
               end

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
@@ -140,28 +139,43 @@ module Bolognese
         author = to_citeproc(creators)
       end
 
-      if types["resourceTypeGeneral"] == "Software" && version_info.present?
-        type = "book"
+      if types["resourceTypeGeneral"] == "Software"
+        type = "software"
       else
         type = types["citeproc"]
       end
 
+      # Filter out contributors who are already creators, editors, or translators to avoid duplication
+      creator_names = Array.wrap(creators).map { |c| c["name"] || [c["givenName"], c["familyName"]].compact.join(" ") }.compact
+      unique_contributors = Array.wrap(contributors).reject do |c|
+        contributor_name = c["name"] || [c["givenName"], c["familyName"]].compact.join(" ")
+        creator_names.include?(contributor_name) ||
+        c["contributorType"] == "Editor" ||
+        c["contributorType"] == "Translator"
+      end
+
       {
         "type" => type,
         "id" => normalize_doi(doi),
         "categories" => Array.wrap(subjects).map { |k| parse_attributes(k, content: "subject", first: true) }.presence,
         "language" => language,
         "author" => author,
-        "contributor" => to_citeproc(contributors),
+        "contributor" => unique_contributors.presence ? to_citeproc(unique_contributors) : nil,
+        "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/crossref_reader.rb

@@ -144,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)) + Array.wrap(crossref_has_translation(program_metadata)) + Array.wrap(crossref_is_translation_of(program_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))
@@ -282,18 +282,17 @@ module Bolognese
               end
             end.compact
 
-            contributor_type = CR_TO_DC_CONTRIBUTOR_TYPES[a["contributor_role"]]
-
             { "nameType" => "Personal",
               "nameIdentifiers" => name_identifiers,
               "name" => [family_name, given_name].compact.join(", "),
               "givenName" => given_name,
               "familyName" => family_name,
               "affiliation" => affiliation.presence,
-              "contributorType" => contributor_type }.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
@@ -396,6 +395,19 @@ module Bolognese
           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/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",
@@ -103,7 +105,9 @@ module Bolognese
       "OutputManagementPlan" => nil,
       "PeerReview" => "review",
       "PhysicalObject" => nil,
+      "Poster" => "document",
       "Preprint" => nil,
+      "Presentation" => "presentation",
       "Report" => "report",
       "Service" => nil,
       "Sound" => "song",
@@ -280,6 +284,8 @@ module Bolognese
       "Event" => "Event",
       "ImageObject" => "Image",
       "Movie" => "Audiovisual",
+      "Poster" => "Poster",
+      "PresentationDigitalDocument" => "Presentation",
       "PublicationIssue" => "Text",
       "Report" => "Report",
       "ScholarlyArticle" => "Text",
@@ -326,6 +332,8 @@ module Bolognese
       "Event" => nil,
       "ImageObject" => "graphic",
       "Movie" => "motion_picture",
+      "Poster" => "document",
+      "PresentationDigitalDocument" => "presentation",
       "PublicationIssue" => nil,
       "Report" => "report",
       "ScholarlyArticle" => "article-journal",
@@ -348,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",
@@ -406,7 +416,9 @@ module Bolognese
       "OutputManagementPlan" => nil,
       "PeerReview" => nil,
       "PhysicalObject" => nil,
+      "Poster" => "GEN",
       "Preprint" => nil,
+      "Presentation" => "SLIDE",
       "Report" => "RRPT",
       "Service" => nil,
       "Software" => "COMP",
@@ -419,7 +431,7 @@ module Bolognese
 
     RIS_TO_DC_TRANSLATIONS = {
       "BLOG" => "Text",
-      "GEN" => "Text",
+      "GEN" => "Poster",
       "CTLG" => "Collection",
       "DATA" => "Dataset",
       "FIGURE" => "Image",
@@ -428,7 +440,8 @@ module Bolognese
       "JOUR" => "JournalArticle",
       "COMP" => "Software",
       "VIDEO" => "Audiovisual",
-      "ELEC" => "Text"
+      "ELEC" => "Text",
+      "SLIDE" => "Presentation"
     }
 
     BIB_TO_DC_TRANSLATIONS = {
@@ -452,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 = {
@@ -468,6 +483,8 @@ module Bolognese
       "Event" => "misc",
       "ImageObject" => "misc",
       "Movie" => "misc",
+      "Poster" => "misc",
+      "PresentationDigitalDocument" => "misc",
       "PublicationIssue" => "misc",
       "ScholarlyArticle" => "article",
       "Service" => "misc",
@@ -651,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
@@ -671,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
@@ -932,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,
               }
           }
@@ -1430,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.3.2"
+  VERSION = "2.6.1"
 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.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,13 +11,12 @@ 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'
 
+require "bolognese/citeproc_extensions"
 require "bolognese/version"
 require "bolognese/metadata"
 require "bolognese/cli"

data/resources/kernel-4/include/datacite-contributorType-v4.xsd

@@ -3,7 +3,7 @@
    2013-05 v3.0: Addition of ID to simpleType element, added values "ResearchGroup" & "Other"
    2014-08-20 v3.1: Addition of value "DataCurator"
    2015-05-14 v4.0 dropped value "Funder", use new "funderReference"
-   2024-12-31 v4.6: Addition of value "Translator" -->
+   2024-12-05 v4.6: Addition of value "Translator" -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
   <xs:simpleType name="contributorType" id="contributorType">
     <xs:annotation>

data/resources/kernel-4/include/datacite-dateType-v4.xsd

@@ -3,7 +3,7 @@
      2013-05 v3.0: Addition of ID to simpleType element; addition of value "Collected"; deleted "StartDate" & "EndDate"
      2017-10-23 v4.1: Addition of value "Other"
      2019-02-14 v4.2: Addition of value "Withdrawn"
-     2024-12-31 v4.6: Addition of value "Coverage"-->
+     2024-12-05 v4.6: Addition of value "Coverage"-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
   <xs:simpleType name="dateType" id="dateType">
     <xs:annotation>

data/resources/kernel-4/include/datacite-relatedIdentifierType-v4.xsd

@@ -4,7 +4,7 @@
   2014-08-20 v3.1: Addition of values "arxiv" and "bibcode"
   2015-02-12 v4.0: Addition of value "IGSN"
   2019-02-14 v4.2: Addition of value "w3id"
-  2024-12-31 v4.5: Addition of values "CSTR", "RRID" -->
+  2024-12-05 v4.5: Addition of values "CSTR", "RRID" -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
   <xs:simpleType name="relatedIdentifierType" id="relatedIdentifierType">
     <xs:annotation>
@@ -27,7 +27,9 @@
       <xs:enumeration value="LSID" />
       <xs:enumeration value="PMID" />
       <xs:enumeration value="PURL" />
+      <xs:enumeration value="RAiD" />
       <xs:enumeration value="RRID" />
+      <xs:enumeration value="SWHID" />
       <xs:enumeration value="UPC" />
       <xs:enumeration value="URL" />
       <xs:enumeration value="URN" />

data/resources/kernel-4/include/datacite-relationType-v4.xsd

@@ -5,9 +5,10 @@
   2014-08-20 v3.1: Addition of values "Reviews" & "IsReviewedBy" and "IsDerivedFrom" & "IsSourceOf"
   2017-10-23 v4.1: Addition of values "Describes", "IsDescribedBy", "HasVersion", "IsVersionOf", "Requires", "IsRequiredBy"
   2019-02-14 v4.2: Addition of values "Obsoletes", "IsObsoletedBy"
-  2021-03-05 v4.4: Addition of value "IsPublishedIn"
+  2021-03-05 v4.4: Addition of value "IsPublishedIn" 
   2024-01-22 v4.5: Addition of values "Collects, "IsCollectedBy"
-  2024-12-31 v4.6: Addition of values "HasTranslation", "IsTranslationOf"-->
+  2024-12-05 v4.6: Addition of values "HasTranslation", "IsTranslationOf"
+  2026-03-31 v4.7: Addition of value "Other"-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
   <xs:simpleType name="relationType" id="relationType">
     <xs:annotation>
@@ -52,6 +53,7 @@
       <xs:enumeration value="IsCollectedBy" />
       <xs:enumeration value="HasTranslation" />
       <xs:enumeration value="IsTranslationOf" />
+      <xs:enumeration value="Other" />
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>

data/resources/kernel-4/include/datacite-resourceType-v4.xsd

@@ -5,7 +5,8 @@
      2020-01-14 v4.4: Addition of values "Book", "Book Chapter", "ComputationalNotebook", "ConferencePaper", "ConferenceProceeding".
        "Dissertation", "Journal", "JournalArticle", "OutputManagementPlan", "PeerReview", "Preprint", "Report"
      2024-01-22 v4.5: Addition of values "Instrument", "StudyRegistration"
-     2024-12-31 v4.6: Addition of values "Award", "Project"-->
+     2024-12-05 v4.6: Addition of values "Award", "Project"
+     2026-03-31 v4.7: Addition of values "Poster", "Presentation"-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
   <xs:simpleType name="resourceType" id="resourceType">
     <xs:annotation>
@@ -33,7 +34,9 @@
       <xs:enumeration value="OutputManagementPlan" />
       <xs:enumeration value="PeerReview" />
       <xs:enumeration value="PhysicalObject" />
+      <xs:enumeration value="Poster" />
       <xs:enumeration value="Preprint" />
+      <xs:enumeration value="Presentation" />
       <xs:enumeration value="Project" />
       <xs:enumeration value="Report" />
       <xs:enumeration value="Service" />