bolognese 1.10.0 → 2.3.2

data/spec/readers/schema_org_reader_spec.rb

@@ -31,7 +31,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5438/55e5-t5c0", "relatedIdentifierType"=>"DOI", "relationType"=>"References")
-      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publisher).to eq({"name"=>"DataCite"})
     end
 
     it "BlogPosting with new DOI" do
@@ -59,7 +59,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5438/55e5-t5c0", "relatedIdentifierType"=>"DOI", "relationType"=>"References")
-      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publisher).to eq({"name"=>"DataCite"})
     end
 
     it "zenodo" do
@@ -104,7 +104,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.titles).to eq([{"title"=>"Hydrological and meteorological investigations in a lake near Kangerlussuaq, west Greenland"}])
       expect(subject.creators.size).to eq(8)
       expect(subject.creators.first).to eq("nameType" => "Personal", "name"=>"Johansson, Emma", "givenName"=>"Emma", "familyName"=>"Johansson")
-      expect(subject.publisher).to eq("PANGAEA")
+      expect(subject.publisher).to eq({"name"=>"PANGAEA"})
       expect(subject.publication_year).to eq("2014")
     end
 
@@ -169,7 +169,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5438/55e5-t5c0", "relatedIdentifierType"=>"DOI", "relationType"=>"References")
-      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publisher).to eq({"name"=>"DataCite", "publisherIdentifier"=>"https://ror.org/04wxnsj81"})
     end
 
     it "GTEx dataset" do
