bolognese 2.0.0 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23ccf372b59b7d9c8919ec7ad7137eef6e99512eed488977e847f938f389aa2f
-  data.tar.gz: 390e56023d57e637a52776a98dcd0bea4fa0acd8b8459ced05cbc6785f69fe0a
+  metadata.gz: 1a86efd4d59883de399bfae917077f97c5f5e33bd698bc70fc4a3daa40736acc
+  data.tar.gz: da3ac310e177b6ad9733ff56cb9893cfe107c0beb930167b7b8f392dfb2332f4
 SHA512:
-  metadata.gz: 3a7364a75d69846ada1320bc0e8954b72695216d2807ec39ab1694ac4d120d97806addb9ceed8b9da8c1eb06ae28740cf6d2c118cb76a05e15ca993bf81ad470
-  data.tar.gz: 6281527f6b312d398a96b9f1df9be55de991f6ac939417131633b24ddaa24741c3b86c3b2e4e73408ca1350e0b17addf9439ae30dff998bc6dda07e8c4459db7
+  metadata.gz: ee269b568dd16e08da5c10f00155a3e0b55e9725c1d6aa114c6c3a5020dfe05c2df89388a9bc394a6274e86ca81567f4f756dd31bcaf5faa12dff2a7df275308
+  data.tar.gz: 26245d3b2e4553616ba0708047b542f4092240e4cc251ae578de502010ba69a3d6700a5df48f59cd427b7f0eaf498a15cc043cd78ad799572bd589dfcbad6784

data/.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ruby: ["3.0", "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 2.6
+    - name: Set up Ruby 3.1.4
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "2.6"
+        ruby-version: "3.1.4"
 
     - name: Build
       run: |

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (2.0.0)
+    bolognese (2.3.3)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -16,9 +16,9 @@ PATH
       json-ld-preloaded (~> 3.1, >= 3.1.3)
       jsonlint (~> 0.3.0)
       loofah (~> 2.0, >= 2.0.3)
-      maremma (>= 4.9.4, < 5)
+      maremma (~> 5.0)
       namae (~> 1.0)
-      nokogiri (>= 1.13.2, < 1.14)
+      nokogiri (~> 1.16, >= 1.16.2)
       oj (~> 3.10)
       oj_mimic_json (~> 1.0, >= 1.0.1)
       postrank-uri (~> 1.0, >= 1.0.18)
@@ -95,10 +95,10 @@ GEM
       concurrent-ruby (~> 1.0)
     iso8601 (0.9.1)
     json (2.6.2)
-    json-canonicalization (0.3.2)
-    json-ld (3.2.5)
+    json-canonicalization (0.3.1)
+    json-ld (3.2.4)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.3, >= 0.3.2)
+      json-canonicalization (~> 0.3)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (>= 2.2, < 4)
@@ -114,7 +114,7 @@ GEM
     loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    maremma (4.9.9)
+    maremma (5.0.0)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
@@ -125,17 +125,17 @@ GEM
       faraday-follow_redirects (~> 0.3.0)
       faraday-gzip (~> 0.1.0)
       faraday-multipart (~> 1.0.4)
-      nokogiri (>= 1.13.1, < 1.14.0)
+      nokogiri (~> 1.16, >= 1.16.2)
       oj (>= 2.8.3)
       oj_mimic_json (~> 1.0, >= 1.0.1)
     matrix (0.4.2)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.5)
     minitest (5.18.0)
     multi_json (1.15.0)
     multipart-post (2.3.0)
     namae (1.1.1)
-    nokogiri (1.13.9)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.16.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.14.2)
     oj_mimic_json (1.0.1)
@@ -225,6 +225,7 @@ DEPENDENCIES
   bundler (>= 1.0)
   byebug
   hashdiff (>= 1.0.0.beta1, < 2.0.0)
+  json-canonicalization (= 0.3.1)
   rack-test (~> 0)
   rake (~> 12.0)
   rspec (~> 3.4)
@@ -234,4 +235,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   2.4.20
+   2.5.5

data/bolognese.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |s|
   s.version       = Bolognese::VERSION
   s.extra_rdoc_files = ["README.md"]
   s.license       = 'MIT'
-  s.required_ruby_version = ['>=2.3']
+  s.required_ruby_version = ['>=3.0']
 
   # Declare dependencies here, rather than in the Gemfile
-  s.add_dependency 'maremma', '>= 4.9.4', '< 5'
+  s.add_dependency 'maremma', '~> 5.0'
   #s.add_dependency 'faraday', '~> 0.17.3'
-  s.add_dependency 'nokogiri', '>= 1.13.2', '< 1.14'
+  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'
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov', '0.17.1'
   s.add_development_dependency 'hashdiff', ['>= 1.0.0.beta1', '< 2.0.0']
   s.add_development_dependency 'byebug'