@@ -189,7 +189,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.dates).to eq([{"date"=>"2017", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2017")
       expect(subject.container).to eq("title"=>"GTEx", "type"=>"DataRepository")
-      expect(subject.publisher).to eq("GTEx")
+      expect(subject.publisher).to eq({"name"=>"GTEx"})
       expect(subject.funding_references.length).to eq(7)
       expect(subject.funding_references.first).to eq("funderIdentifier"=>"https://doi.org/10.13039/100000052", "funderIdentifierType"=>"Crossref Funder ID", "funderName"=>"Common Fund of the Office of the Director of the NIH")
     end
@@ -209,7 +209,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.subjects).to eq([{"subject"=>"topmed"}, {"subject"=>"whole genome sequencing"}])
       expect(subject.dates).to eq([{"date"=>"2017-11-30", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2017")
-      expect(subject.publisher).to eq("TOPMed")
+      expect(subject.publisher).to eq({"name"=>"TOPMed"})
       expect(subject.related_identifiers).to eq([{"relatedIdentifier"=>"10.23725/2g4s-qv04", "relatedIdentifierType"=>"DOI", "relationType"=>"References", "resourceTypeGeneral"=>"Dataset"}])
       expect(subject.funding_references).to eq([{"funderIdentifier"=>"https://doi.org/10.13039/100000050", "funderIdentifierType"=>"Crossref Funder ID", "funderName"=>"National Heart, Lung, and Blood Institute (NHLBI)"}])
     end
@@ -240,7 +240,7 @@ describe Bolognese::Metadata, vcr: true do
         {"subject"=>"Sierra (mountain range)"}])
       expect(subject.dates).to eq([{"date"=>"2013", "dateType"=>"Issued"}, {"date"=>"2014-10-17", "dateType"=>"Updated"}])
       expect(subject.publication_year).to eq("2013")
-      expect(subject.publisher).to eq("UC Merced")
+      expect(subject.publisher).to eq({"name"=>"UC Merced"})
       expect(subject.funding_references).to eq([{"funderName"=>"National Science Foundation, Division of Earth Sciences, Critical Zone Observatories"}])
       expect(subject.geo_locations).to eq([{"geoLocationPlace"=>"Providence Creek (Lower, Upper and P301)", "geoLocationPoint"=>{"pointLatitude"=>"37.047756", "pointLongitude"=>"-119.221094"}}])
     end
@@ -258,7 +258,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.titles).to eq([{"title"=>"Registry of all stations from the Tara Oceans Expedition (2009-2013)"}])
       expect(subject.dates).to eq([{"date"=>"2015-02-03", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2015")
-      expect(subject.publisher).to eq("PANGAEA")
+      expect(subject.publisher).to eq({"name"=>"PANGAEA"})
       expect(subject.geo_locations).to eq([{"geoLocationBox"=>{"eastBoundLongitude"=>"174.9006", "northBoundLatitude"=>"79.6753", "southBoundLatitude"=>"-64.3088", "westBoundLongitude"=>"-168.5182"}}])
     end
 
@@ -280,7 +280,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.subjects).to eq([{"subject"=>"topmed"}, {"subject"=>"whole genome sequencing"}])
       expect(subject.dates).to eq([{"date"=>"2017-11-30", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2017")
-      expect(subject.publisher).to eq("TOPMed")
+      expect(subject.publisher).to eq({"name"=>"TOPMed"})
       expect(subject.funding_references).to eq([{"funderIdentifier"=>"https://doi.org/10.13039/100000050", "funderIdentifierType"=>"Crossref Funder ID", "funderName"=>"National Heart, Lung, and Blood Institute (NHLBI)"}])
     end
 
@@ -299,7 +299,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.dates).to eq([{"date"=>"2019-01-09", "dateType"=>"Issued"}, {"date"=>"2019-01-09", "dateType"=>"Created"}, {"date"=>"2019-01-09", "dateType"=>"Updated"}])
       expect(subject.publication_year).to eq("2019")
       expect(subject.id).to eq("https://doi.org/10.23698/aida/drov")
-      expect(subject.publisher).to eq("AIDA")
+      expect(subject.publisher).to eq({"name"=>"AIDA"})
       expect(subject.rights_list).to eq([{"rights"=>"Restricted access", "rightsUri"=>"https://datasets.aida.medtech4health.se/10.23698/aida/drov#license"}])
       expect(subject.id).to eq("https://doi.org/10.23698/aida/drov")
     end
@@ -332,7 +332,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.descriptions.first["description"]).to start_with("The dataset contains a sample of metadata describing papers")
       expect(subject.dates).to eq([{"date"=>"2013-04-03", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2013")
-      expect(subject.publisher).to eq("Zenodo")
+      expect(subject.publisher).to eq({"name"=>"Zenodo"})
       expect(subject.funding_references).to eq([{"awardNumber"=>"246686",
         "awardTitle"=>"Open Access Infrastructure for Research in Europe",
         "awardUri"=>"info:eu-repo/grantAgreement/EC/FP7/246686/",
@@ -340,5 +340,32 @@ describe Bolognese::Metadata, vcr: true do
         "funderIdentifierType"=>"Crossref Funder ID",
         "funderName"=>"European Commission"}])
     end
+
+    it "Schema 4.6 attributes" do
+      input = fixture_path + 'schema_org_4.6_attributes.json'
+      subject = Bolognese::Metadata.new(input: input)
+
+      expect(subject.related_identifiers).to eq(
+        [
+          {"relatedIdentifier"=>"10.1234/translated-version", "relatedIdentifierType"=>"DOI", "relationType"=>"HasTranslation"},
+          {"relatedIdentifier"=>"10.1234/other-version", "relatedIdentifierType"=>"DOI", "relationType"=>"IsTranslationOf"},
+        ]
+      )
+      expect(subject.dates).to eq(
+        [
+          {"date"=>"2023-01-01", "dateType"=>"Issued"},
+          {"date"=>"2023-01-01", "dateType"=>"Created"},
+          {"date"=>"2023-01-01", "dateType"=>"Updated"},
+          {"date"=>"2020-01-01", "dateType"=>"Coverage"}
+        ]
+      )
+      expect(subject.contributors).to eq(
+        [
+          {"name"=>"Doe, Jane", "givenName"=>"Jane", "familyName"=>"Doe", "nameType"=>"Personal", "affiliation"=>[{"name"=>"ExampleAffiliation", "affiliationIdentifier"=>"https://ror.org/04wxnsj81", "affiliationIdentifierScheme"=>"ROR"}], "nameIdentifiers"=>[{"nameIdentifier"=>"https://orcid.org/0000-0003-1419-2405", "schemeUri"=>"https://orcid.org", "nameIdentifierScheme"=>"ORCID"}]},
+          {"name"=>"Smith, John", "givenName"=>"John", "familyName"=>"Smith", "nameType"=>"Personal", "affiliation"=>[{"name"=>"ExampleAffiliation", "affiliationIdentifier"=>"https://ror.org/04wxnsj81", "affiliationIdentifierScheme"=>"ROR"}]},
+          {"name"=>"Ross, Cody", "givenName"=>"Cody", "familyName"=>"Ross", "nameType"=>"Personal", "affiliation"=>[{"name"=>"ExampleAffiliation", "affiliationIdentifier"=>"https://ror.org/04wxnsj81", "affiliationIdentifierScheme"=>"ROR"}], "nameIdentifiers"=>[{"nameIdentifier"=>"https://orcid.org/0000-0003-1419-2405", "schemeUri"=>"https://orcid.org", "nameIdentifierScheme"=>"ORCID"}], "contributorType"=>"Translator"},
+        ]
+      )
+    end
   end
 end

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ require 'webmock/rspec'
 require 'rspec/xsd'
 require 'nokogiri'
 require 'vcr'
+require 'byebug'
 
 RSpec.configure do |config|
   config.order = :random

data/spec/writers/citation_writer_spec.rb

@@ -48,5 +48,14 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.locale).to eq("en-US")
       expect(subject.citation).to eq("Clark, D. (2019). <i>Exploring the \"Many analysts, one dataset\" project from COS</i>. Gigantum, Inc. https://doi.org/10.34747/g6yb-3412")
     end
+
+    it "journal article with container title" do
+      input = fixture_path + "datacite_journal_article.xml"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite")
+      expect(subject.types["citeproc"]).to eq("article-journal")
+      expect(subject.style).to eq("apa")
+      expect(subject.locale).to eq("en-US")
+      expect(subject.citation).to eq('Feldman, H. L. (1995). Science and Uncertainty in Mass Exposure Litigation. <i>Texas Law Review</i>. https://doi.org/10.60843/5egy-vc42')
+    end
   end
 end

data/spec/writers/citeproc_writer_spec.rb

@@ -286,5 +286,14 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["DOI"]).to eq("10.34747/g6yb-3412")
       expect(json["issued"]).to eq("date-parts"=>[[2019]])
     end
+
+    it "from Schema 4.6 with Translator contributor" do
+      input = fixture_path + 'datacite-example-full-v4.6.xml'
+      subject = Bolognese::Metadata.new(input: input)
+      json = JSON.parse(subject.citeproc)
+      expect(json["translator"]).to eq([
+        {"family"=>"Doe", "given"=>"Jane"},
+      ])
+    end
   end
 end

data/spec/writers/crosscite_writer_spec.rb

@@ -46,6 +46,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite.dig("descriptions", 0, "description")).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
       expect(crosscite.fetch("creators").count).to eq(5)
       expect(crosscite.fetch("creators").first).to eq("nameType"=>"Personal", "name"=>"Sankar, Martial", "givenName"=>"Martial", "familyName"=>"Sankar")
+      expect(crosscite.fetch("publisher")).to eq({"name"=>"{eLife} Sciences Organisation, Ltd."})
     end
 
     it "BlogPosting Citeproc JSON" do
@@ -57,6 +58,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite.fetch("titles")).to eq([{"title"=>"Eating your own Dog Food"}])
       expect(crosscite.dig("descriptions", 0, "description")).to start_with("Eating your own dog food")
       expect(crosscite.fetch("creators")).to eq([{"familyName"=>"Fenner", "givenName"=>"Martin", "name"=>"Fenner, Martin"}])
+      expect(crosscite.fetch("publisher")).to eq({"name"=>"DataCite"})
     end
 
     it "rdataone" do
@@ -67,6 +69,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite["creators"].length).to eq(3)
       expect(crosscite["creators"].last).to eq("nameType" => "Organizational", "name"=>"University Of California, Santa Barbara", "nameIdentifiers" => [], "affiliation" => [])
       expect(crosscite["version"]).to eq("2.0.0")
+      expect(crosscite["publisher"]).to eq({"name"=>"https://cran.r-project.org"})
     end
 
     it "rdataone codemeta v2" do
@@ -77,6 +80,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite["creators"].length).to eq(3)
       expect(crosscite["creators"].last).to eq("nameType" => "Organizational", "name"=>"University Of California, Santa Barbara", "nameIdentifiers" => [], "affiliation" => [])
       expect(crosscite["version"]).to eq("2.0.0")
+      expect(crosscite["publisher"]).to eq({"name"=>"https://cran.r-project.org"})
     end
 
     it "datacite database attributes" do
@@ -91,6 +95,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite.fetch("publication_year")).to eq("2011")
       expect(crosscite.fetch("provider_id")).to eq("dryad")
       expect(crosscite.fetch("client_id")).to eq("dryad.dryad")
+      expect(crosscite.fetch("publisher")).to eq({"name"=>"Dryad"})
     end
 
     it "maremma" do
@@ -106,6 +111,7 @@ describe Bolognese::Metadata, vcr: true do
           [{"nameIdentifier"=>"https://orcid.org/0000-0003-0077-4738",
             "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}],
         "nameType"=>"Personal"}])
+      expect(crosscite.fetch("publisher")).to eq({"name"=>"DataCite"})
     end
 
     it "with data citation schema.org" do
@@ -117,6 +123,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite.fetch("related_identifiers").count).to eq(3)
       expect(crosscite.fetch("related_identifiers").first).to eq("relatedIdentifier"=>"10.5438/0000-00ss", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
       expect(crosscite.fetch("related_identifiers").last).to eq("relatedIdentifier"=>"10.5438/55e5-t5c0", "relatedIdentifierType"=>"DOI", "relationType"=>"References")
+      expect(crosscite.fetch("publisher")).to eq({"name"=>"DataCite"})
     end
   end
 end

data/spec/writers/datacite_json_writer_spec.rb

@@ -18,6 +18,7 @@ describe Bolognese::Metadata, vcr: true do
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by/3.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
+      expect(datacite.fetch("publisher")).to eq({"name"=>"eLife Sciences Publications, Ltd"})
     end
 
     it "with ORCID ID" do
@@ -28,6 +29,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(datacite.fetch("creators").length).to eq(7)
       expect(datacite.fetch("creators").first).to eq("nameType"=>"Personal", "name"=>"Thanassi, Wendy", "givenName"=>"Wendy", "familyName"=>"Thanassi", "affiliation" => [{"name"=>"Department of Medicine, Veterans Affairs Palo Alto Health Care System, 3801 Miranda Avenue MC-, Palo Alto, CA 94304-1207, USA"}, {"name"=>"Occupational Health Strategic Health Care Group, Office of Public Health, Veterans Health Administration, Washington, DC 20006, USA"}, {"name"=>"Division of Emergency Medicine, Stanford University School of Medicine, Stanford, CA 94304, USA"}, {"name"=>"War Related Illness and Injury Study Center (WRIISC) and Mental Illness Research Education and Clinical Center (MIRECC), Department of Veterans Affairs, Palo Alto, CA 94304, USA"}])
+      expect(datacite.fetch("publisher")).to eq({"name"=>"Hindawi Limited"})
     end
 
     it "Crossref DOI" do
@@ -39,6 +41,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.dig("descriptions", 0, "description")).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
       expect(datacite.fetch("creators").length).to eq(5)
       expect(datacite.fetch("creators").first).to eq("nameType"=>"Personal", "name"=>"Sankar, Martial", "givenName"=>"Martial", "familyName"=>"Sankar")