+  s.add_development_dependency 'json-canonicalization', '0.3.1'
 
   s.require_paths = ["lib"]
   s.files       = `git ls-files`.split($/)

data/lib/bolognese/author_utils.rb

@@ -30,20 +30,20 @@ module Bolognese
       name_type = parse_attributes(author.fetch("creatorName", nil), content: "nameType", first: true) || parse_attributes(author.fetch("contributorName", nil), content: "nameType", first: true)
 
       name_identifiers = Array.wrap(author.fetch("nameIdentifier", nil)).map do |ni|
-        ni["__content__"] = ni["__content__"].strip
+        name_identifier = ni["__content__"].strip if ni["__content__"].present?
         if ni["nameIdentifierScheme"] == "ORCID"
           {
-            "nameIdentifier" => normalize_orcid(ni["__content__"]),
+            "nameIdentifier" => normalize_orcid(name_identifier),
             "schemeUri" => "https://orcid.org",
             "nameIdentifierScheme" => "ORCID" }.compact
         elsif ni["nameIdentifierScheme"] == "ROR"
           {
-            "nameIdentifier" => normalize_ror(ni["__content__"]),
+            "nameIdentifier" => normalize_ror(name_identifier),
             "schemeUri" => "https://ror.org",
             "nameIdentifierScheme" => "ROR" }.compact
         else
           {
-            "nameIdentifier" => ni["__content__"],
+            "nameIdentifier" => name_identifier,
             "schemeUri" => ni.fetch("schemeURI", nil),
             "nameIdentifierScheme" => ni["nameIdentifierScheme"] }.compact
         end

data/lib/bolognese/datacite_utils.rb

@@ -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
 

data/lib/bolognese/metadata_utils.rb

@@ -96,7 +96,7 @@ module Bolognese
       if container.present?
         container["title"]
       elsif types["citeproc"] == "article-journal"
-        publisher
+        publisher["name"] if publisher.present?
       else
         nil
       end
@@ -153,6 +153,7 @@ module Bolognese
         "language" => language,
         "author" => author,
         "contributor" => to_citeproc(contributors),
+        "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),
         "abstract" => parse_attributes(descriptions, content: "description", first: true),

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))
 
         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,
@@ -276,13 +282,15 @@ 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_role == "editor" ? "Editor" : nil }.compact
+              "contributorType" => contributor_type }.compact
           else
             { "nameType" => "Organizational",
               "name" => a["name"] || a["__content__"] }
@@ -362,6 +370,32 @@ 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
     end
   end
 end

data/lib/bolognese/readers/datacite_reader.rb

@@ -101,7 +101,7 @@ module Bolognese
             { "name" => r.strip }
           elsif r.is_a?(Hash)
             {
-              "name" => r["__content__"].strip,
+              "name" => r["__content__"].present? ? r["__content__"].strip : nil,
               "publisherIdentifier" => r["publisherIdentifierScheme"] == "ROR" ? normalize_ror(r["publisherIdentifier"]) : r["publisherIdentifier"],
               "publisherIdentifierScheme" => r["publisherIdentifierScheme"],
               "schemeUri" => r["schemeURI"],

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,8 +76,17 @@ 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))))
-        publisher_name = parse_attributes(meta.fetch("publisher", nil), content: "name", first: true)
-        publisher = { "name" => publisher_name } if publisher_name.present?
+        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),
+          "publisherIdentifier" => parse_attributes(meta.fetch("publisher", nil), content: "@id", first: true),
+        }.compact if meta.fetch("publisher", nil).present?
 
         ct = (schema_org == "Dataset") ? "includedInDataCatalog" : "Periodical"
         container = if meta.fetch(ct, nil).present?
@@ -103,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"])
@@ -124,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)
@@ -237,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

@@ -78,7 +78,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 = {
@@ -600,12 +602,12 @@ module Bolognese
     end
 
     def validate_orcid(orcid)
-      orcid = Array(/\A(?:(?:http|https):\/\/(?:(?:www|sandbox)?\.)?orcid\.org\/)?(\d{4}[[:space:]-]\d{4}[[:space:]-]\d{4}[[:space:]-]\d{3}[0-9X]+)\z/.match(orcid)).last
+      orcid = Array(/\A(?:(?:http|https):\/\/(?:(?:www|sandbox)?\.)?orcid\.org\/)?(\d{4}[[:space:]-]\d{4}[[:space:]-]\d{4}[[:space:]-]\d{3}[0-9X]+)\/{0,1}\z/.match(orcid)).last
       orcid.gsub(/[[:space:]]/, "-") if orcid.present?
     end
 
     def validate_ror(ror)
-      Array(/^(?:(?:(?:http|https):\/\/)?ror\.org\/)?(0\w{6}\d{2})$/.match(ror)).last
+      Array(/^(?:(?:(?:http|https):\/\/)?ror\.org\/)?(0\w{6}\d{2})\/{0,1}$/.match(ror)).last
     end
 
     def validate_orcid_scheme(orcid_scheme)
@@ -825,7 +827,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 +842,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
 
@@ -1234,7 +1237,9 @@ module Bolognese
         "urn" => "URN",
         "md5" => "md5",
         "minid" => "minid",
-        "dataguid" => "dataguid"
+        "dataguid" => "dataguid",
+        "cstr" => "CSTR",
+        "rrid" => "RRID"
       }
 
       identifierTypes[identifier_type.downcase] || identifier_type

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "2.0.0"
+  VERSION = "2.3.3"
 end