+      expect(datacite.fetch("publisher")).to eq({"name"=>"{eLife} Sciences Organisation, Ltd."})
     end
 
     it "BlogPosting Citeproc JSON" do
@@ -49,6 +52,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.fetch("titles")).to eq([{"title"=>"Eating your own Dog Food"}])
       expect(datacite.dig("descriptions", 0, "description")).to start_with("Eating your own dog food")
       expect(datacite.fetch("creators")).to eq([{"familyName"=>"Fenner", "givenName"=>"Martin", "name"=>"Fenner, Martin"}])
+      expect(datacite.fetch("publisher")).to eq({"name"=>"DataCite"})
     end
 
     it "rdataone" do
@@ -60,6 +64,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.fetch("creators").first).to eq("affiliation"=>[{"name"=>"NCEAS"}], "nameType"=>"Personal", "name" => "Jones, Matt",
         "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0003-0077-4738", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "givenName"=>"Matt", "familyName"=>"Jones")
       expect(datacite.fetch("version")).to eq("2.0.0")
+      expect(datacite.fetch("publisher")).to eq({"name"=>"https://cran.r-project.org"})
     end
 
     it "maremma" do
@@ -75,6 +80,7 @@ describe Bolognese::Metadata, vcr: true do
          [{"nameIdentifier"=>"https://orcid.org/0000-0003-0077-4738",
            "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}],
         "nameType"=>"Personal"}])
+      expect(datacite.fetch("publisher")).to eq({"name"=>"DataCite"})
     end
 
     it "with data citation schema.org" do
@@ -85,6 +91,22 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.fetch("titles")).to eq([{"title"=>"Eating your own Dog Food"}])
       expect(datacite.fetch("relatedIdentifiers").count).to eq(3)
       expect(datacite.fetch("relatedIdentifiers").first).to eq("relatedIdentifier"=>"10.5438/0000-00ss", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
+      expect(datacite.fetch("publisher")).to eq({"name"=>"DataCite"})
+    end
+
+    it "DataCite DOI with Schema 4.5 publisher attributes" do
+      input = fixture_path + "datacite-example-full-v4.5.xml"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite")
+      datacite = JSON.parse(subject.datacite_json)
+      expect(datacite.fetch("publisher")).to eq(
+        {
+          "name" => "Example Publisher",
+          "publisherIdentifier" => "https://ror.org/04z8jg394",
+          "publisherIdentifierScheme" => "ROR",
+          "schemeUri" => "https://ror.org/",
+          "lang" => "en",
+        },
+      )
     end
   end
 end

data/spec/writers/datacite_writer_spec.rb

@@ -17,6 +17,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.dig("rightsList", "rights")).to eq("rightsURI"=>"https://creativecommons.org/licenses/by/3.0/legalcode", "rightsIdentifier"=>"cc-by-3.0", "rightsIdentifierScheme"=>"SPDX", "schemeURI"=>"https://spdx.org/licenses/", "__content__"=>"Creative Commons Attribution 3.0 Unported")
       expect(datacite.dig("fundingReferences", "fundingReference").count).to eq(4)
       expect(datacite.dig("fundingReferences", "fundingReference").last).to eq("funderName"=>"University of Lausanne", "funderIdentifier" => {"funderIdentifierType"=>"Crossref Funder ID", "__content__"=>"https://doi.org/10.13039/501100006390"})
+      expect(datacite.dig("publisher")).to eq("eLife Sciences Publications, Ltd")
     end
 
     it "with ORCID ID" do