data/lib/bolognese/writers/datacite_json_writer.rb

@@ -4,11 +4,8 @@ module Bolognese
   module Writers
     module DataciteJsonWriter
       def datacite_json
-        # Remove the following change for the schema 4.5 release
         if crosscite_hsh.present?
-          datacite_json_hsh = crosscite_hsh
-          datacite_json_hsh['publisher'] = self.publisher['name'] if self.publisher&.respond_to?(:to_hash) && self.publisher.has_key?('name') && !self.publisher['name'].blank?
-          JSON.pretty_generate datacite_json_hsh.transform_keys! { |key| key.camelcase(uppercase_first_letter = :lower) }
+          JSON.pretty_generate crosscite_hsh.transform_keys! { |key| key.camelcase(uppercase_first_letter = :lower) }
         end
       end
     end

data/lib/bolognese/writers/jats_writer.rb

@@ -86,7 +86,10 @@ module Bolognese
       end
 
       def insert_publisher_name(xml)
-        xml.send("publisher-name", publisher["name"])
+        attributes = {
+          "xml:lang" => publisher["lang"]
+        }.compact
+        xml.send("publisher-name", attributes, publisher["name"])
       end
 
       def insert_publication_date(xml)

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,12 +34,14 @@ 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,
           "periodical" => types.present? ? ((types["schemaOrg"] != "Dataset") && container.present? ? to_schema_org(container) : nil) : nil,
           "includedInDataCatalog" => types.present? ? ((types["schemaOrg"] == "Dataset") && container.present? ? to_schema_org_container(container, type: "Dataset") : nil) : nil,
-          "publisher" => publisher.present? ? { "@type" => "Organization", "name" => publisher["name"] } : nil,
+          "publisher" => publisher.present? ? { "@type" => "Organization", "@id" => publisher["publisherIdentifier"], "name" => publisher["name"] }.compact : nil,
           "funder" => to_schema_org_funder(funding_references),
           "provider" => agency.present? ? { "@type" => "Organization", "name" => agency } : nil
         }.compact.presence

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

@@ -2,7 +2,8 @@
 <!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
    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" -->
+   2015-05-14 v4.0 dropped value "Funder", use new "funderReference"
+   2024-12-31 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>
@@ -29,6 +30,7 @@
       <xs:enumeration value="Researcher" />
       <xs:enumeration value="Sponsor" />
       <xs:enumeration value="Supervisor" />
+      <xs:enumeration value="Translator" />
       <xs:enumeration value="WorkPackageLeader" />
     </xs:restriction>
   </xs:simpleType>

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

@@ -2,7 +2,8 @@
 <!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
      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"-->
+     2019-02-14 v4.2: Addition of value "Withdrawn"
+     2024-12-31 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>
@@ -13,6 +14,7 @@
       <xs:enumeration value="Available" />
       <xs:enumeration value="Collected" />
       <xs:enumeration value="Copyrighted" />
+      <xs:enumeration value="Coverage" />
       <xs:enumeration value="Created" />
       <xs:enumeration value="Issued" />
       <xs:enumeration value="Other" />

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

@@ -2,8 +2,9 @@
 <!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
   2013-05 v3.0: Addition of ID to simpleType element; addition of value "PMID"
   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" -->
+  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" -->
 <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>
@@ -13,6 +14,7 @@
       <xs:enumeration value="ARK" />
       <xs:enumeration value="arXiv" />
       <xs:enumeration value="bibcode" />
+      <xs:enumeration value="CSTR" />
       <xs:enumeration value="DOI" />
       <xs:enumeration value="EAN13" />
       <xs:enumeration value="EISSN" />
@@ -25,6 +27,7 @@
       <xs:enumeration value="LSID" />
       <xs:enumeration value="PMID" />
       <xs:enumeration value="PURL" />
+      <xs:enumeration value="RRID" />
       <xs:enumeration value="UPC" />
       <xs:enumeration value="URL" />
       <xs:enumeration value="URN" />

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