@@ -31,6 +32,7 @@ describe Bolognese::Metadata, vcr: true do
         "givenName" => "Beatriz",
         "affiliation" => ["War Related Illness and Injury Study Center (WRIISC) and Mental Illness Research Education and Clinical Center (MIRECC), Department of Veterans Affairs, Palo Alto, CA 94304, USA", "Department of Psychiatry and Behavioral Sciences, Stanford University School of Medicine, Stanford, CA 94304, USA"],
         "nameIdentifier" => {"nameIdentifierScheme"=>"ORCID", "schemeURI"=>"https://orcid.org", "__content__"=>"https://orcid.org/0000-0003-2043-4925"})
+      expect(datacite.dig("publisher")).to eq("Hindawi Limited")
     end
 
     it "with editor" do
@@ -39,6 +41,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("contributors", "contributor")).to eq("contributorName"=>{"__content__"=>"Janbon, Guilhem", "nameType"=>"Personal"}, "contributorType"=>"Editor", "familyName"=>"Janbon", "givenName"=>"Guilhem")
+      expect(datacite.dig("publisher")).to eq("Public Library of Science (PLoS)")
     end
 
     it "Crossref DOI" do
@@ -52,6 +55,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.dig("descriptions", "description", 1, "__content__")).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
       expect(datacite.dig("creators", "creator").count).to eq(5)
       expect(datacite.dig("creators", "creator").first).to eq("creatorName"=>{"__content__"=>"Sankar, Martial", "nameType"=>"Personal"}, "familyName"=>"Sankar", "givenName"=>"Martial")
+      expect(datacite.dig("publisher")).to eq("{eLife} Sciences Organisation, Ltd.")
     end
 
     it "BlogPosting Citeproc JSON" do
@@ -64,6 +68,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.dig("descriptions", "description").first).to eq("__content__"=>"DataCite Blog", "descriptionType"=>"SeriesInformation")
       expect(datacite.dig("descriptions", "description", 1, "__content__")).to start_with("Eating your own dog food")
       expect(datacite.dig("creators", "creator")).to eq("creatorName"=>"Fenner, Martin", "familyName"=>"Fenner", "givenName"=>"Martin")
+      expect(datacite.dig("publisher")).to eq("DataCite")
     end
 
     it "rdataone" do
@@ -88,6 +93,7 @@ describe Bolognese::Metadata, vcr: true do
                                                           "__content__"=>"https://orcid.org/0000-0002-2192-403X"}},
                                                          {"creatorName"=>{"__content__"=>"University Of California, Santa Barbara", "nameType"=>"Organizational"}}])
       expect(datacite.fetch("version")).to eq("2.0.0")
+      expect(datacite.dig("publisher")).to eq("https://cran.r-project.org")
     end
 
     it "rdataone and codemeta_v2" do
@@ -112,6 +118,7 @@ describe Bolognese::Metadata, vcr: true do
                                                           "__content__"=>"https://orcid.org/0000-0002-2192-403X"}},
                                                          {"creatorName"=>{"__content__"=>"University Of California, Santa Barbara", "nameType"=>"Organizational"}}])
       expect(datacite.fetch("version")).to eq("2.0.0")
+      expect(datacite.dig("publisher")).to eq("https://cran.r-project.org")
     end
 
     it "maremma" do
@@ -121,6 +128,7 @@ describe Bolognese::Metadata, vcr: true do
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("titles", "title")).to eq("Maremma: a Ruby library for simplified network calls")
       expect(datacite.dig("creators", "creator")).to eq("affiliation"=>"DataCite", "creatorName"=> {"__content__"=>"Fenner, Martin", "nameType"=>"Personal"}, "givenName"=>"Martin", "familyName"=>"Fenner", "nameIdentifier"=>{"__content__"=>"https://orcid.org/0000-0003-0077-4738", "nameIdentifierScheme"=>"ORCID", "schemeURI"=>"https://orcid.org"})
+      expect(datacite.dig("publisher")).to eq("DataCite")
     end
 
     it "with version" do
@@ -146,7 +154,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.dates).to eq([{"date"=>"2015-08-19", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2015")
       expect(subject.version_info).to eq("v0.3.2")
-      expect(subject.publisher).to eq("Zenodo")
+      expect(subject.publisher).to eq({"name"=>"Zenodo"})
       expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
       expect(subject.datacite).to include("<version>v0.3.2</version>")
@@ -168,7 +176,7 @@ describe Bolognese::Metadata, vcr: true do
         "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.dates).to eq([{"date"=>"2017-06-28", "dateType"=>"Created"}, {"date"=>"2017-06-28", "dateType"=>"Updated"}, {"date"=>"2017", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2017")
-      expect(subject.publisher).to eq("Figshare")
+      expect(subject.publisher).to eq({"name"=>"Figshare"})
       expect(subject.subjects).to eq([{"subject"=>"Information Systems"},
        {"schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf",
         "subject"=>"FOS: Computer and information sciences",
@@ -194,7 +202,7 @@ describe Bolognese::Metadata, vcr: true do
         "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.dates).to eq([{"date"=>"2017-06-28", "dateType"=>"Created"}, {"date"=>"2017-06-28", "dateType"=>"Updated"}, {"date"=>"2017", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2017")
-      expect(subject.publisher).to eq("Figshare")
+      expect(subject.publisher).to eq({"name"=>"Figshare"})
       expect(subject.subjects).to eq([{"subject"=>"Information Systems"},
        {"schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf",
         "subject"=>"FOS: Computer and information sciences",
@@ -223,12 +231,13 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("relatedIdentifier" => "10.1371/journal.ppat.1000446",
         "relatedIdentifierType" => "DOI","relationType"=>"Cites")
-      expect(subject.publisher).to eq("Dryad")
+      expect(subject.publisher).to eq({"name"=>"Dryad"})
       expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
 
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.fetch("xsi:schemaLocation", "").split(" ").first).to eq("http://datacite.org/schema/kernel-4")
+      expect(datacite.dig("publisher")).to eq("Dryad")
     end
 
     it "Affiliation" do
@@ -248,13 +257,154 @@ describe Bolognese::Metadata, vcr: true do
         "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.dates).to eq([{"date"=>"2014-10-17", "dateType"=>"Updated"}, {"date"=>"2016-03-14T17:02:02Z", "dateType"=>"Available"}, {"date"=>"2013", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2013")
-      expect(subject.publisher).to eq("UC Merced")
+      expect(subject.publisher).to eq({"name"=>"UC Merced"})
       expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
 
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.fetch("xsi:schemaLocation", "").split(" ").first).to eq("http://datacite.org/schema/kernel-4")
       expect(datacite.dig("creators", "creator", 0, "affiliation")).to eq(["UC Merced", "NSF"])
+      expect(datacite.dig("publisher")).to eq("UC Merced")
+    end
+
+    it "Schema 4.5 publisher with attributes" do
+      input = fixture_path + 'datacite-example-full-v4.5.xml'
+      doi = "10.82433/B09Z-4K37"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite", regenerate: true)
+      expect(subject.valid?).to be true
+
+      datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
+      expect(datacite.fetch("xsi:schemaLocation", "").split(" ").first).to eq("http://datacite.org/schema/kernel-4")
+      expect(datacite.dig("publisher")).to eq(
+        {
+          "__content__" => "Example Publisher",
+          "publisherIdentifier" => "https://ror.org/04z8jg394",
+          "publisherIdentifierScheme" => "ROR",
+          "schemeURI" => "https://ror.org/",
+          "xml:lang" => "en",
+        }
+      )
+    end
+
+    it "Schema 4.6" do
+      input = fixture_path + 'datacite-example-full-v4.6.xml'
+      doi = "10.82433/B09Z-4K37"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite", regenerate: true)
+      expect(subject.valid?).to be true
+
+      datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
+      expect(datacite.fetch("xsi:schemaLocation", "").split(" ").first).to eq("http://datacite.org/schema/kernel-4")
+      expect(datacite.dig("contributors", "contributor").count).to eq(2)
+      expect(datacite.dig("contributors", "contributor")).to include(
+        {
+          "contributorType"=>"Translator",
+          "contributorName"=>{
+            "nameType"=>"Personal",
+            "__content__"=>"Doe, Jane"
+          },
+          "givenName"=>"Jane",
+          "familyName"=>"Doe",
+          "nameIdentifier"=>{
+            "nameIdentifierScheme"=>"ORCID",
+            "schemeURI"=>"https://orcid.org",
+            "__content__"=>"https://orcid.org/0000-0003-1419-2405"
+          },
+          "affiliation"=>{
+            "affiliationIdentifier"=>"https://ror.org/04wxnsj81",
+            "affiliationIdentifierScheme"=>"ROR",
+            "schemeURI"=>"https://ror.org",
+            "__content__"=>"ExampleAffiliation"
+          }
+        }
+      )
+      expect(datacite.dig("dates", "date").count).to eq(5)
+      expect(datacite.dig("dates", "date")).to include(
+        {
+          "dateType"=>"Coverage",
+          "__content__"=>"2020-01-01"
+        }
+      )
+      expect(datacite.dig("resourceType")).to eq(
+        {
+          "__content__"=>"Research Project",
+          "resourceTypeGeneral"=>"Project"
+        }
+      )
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").count).to eq(4)
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier")).to eq(
+        [
+          {
+            "relatedIdentifierType"=>"RRID",
+            "relationType"=>"References",
+            "__content__"=>"RRID:AB_90755"
+          },
+          {
+            "relatedIdentifierType"=>"CSTR",
+            "relationType"=>"References",
+            "__content__"=>"CSTR:AB_12345"
+          },
+          {
+            "relatedIdentifierType"=>"DOI",
+            "relationType"=>"HasTranslation",
+            "__content__"=>"10.1234/translated-version"
+          },
+          {
+            "relatedIdentifierType"=>"DOI",
+            "relationType"=>"IsTranslationOf",
+            "__content__"=>"10.1234/other-version"
+          }
+        ]
+      )
+    end
+
+    it "Geolocations" do
+      input = fixture_path + 'datacite-example-full-v4.5.xml'
+      doi = "10.82433/B09Z-4K37"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite", regenerate: true)
+      expect(subject.valid?).to be true
+
+      datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
+      expect(datacite.dig("geoLocations", "geoLocation", "geoLocationPlace")).to eq("Vancouver, British Columbia, Canada")
+      expect(datacite.dig("geoLocations", "geoLocation", "geoLocationPoint")).to eq(
+        {
+          "pointLatitude" => "49.2827",
+          "pointLongitude" => "-123.1207",
+        }
+      )
+      expect(datacite.dig("geoLocations", "geoLocation", "geoLocationBox")).to eq(
+        {
+          "westBoundLongitude" => "-123.27",
+          "eastBoundLongitude" => "-123.02",
+          "southBoundLatitude" => "49.195",
+          "northBoundLatitude" => "49.315",
+        }
+      )
+      expect(datacite.dig("geoLocations", "geoLocation", "geoLocationPolygon")).to eq(
+        { 
+          "polygonPoint" => [
+            {
+              "pointLatitude" => "41.991",
+              "pointLongitude" => "-71.032",
+            },
+            {
+              "pointLatitude" => "42.893",
+              "pointLongitude" => "-69.622",
+            },
+            {
+              "pointLatitude" => "41.991",
+              "pointLongitude" => "-68.211",
+            },
+            {
+              "pointLatitude" => "41.090",
+              "pointLongitude" => "-69.622",
+            },
+            {
+              "pointLatitude" => "41.991",
+              "pointLongitude" => "-71.032",
+            },
+          ]
+        }
+      )
     end
 
     it "with data citation schema.org" do