@@ -3,9 +3,11 @@
   2011-01-13 v1.0 - FZ, TIB, Germany
   2013-05 v3.0: Addition of ID to simpleType element, addition of values "IsIdenticalTo", "HasMetadata" & "IsMetadataFor"
   2014-08-20 v3.1: Addition of values "Reviews" & "IsReviewedBy" and "IsDerivedFrom" & "IsSourceOf"
-  2017-10-23 v.4.1: Addition of values "Describes", "IsDescribedBy", "HasVersion", "IsVersionOf", "Requires", "IsRequiredBy"
-  2019-02-14 v.4.2: Addition of values "Obsoletes", "IsObsoletedBy"
-  2021-03-05 v.4.4: Addition of value "IsPublishedIn" -->
+  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"
+  2024-01-22 v4.5: Addition of values "Collects, "IsCollectedBy"
+  2024-12-31 v4.6: Addition of values "HasTranslation", "IsTranslationOf"-->
 <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>
@@ -48,6 +50,8 @@
       <xs:enumeration value="IsObsoletedBy" />
       <xs:enumeration value="Collects" />
       <xs:enumeration value="IsCollectedBy" />
+      <xs:enumeration value="HasTranslation" />
+      <xs:enumeration value="IsTranslationOf" />
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>

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

@@ -3,7 +3,9 @@
      2013-05 v3.0: Addition of ID to simpleType element; added values "Audiovisual", "Workflow" & "Other"; deleted value "Film"
      2017-10-23 v4.1: Addition of value "DataPaper"
      2020-01-14 v4.4: Addition of values "Book", "Book Chapter", "ComputationalNotebook", "ConferencePaper", "ConferenceProceeding".
-       "Dissertation", "Journal", "JournalArticle", "OutputManagementPlan", "PeerReview", "Preprint", "Report" -->
+       "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"-->
 <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>
@@ -11,6 +13,7 @@
     </xs:annotation>
     <xs:restriction base="xs:string">
       <xs:enumeration value="Audiovisual" />
+      <xs:enumeration value="Award" />
       <xs:enumeration value="Book" />
       <xs:enumeration value="BookChapter" />
       <xs:enumeration value="Collection" />
@@ -31,6 +34,7 @@
       <xs:enumeration value="PeerReview" />
       <xs:enumeration value="PhysicalObject" />
       <xs:enumeration value="Preprint" />
+      <xs:enumeration value="Project" />
       <xs:enumeration value="Report" />
       <xs:enumeration value="Service" />
       <xs:enumeration value="Software" />

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
   2013-05 v3.0: Addition of ID to simpleType element
-  2015-02-12 v4.0 Added value "Other" -->
+  2015-02-12 v4.0: Added 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="titleType" id="titleType">
     <xs:restriction base="xs:string">

data/resources/kernel-4/metadata.xsd

@@ -13,7 +13,8 @@
   2019-02-14 v4.2: Addition of dateType value "Withdrawn", relationType values "Obsoletes", "isObsoletedBy", addition of new subproperties for Rights: rightsIdentifier, rightsIdentifierScheme, schemeURI, addition of the XML language attribute to the properties Creator, Contributor and Publisher for organizational names, don't check format of DOI
   2019-07-13 v4.3: Addition of new subproperties for Affiliation: "affiliationIdentifier", "affiliationIdentifierScheme", "schemeURI", addition of new sub-property for funderIdentifier: "schemeURI", addition of new funderIdentifierScheme: "ROR", added documentation for nameIdentifier 
   2021-03-08 v4.4: Addition of new property relatedItem, relationType value "isPublishedIn", subject subproperty "classificationCode", controlled list "numberType", additional 13 properties for controlled list "resourceType" 
-  2023-??-?? v4.5: Addition of new subproperties for publisher: "publisherIdentifier", "publisherIdentifierScheme", and "schemeURI"; addition of new resourceTypeGeneral values "Instrument" and "StudyRegistration"; addition of new relationType values "Collects" and "IsCollectedBy".-->
+  2024-01-22 v4.5: Addition of new subproperties for publisher: "publisherIdentifier", "publisherIdentifierScheme", and "schemeURI"; addition of new resourceTypeGeneral values "Instrument" and "StudyRegistration"; addition of new relationType values "Collects" and "IsCollectedBy".
+  2024-12-31 v4.6: Addition of new resourceTypeGeneral values "Award" and "Project"; addiition of new relatedIdentifierType values "CSTR" and "RRID"; addition of new contributorType "Translator"; addition of new relationTypes "HasTranslation" and "IsTranslationOf"; addition of new dateType "Coverage".-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified" xml:lang="EN">
   <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="include/xml.xsd" />
   <xs:include schemaLocation="include/datacite-titleType-v4.xsd" />