bolognese 1.0.2 → 1.0.3

data/spec/readers/datacite_reader_spec.rb

@@ -20,17 +20,17 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5061/dryad.8515")
       expect(subject.url).to eq("http://datadryad.org/resource/doi:10.5061/dryad.8515")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.additional_type).to eq("DataPackage")
-      expect(subject.resource_type_general).to eq("Dataset")
-      expect(subject.ris_type).to eq("DATA")
-      expect(subject.citeproc_type).to eq("dataset")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type"]).to eq("DataPackage")
+      expect(subject.types["resource_type_general"]).to eq("Dataset")
+      expect(subject.types["ris"]).to eq("DATA")
+      expect(subject.types["citeproc"]).to eq("dataset")
       expect(subject.creator.length).to eq(8)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Benjamin Ollomo", "givenName"=>"Benjamin", "familyName"=>"Ollomo")
       expect(subject.title).to eq("Data from: A new malaria agent in African hominids.")
       expect(subject.alternate_identifiers).to eq("type"=>"citation", "name"=>"Ollomo B, Durand P, Prugnolle F, Douzery EJP, Arnathau C, Nkoghe D, Leroy E, Renaud F (2009) A new malaria agent in African hominids. PLoS Pathogens 5(5): e1000446.")
       expect(subject.rights).to eq("id"=>"http://creativecommons.org/publicdomain/zero/1.0")
-      expect(subject.date_published).to eq("2011")
+      expect(subject.publication_year).to eq("2011")
       expect(subject.related_identifiers.length).to eq(6)
       expect(subject.related_identifiers.last).to eq("id"=>"19478877", "related_identifier_type"=>"PMID", "relation_type"=>"IsSupplementTo")
       expect(subject.publisher).to eq("Dryad Digital Repository")
@@ -43,17 +43,18 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
-      expect(subject.type).to eq("ScholarlyArticle")
-      expect(subject.additional_type).to eq("BlogPosting")
-      expect(subject.resource_type_general).to eq("Text")
-      expect(subject.ris_type).to eq("RPRT")
-      expect(subject.citeproc_type).to eq("article-journal")
+      expect(subject.types["type"]).to eq("ScholarlyArticle")
+      expect(subject.types["resource_type"]).to eq("BlogPosting")
+      expect(subject.types["resource_type_general"]).to eq("Text")
+      expect(subject.types["ris"]).to eq("RPRT")
+      expect(subject.types["bibtex"]).to eq("article")
+      expect(subject.types["citeproc"]).to eq("article-journal")
       expect(subject.creator).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0003-1419-2405", "name"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner")
       expect(subject.title).to eq("Eating your own Dog Food")
       expect(subject.alternate_identifiers).to eq("type"=>"Local accession number", "name"=>"MS-49-3632-5083")
       expect(subject.description["text"]).to start_with("Eating your own dog food")
-      expect(subject.date_published).to eq("2016-12-20")
-      expect(subject.date_modified).to eq("2016-12-20")
+      expect(subject.dates).to eq([{"date"=>"2016-12-20", "date_type"=>"Created"}, {"date"=>"2016-12-20", "date_type"=>"Issued"}, {"date"=>"2016-12-20", "date_type"=>"Updated"}])
+      expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
       expect(subject.related_identifiers.last).to eq("id"=>"10.5438/0000-00ss", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
       expect(subject.publisher).to eq("DataCite")
@@ -66,13 +67,14 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.4230/lipics.tqc.2013.93")
-      expect(subject.type).to eq("ScholarlyArticle")
-      expect(subject.additional_type).to eq("ConferencePaper")
-      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.types["type"]).to eq("ScholarlyArticle")
+      expect(subject.types["resource_type"]).to eq("ConferencePaper")
+      expect(subject.types["resource_type_general"]).to eq("Text")
       expect(subject.creator).to eq("type"=>"Person", "name"=>"Nathaniel Johnston", "givenName"=>"Nathaniel", "familyName"=>"Johnston")
       expect(subject.title).to eq("The Minimum Size of Qubit Unextendible Product Bases")
       expect(subject.description["text"]).to start_with("We investigate the problem of constructing unextendible product bases in the qubit case")
-      expect(subject.date_published).to eq("2013")
+      expect(subject.dates).to eq([{"date"=>"2013-11-05", "date_type"=>"Available"}, {"date"=>"2013", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2013")
       expect(subject.publisher).to eq("Schloss Dagstuhl - Leibniz-Zentrum fuer Informatik GmbH, Wadern/Saarbruecken, Germany")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.1")
@@ -83,13 +85,14 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.17630/bb43e6a3-72e0-464c-9fdd-fbe5d3e56a09")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.additional_type).to eq("Dataset")
-      expect(subject.resource_type_general).to eq("Audiovisual")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type"]).to eq("Dataset")
+      expect(subject.types["resource_type_general"]).to eq("Audiovisual")
       expect(subject.creator.length).to eq(14)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Haywood, Raphaelle Dawn", "givenName"=>"Raphaelle Dawn", "familyName"=>"Haywood")
       expect(subject.title).to eq("lang"=>"en", "text"=>"Data underpinning - The Sun as a planet-host star: Proxies from SDO images for HARPS radial-velocity variations")
-      expect(subject.date_published).to eq("2016")
+      expect(subject.dates).to eq([{"date"=>"2016-01-20", "date_type"=>"Available"}, {"date"=>"2016", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2016")
       expect(subject.publisher).to eq("University of St Andrews")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -100,15 +103,16 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5281/zenodo.48440")
-      expect(subject.type).to eq("SoftwareSourceCode")
-      expect(subject.resource_type_general).to eq("Software")
-      expect(subject.ris_type).to eq("COMP")
-      expect(subject.citeproc_type).to eq("article")
+      expect(subject.types["type"]).to eq("SoftwareSourceCode")
+      expect(subject.types["resource_type_general"]).to eq("Software")
+      expect(subject.types["ris"]).to eq("COMP")
+      expect(subject.types["citeproc"]).to eq("article")
       expect(subject.creator).to eq("type"=>"Person", "name"=>"Kristian Garza", "givenName"=>"Kristian", "familyName"=>"Garza")
       expect(subject.title).to eq("Analysis Tools For Crossover Experiment Of Ui Using Choice Architecture")
       expect(subject.description["text"]).to start_with("This tools are used to analyse the data produced by the Crosssover Experiment")
       expect(subject.rights).to eq([{"id"=>"https://creativecommons.org/licenses/by-nc-sa/4.0", "name"=>"Creative Commons Attribution-NonCommercial-ShareAlike"}, {"name"=>"Open Access"}])
-      expect(subject.date_published).to eq("2016-03-27")
+      expect(subject.dates).to eq([{"date"=>"2016-03-27", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("id"=>"https://github.com/kjgarza/frame_experiment_analysis/tree/v1.0", "related_identifier_type"=>"URL", "relation_type"=>"IsSupplementTo")
       expect(subject.publisher).to eq("Zenodo")
@@ -121,15 +125,16 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.6084/m9.figshare.4234751.v1")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.additional_type).to eq("Dataset")
-      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type"]).to eq("Dataset")
+      expect(subject.types["resource_type_general"]).to eq("Dataset")
       expect(subject.creator.count).to eq(11)
       expect(subject.creator.first).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0002-2410-9671", "name"=>"Alexander Junge", "givenName"=>"Alexander", "familyName"=>"Junge")
       expect(subject.title).to eq("RAIN v1")
       expect(subject.description["text"]).to start_with("<b>RAIN: RNA–protein Association and Interaction Networks")
       expect(subject.rights).to eq("id"=>"https://creativecommons.org/licenses/by/4.0", "name"=>"CC-BY")
-      expect(subject.date_published).to eq("2016")
+      expect(subject.dates).to eq([{"date"=>"2016-11-16", "date_type"=>"Created"}, {"date"=>"2016-11-16", "date_type"=>"Updated"}, {"date"=>"2016", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("id"=>"10.6084/m9.figshare.4234751", "related_identifier_type"=>"DOI", "relation_type"=>"IsIdenticalTo")
       expect(subject.publisher).to eq("Figshare")
@@ -142,13 +147,14 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5281/zenodo.1239")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type_general"]).to eq("Dataset")
       expect(subject.creator.length).to eq(4)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Jahn, Najko", "givenName"=>"Najko", "familyName"=>"Jahn")
       expect(subject.title).to eq("Publication Fp7 Funding Acknowledgment - Plos Openaire")
       expect(subject.description["text"]).to start_with("The dataset contains a sample of metadata describing papers")
-      expect(subject.date_published).to eq("2013-04-03")
+      expect(subject.dates).to eq([{"date"=>"2013-04-03", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2013")
       expect(subject.publisher).to eq("Zenodo")
       expect(subject.funding_references).to eq([{"award_number"=>"246686",
         "award_title"=>"Open Access Infrastructure for Research in Europe",
@@ -163,8 +169,8 @@ describe Bolognese::Metadata, vcr: true do
     it "missing resource_type_general" do
       input = fixture_path + 'vivli.xml'
       subject = Bolognese::Metadata.new(input: input)
-      expect(subject.type).to eq("CreativeWork")
-      expect(subject.resource_type_general).to be_nil
+      expect(subject.types["type"]).to eq("CreativeWork")
+      expect(subject.types["resource_type_general"]).to be_nil
       expect(subject.valid?).to be false
       expect(subject.errors).to eq("2:0: ERROR: Element '{http://datacite.org/schema/kernel-4}resource': Missing child element(s). Expected is one of ( {http://datacite.org/schema/kernel-4}resourceType, {http://datacite.org/schema/kernel-4}subjects, {http://datacite.org/schema/kernel-4}contributors, {http://datacite.org/schema/kernel-4}language, {http://datacite.org/schema/kernel-4}alternateIdentifiers, {http://datacite.org/schema/kernel-4}relatedIdentifiers, {http://datacite.org/schema/kernel-4}sizes, {http://datacite.org/schema/kernel-4}formats, {http://datacite.org/schema/kernel-4}rightsList, {http://datacite.org/schema/kernel-4}descriptions ).")
     end
@@ -174,9 +180,9 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.6071/z7wc73")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.additional_type).to eq("dataset")
-      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type"]).to eq("dataset")
+      expect(subject.types["resource_type_general"]).to eq("Dataset")
       expect(subject.creator.length).to eq(6)
       expect(subject.creator.first).to eq("familyName"=>"Bales", "givenName"=>"Roger", "name"=>"Roger Bales", "type"=>"Person")
     end
@@ -192,7 +198,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creator.first).to eq("familyName"=>"Schumann", "givenName"=>"Kai", "name"=>"Kai Schumann", "type"=>"Person")
         expect(subject.title).to eq("Gridded results of swath bathymetric mapping of Disko Bay, Western Greenland, 2007-2008")
       expect(subject.publisher).to eq("PANGAEA - Data Publisher for Earth & Environmental Science")
-      expect(subject.publication_year).to eq(2011)
+      expect(subject.publication_year).to eq("2011")
       expect(subject.related_identifiers).to eq([{"id"=>"10.5072/timeseries", "related_identifier_type"=>"DOI", "relation_type"=>"Continues"}])
       expect(subject.geo_location).to eq([{"geo_location_place"=>"Disko Bay", "geo_location_point"=>{"point_latitude"=>"69.000000", "point_longitude"=>"-52.000000"}}])
     end
@@ -208,7 +214,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creator.first).to eq("familyName"=>"Bales", "givenName"=>"Roger", "name"=>"Roger Bales", "type"=>"Person")
         expect(subject.title).to eq("Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek\n      meteorological data, soil moisture and temperature, snow depth and air\n      temperature")
       expect(subject.publisher).to eq("UC Merced")
-      expect(subject.publication_year).to eq(2013)
+      expect(subject.dates).to eq([{"date"=>"2014-10-17", "date_type"=>"Updated"}, {"date"=>"2016-03-14T17:02:02Z", "date_type"=>"Available"}, {"date"=>"2013", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2013")
       expect(subject.geo_location).to eq([{"geo_location_box"=>
         {"east_bound_longitude"=>"-119.182",
          "north_bound_latitude"=>"37.075",
@@ -224,7 +231,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.14457/kmitl.res.2006.17")
-      expect(subject.type).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
       expect(subject.creator.length).to eq(1)
       expect(subject.creator.first).to eq(["name", "กัญจนา แซ่เตียว"])
     end
@@ -234,7 +241,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.7910/dvn/eqtqyo")
-      expect(subject.type).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
       expect(subject.creator).to eq("name" => "Enos, Ryan (Harvard University); Fowler, Anthony (University Of Chicago); Vavreck, Lynn (UCLA)")
     end
 
@@ -243,7 +250,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.18429/jacow-ipac2016-tupmy003")
-      expect(subject.type).to eq("ScholarlyArticle")
+      expect(subject.types["type"]).to eq("ScholarlyArticle")
       expect(subject.creator.length).to eq(12)
       expect(subject.creator.first).to eq("type"=>"Person", "id"=>"http://jacow.org/JACoW-00077389", "name"=>"Masashi Otani", "givenName"=>"Masashi", "familyName"=>"Otani")
     end
@@ -253,7 +260,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.2314/coscv1")
-      expect(subject.type).to eq("ScholarlyArticle")
+      expect(subject.types["type"]).to eq("ScholarlyArticle")
       expect(subject.creator.length).to eq(14)
       expect(subject.creator.first).to include("type"=>"Person", "name"=>"Lambert Heller", "givenName"=>"Lambert", "familyName"=>"Heller")
     end
@@ -271,14 +278,14 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.15125/bath-00114")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.additional_type).to eq("Dataset")
-      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type"]).to eq("Dataset")
+      expect(subject.types["resource_type_general"]).to eq("Dataset")
       expect(subject.creator.length).to eq(2)
       expect(subject.creator.first).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0001-8740-8284", "name"=>"Bimbo, Nuno", "givenName"=>"Nuno", "familyName"=>"Bimbo")
       expect(subject.title).to eq("Dataset for \"Direct Evidence for Solid-Like Hydrogen in a Nanoporous Carbon Hydrogen Storage Material at Supercritical Temperatures\"")
       expect(subject.description.first["text"]).to start_with("Dataset for Direct Evidence for Solid-Like Hydrogen")
-      expect(subject.date_published).to eq("2015")
+      expect(subject.publication_year).to eq("2015")
       expect(subject.publisher).to eq("University of Bath")
       expect(subject.funding_references.length).to eq(5)
       expect(subject.funding_references.first).to eq("award_number" => "EP/J016454/1",
@@ -296,16 +303,16 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5438/6423")
-      expect(subject.type).to eq("Collection")
-      expect(subject.additional_type).to eq("Project")
-      expect(subject.resource_type_general).to eq("Collection")
-      expect(subject.ris_type).to eq("GEN")
-      expect(subject.citeproc_type).to eq("article")
+      expect(subject.types["type"]).to eq("Collection")
+      expect(subject.types["resource_type"]).to eq("Project")
+      expect(subject.types["resource_type_general"]).to eq("Collection")
+      expect(subject.types["ris"]).to eq("GEN")
+      expect(subject.types["citeproc"]).to eq("article")
       expect(subject.creator.length).to eq(24)
       expect(subject.creator.first).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0001-5331-6592", "name"=>"Farquhar, Adam", "givenName"=>"Adam", "familyName"=>"Farquhar")
       expect(subject.title).to eq("Technical and Human Infrastructure for Open Research (THOR)")
       expect(subject.description["text"]).to start_with("Five years ago, a global infrastructure")
-      expect(subject.date_published).to eq("2015")
+      expect(subject.publication_year).to eq("2015")
       expect(subject.publisher).to eq("DataCite")
       expect(subject.funding_references).to eq([{"award_number"=>"654039",
         "award_title"=>"THOR – Technical and Human Infrastructure for Open Research",
@@ -322,16 +329,16 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
-      expect(subject.type).to eq("ScholarlyArticle")
-      expect(subject.additional_type).to eq("BlogPosting")
-      expect(subject.resource_type_general).to eq("Text")
-      expect(subject.ris_type).to eq("RPRT")
-      expect(subject.citeproc_type).to eq("article-journal")
+      expect(subject.types["type"]).to eq("ScholarlyArticle")
+      expect(subject.types["resource_type"]).to eq("BlogPosting")
+      expect(subject.types["resource_type_general"]).to eq("Text")
+      expect(subject.types["ris"]).to eq("RPRT")
+      expect(subject.types["citeproc"]).to eq("article-journal")
       expect(subject.creator).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0003-1419-2405", "name"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner")
       expect(subject.title).to eq("Eating your own Dog Food")
       expect(subject.alternate_identifiers).to eq("type"=>"Local accession number", "name"=>"MS-49-3632-5083")
-      expect(subject.date_published).to eq("2016-12-20")
-      expect(subject.publication_year).to eq(2016)
+      expect(subject.dates).to eq([{"date"=>"2016-12-20", "date_type"=>"Created"}, {"date"=>"2016-12-20", "date_type"=>"Issued"}, {"date"=>"2016-12-20", "date_type"=>"Updated"}])
+      expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
       expect(subject.related_identifiers.last).to eq("id"=>"10.5438/0000-00ss", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
       expect(subject.service_provider).to eq("DataCite")
@@ -342,16 +349,16 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5072/testpub")
-      expect(subject.type).to eq("Book")
-      expect(subject.additional_type).to eq("Monograph")
-      expect(subject.resource_type_general).to eq("Text")
-      expect(subject.ris_type).to eq("BOOK")
-      expect(subject.citeproc_type).to eq("book")
+      expect(subject.types["type"]).to eq("Book")
+      expect(subject.types["resource_type"]).to eq("Monograph")
+      expect(subject.types["resource_type_general"]).to eq("Text")
+      expect(subject.types["ris"]).to eq("BOOK")
+      expect(subject.types["citeproc"]).to eq("book")
       expect(subject.creator).to eq([{"type"=>"Person", "name"=>"John Smith", "givenName"=>"John", "familyName"=>"Smith"}, {"name"=>"つまらないものですが"}])
       expect(subject.title).to eq(["Właściwości rzutowań podprzestrzeniowych", {"title_type"=>"TranslatedTitle", "text"=>"Translation of Polish titles"}])
       expect(subject.alternate_identifiers).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
-      expect(subject.date_published).to eq("2010")
-      expect(subject.publication_year).to eq(2010)
+      expect(subject.dates).to eq([{"date"=>"2012-12-13", "date_type"=>"Other"}, {"date"=>"2010", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2010")
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("id"=>"10.5272/oldertestpub", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf", "resource_type_general"=>"Text")
       expect(subject.rights).to eq("id"=>"http://creativecommons.org/licenses/by-nd/2.0", "name"=>"Creative Commons Attribution-NoDerivs 2.0 Generic")
@@ -365,16 +372,15 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5072/testpub")
-      expect(subject.type).to eq("Book")
-      expect(subject.additional_type).to eq("Monograph")
-      expect(subject.resource_type_general).to eq("Text")
-      expect(subject.ris_type).to eq("BOOK")
-      expect(subject.citeproc_type).to eq("book")
+      expect(subject.types["type"]).to eq("Book")
+      expect(subject.types["resource_type"]).to eq("Monograph")
+      expect(subject.types["resource_type_general"]).to eq("Text")
+      expect(subject.types["ris"]).to eq("BOOK")
+      expect(subject.types["citeproc"]).to eq("book")
       expect(subject.creator).to eq([{"type"=>"Person", "name"=>"John Smith", "givenName"=>"John", "familyName"=>"Smith"}, {"name"=>"つまらないものですが"}])
       expect(subject.title).to eq(["Właściwości rzutowań podprzestrzeniowych", {"title_type"=>"TranslatedTitle", "text"=>"Translation of Polish titles"}])
       expect(subject.alternate_identifiers).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
-      expect(subject.date_published).to eq("2010")
-      expect(subject.publication_year).to eq(2010)
+      expect(subject.publication_year).to eq("2010")
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("id"=>"10.5272/oldertestpub", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
       expect(subject.rights).to eq("id"=>"http://creativecommons.org/licenses/by-nd/2.0", "name"=>"Creative Commons Attribution-NoDerivs 2.0 Generic")
@@ -388,16 +394,15 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5072/testpub")
-      expect(subject.type).to eq("Book")
-      expect(subject.additional_type).to eq("Monograph")
-      expect(subject.resource_type_general).to eq("Text")
-      expect(subject.ris_type).to eq("BOOK")
-      expect(subject.citeproc_type).to eq("book")
+      expect(subject.types["type"]).to eq("Book")
+      expect(subject.types["resource_type"]).to eq("Monograph")
+      expect(subject.types["resource_type_general"]).to eq("Text")
+      expect(subject.types["ris"]).to eq("BOOK")
+      expect(subject.types["citeproc"]).to eq("book")
       expect(subject.creator).to eq([{"type"=>"Person", "name"=>"John Smith", "givenName"=>"John", "familyName"=>"Smith"}, {"name"=>"つまらないものですが"}])
       expect(subject.title).to eq(["Właściwości rzutowań podprzestrzeniowych", {"title_type"=>"TranslatedTitle", "text"=>"Translation of Polish titles"}])
       expect(subject.alternate_identifiers).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
-      expect(subject.date_published).to eq("2010")
-      expect(subject.publication_year).to eq(2010)
+      expect(subject.publication_year).to eq("2010")
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("id"=>"10.5272/oldertestpub", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
       expect(subject.rights).to eq("id"=>"http://creativecommons.org/licenses/by-nd/2.0", "name"=>"Creative Commons Attribution-NoDerivs 2.0 Generic")
@@ -411,16 +416,16 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5072/testpub")
-      expect(subject.type).to eq("Book")
-      expect(subject.additional_type).to eq("Monograph")
-      expect(subject.resource_type_general).to eq("Text")
-      expect(subject.ris_type).to eq("BOOK")
-      expect(subject.citeproc_type).to eq("book")
+      expect(subject.types["type"]).to eq("Book")
+      expect(subject.types["resource_type"]).to eq("Monograph")
+      expect(subject.types["resource_type_general"]).to eq("Text")
+      expect(subject.types["ris"]).to eq("BOOK")
+      expect(subject.types["citeproc"]).to eq("book")
       expect(subject.creator).to eq([{"type"=>"Person", "name"=>"John Smith", "givenName"=>"John", "familyName"=>"Smith"}, {"name"=>"つまらないものですが"}])
       expect(subject.title).to eq(["Właściwości rzutowań podprzestrzeniowych", {"title_type"=>"TranslatedTitle", "text"=>"Translation of Polish titles"}])
       expect(subject.alternate_identifiers).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
-      expect(subject.date_published).to eq("2010")
-      expect(subject.publication_year).to eq(2010)
+      expect(subject.dates).to eq([{"date"=>"2009-04-29", "date_type"=>"StartDate"}, {"date"=>"2010-01-05", "date_type"=>"EndDate"}, {"date"=>"2010", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2010")
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("id"=>"10.5272/oldertestpub", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
       expect(subject.publisher).to eq("Springer")
@@ -433,17 +438,18 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, doi: "10.5072/testpub2", content_url: "https://example.org/report.pdf")
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5072/testpub2")
-      expect(subject.type).to eq("Book")
-      expect(subject.additional_type).to eq("Monograph")
-      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.types["type"]).to eq("Book")
+      expect(subject.types["resource_type"]).to eq("Monograph")
+      expect(subject.types["resource_type_general"]).to eq("Text")
       expect(subject.creator).to eq([{"type"=>"Person", "name"=>"John Smith", "givenName"=>"John", "familyName"=>"Smith"}, {"name"=>"つまらないものですが"}])
       expect(subject.title).to eq(["Właściwości rzutowań podprzestrzeniowych", {"title_type"=>"TranslatedTitle", "text"=>"Translation of Polish titles"}])
       expect(subject.alternate_identifiers).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
-      expect(subject.date_published).to eq("2010")
+      expect(subject.dates).to eq([{"date"=>"2012-12-13", "date_type"=>"Other"}, {"date"=>"2010", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2010")
       expect(subject.size).to eq("256 pages")
       expect(subject.formats).to eq("pdf")
       expect(subject.content_url).to eq("https://example.org/report.pdf")
-      expect(subject.publication_year).to eq(2010)
+      expect(subject.publication_year).to eq("2010")
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("id"=>"10.5272/oldertestpub", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf", "resource_type_general"=>"Text")
       expect(subject.rights).to eq("id"=>"http://creativecommons.org/licenses/by-nd/2.0", "name"=>"Creative Commons Attribution-NoDerivs 2.0 Generic")
@@ -456,14 +462,14 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.4231/d38g8fk8b")
-      expect(subject.type).to eq("SoftwareSourceCode")
-      expect(subject.additional_type).to eq("Simulation Tool")
-      expect(subject.resource_type_general).to eq("Software")
+      expect(subject.types["type"]).to eq("SoftwareSourceCode")
+      expect(subject.types["resource_type"]).to eq("Simulation Tool")
+      expect(subject.types["resource_type_general"]).to eq("Software")
       expect(subject.creator.length).to eq(5)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Carlos PatiñO", "givenName"=>"Carlos", "familyName"=>"PatiñO")
       expect(subject.title).to eq("LAMMPS Data-File Generator")
-      expect(subject.date_published).to eq("2018")
-      expect(subject.publication_year).to eq(2018)
+      expect(subject.dates).to eq([{"date"=>"2018-07-18", "date_type"=>"Valid"}, {"date"=>"2018-07-18", "date_type"=>"Accepted"}, {"date"=>"2018", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2018")
       expect(subject.publisher).to eq("nanoHUB")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.2")
@@ -474,11 +480,11 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5067/terra+aqua/ceres/cldtyphist_l3.004")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type_general"]).to eq("Dataset")
       expect(subject.creator).to eq("type"=>"Person", "name"=>"Takmeng Wong", "givenName"=>"Takmeng", "familyName"=>"Wong")
       expect(subject.title).to eq("CERES Level 3 Cloud Type Historgram Terra+Aqua HDF file - Edition4")
-      expect(subject.date_published).to eq("2016")
+      expect(subject.publication_year).to eq("2016")
       expect(subject.publisher).to eq("NASA Langley Atmospheric Science Data Center DAAC")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -489,12 +495,13 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.4232/1.2745")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type_general"]).to eq("Dataset")
       expect(subject.creator).to eq("type"=>"Organization", "name"=>"Europäische Kommission")
       expect(subject.title).to eq([{"lang"=>"de", "text"=>"Flash Eurobarometer 54 (Madrid Summit)"}, {"lang"=>"en", "text"=>"Flash Eurobarometer 54 (Madrid Summit)"}, {"title_type"=>"Subtitle","lang"=>"de", "text"=>"The Common European Currency"}, {"title_type"=>"Subtitle", "lang"=>"en", "text"=>"The Common European Currency"}])
       expect(subject.keywords).to eq([{"subject_scheme"=>"ZA", "text"=>"KAT12 International Institutions, Relations, Conditions"}])
-      expect(subject.date_published).to eq("1996")
+      expect(subject.dates).to eq([{"date"=>"1995-12", "date_type"=>"Collected"}, {"date"=>"1996", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("1996")
       expect(subject.publisher).to eq("GESIS Data Archive")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -505,13 +512,14 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.4229/23rdeupvsec2008-5co.8.3")
-      expect(subject.type).to eq("ScholarlyArticle")
-      expect(subject.additional_type).to eq("Article")
-      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.types["type"]).to eq("ScholarlyArticle")
+      expect(subject.types["resource_type"]).to eq("Article")
+      expect(subject.types["resource_type_general"]).to eq("Text")
       expect(subject.creator.length).to eq(3)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"P. Llamas", "givenName"=>"P.", "familyName"=>"Llamas")
       expect(subject.title).to eq("Rural Electrification With Hybrid Power Systems Based on Renewables - Technical System Configurations From the Point of View of the European Industry")
-      expect(subject.date_published).to eq("2008")
+      expect(subject.dates).to eq([{"date"=>"2008-11-01", "date_type"=>"Valid"}, {"date"=>"2008", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2008")
       expect(subject.periodical).to eq("title"=>"23rd European Photovoltaic Solar Energy Conference and Exhibition, 1-5 September 2008, Valencia, Spain; 3353-3356", "type"=>"Periodical")
       expect(subject.description["text"]).to start_with("Aim of this paper is the presentation")
       expect(subject.publisher).to eq("WIP-Munich")
@@ -534,12 +542,13 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.18169/papdeottx00502")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.additional_type).to eq("Disclosure")
-      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type"]).to eq("Disclosure")
+      expect(subject.types["resource_type_general"]).to eq("Dataset")
       expect(subject.creator).to eq("name"=>"Anonymous")
       expect(subject.title).to eq( "Messung der Bildunschaerfe in H.264-codierten Bildern und Videosequenzen")
-      expect(subject.date_published).to eq("2017")
+      expect(subject.dates).to eq([{"date"=>"07.04.2017", "date_type"=>"Available"}, {"date"=>"2017", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("Siemens AG")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
@@ -550,9 +559,9 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.21944/temis-ozone-msr2")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.additional_type).to eq("Satellite data")
-      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type"]).to eq("Satellite data")
+      expect(subject.types["resource_type_general"]).to eq("Dataset")
       expect(subject.creator).to eq([{"type"=>"Person",
                                      "id"=>"https://orcid.org/0000-0002-0077-5338",
                                      "name"=>"Ronald Van Der A",
@@ -569,7 +578,8 @@ describe Bolognese::Metadata, vcr: true do
                                      "familyName"=>"Eskes"}])
       expect(subject.title).to eq("Multi-Sensor Reanalysis (MSR) of total ozone, version 2")
       expect(subject.version).to eq("2")
-      expect(subject.date_published).to eq("2015")
+      expect(subject.dates).to eq([{"date"=>"2014-04-25", "date_type"=>"Available"}, {"date"=>"1970-04-01 / (:tba)", "date_type"=>"Collected"}, {"date"=>"2015", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2015")
       expect(subject.publisher).to eq("Royal Netherlands Meteorological Institute (KNMI)")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -590,12 +600,12 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, sandbox: true)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://handle.test.datacite.org/10.22002/d1.694")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type_general"]).to eq("Dataset")
       expect(subject.creator).to eq("name"=>"Tester")
       expect(subject.title).to eq("Test license")
-      expect(subject.date_published).to eq("2018-01-12")
-      expect(subject.publication_year).to eq(2018)
+      expect(subject.dates).to eq([{"date"=>"2018-01-12", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2018")
       expect(subject.publisher).to eq("CaltechDATA")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -607,14 +617,14 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, sandbox: true)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://handle.test.datacite.org/10.21956/gatesopenres.530.r190")
-      expect(subject.type).to eq("ScholarlyArticle")
-      expect(subject.resource_type_general).to eq("Text")
-      expect(subject.ris_type).to eq("RPRT")
-      expect(subject.citeproc_type).to eq("article-journal")
+      expect(subject.types["type"]).to eq("ScholarlyArticle")
+      expect(subject.types["resource_type_general"]).to eq("Text")
+      expect(subject.types["ris"]).to eq("RPRT")
+      expect(subject.types["citeproc"]).to eq("article-journal")
       expect(subject.creator.length).to eq(5)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Lina Patel", "givenName"=>"Lina", "familyName"=>"Patel")
       expect(subject.title).to eq("Referee report. For: Gates - add article keywords to the metatags [version 2; referees: 1 approved]")
-      expect(subject.date_published).to eq("2018")
+      expect(subject.publication_year).to eq("2018")
       expect(subject.publisher).to eq("Gates Open Research")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
@@ -649,14 +659,17 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.3204/desy-2014-01645")
-      expect(subject.resource_type_general).to eq("Text")
-      expect(subject.additional_type).to eq("Dissertation")
-      expect(subject.type).to eq("Thesis")
-      expect(subject.bibtex_type).to eq("phdthesis")
-      expect(subject.citeproc_type).to eq("thesis")
+      expect(subject.types["resource_type_general"]).to eq("Text")
+      expect(subject.types["resource_type"]).to eq("Dissertation")
+      expect(subject.types["type"]).to eq("Thesis")
+      expect(subject.types["bibtex"]).to eq("phdthesis")
+      expect(subject.types["citeproc"]).to eq("thesis")
       expect(subject.creator).to eq("type"=>"Person", "name"=>"Heiko Conrad", "givenName"=>"Heiko", "familyName"=>"Conrad")
       expect(subject.title).to eq("Dynamics of colloids in molecular glass forming liquids studied via X-ray photon correlation spectroscopy")
-      expect(subject.date_published).to eq("2014")
+      expect(subject.dates).to eq([{"date"=>"2014", "date_type"=>"Issued"},
+        {"date"=>"2014", "date_type"=>"Copyrighted"},
+        {"date"=>"2009-10-01/2014-01-23", "date_type"=>"Created"}])
+      expect(subject.publication_year).to eq("2014")
       expect(subject.publisher).to eq("Deutsches Elektronen-Synchrotron, DESY, Hamburg")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
@@ -667,11 +680,11 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.4121/uuid:3926db30-f712-4394-aebc-75976070e91f")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
+      expect(subject.types["resource_type_general"]).to eq("Dataset")
       expect(subject.title).to eq("BPI Challenge 2012")
-      expect(subject.date_published).to eq("2012")
-      expect(subject.publication_year).to eq(2012)
+      expect(subject.dates).to eq([{"date"=>"2011-10-01/2012-03-14", "date_type"=>"Other"}, {"date"=>"2012", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2012")
       expect(subject.state).to eq("findable")
     end
   end
@@ -683,7 +696,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.5061/dryad.8515")
       expect(subject.doi).to eq("10.5061/dryad.8515")
       expect(subject.url).to eq("http://datadryad.org/resource/doi:10.5061/dryad.8515")
-      expect(subject.type).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
       expect(subject.title).to eq("A new malaria agent in African hominids.")
     end
 
@@ -693,7 +706,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.5061/dryad.8515")
       expect(subject.doi).to eq("10.5061/dryad.8515")
       expect(subject.url).to eq("http://datadryad.org/resource/doi:10.5061/dryad.8515")
-      expect(subject.type).to eq("Dataset")
+      expect(subject.types["type"]).to eq("Dataset")
       expect(subject.title).to eq("Data from: A new malaria agent in African hominids.")
       expect(subject.state).to eq("registered")
     end
@@ -710,7 +723,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creator).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0003-1419-2405", "name"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner")
       expect(subject.title).to eq("Eating your own Dog Food")
       expect(subject.publisher).to eq("DataCite")
-      expect(subject.publication_year).to eq(2016)
+      expect(subject.publication_year).to eq("2016")
     end
   end
 
@@ -724,12 +737,13 @@ describe Bolognese::Metadata, vcr: true do
     expect(subject.identifier).to eq("https://doi.org/10.25491/9hx8-ke93")
     expect(subject.url).to eq("https://ors.datacite.org/doi:/10.25491/9hx8-ke93")
     expect(subject.content_url).to eq("https://storage.googleapis.com/gtex_analysis_v7/single_tissue_eqtl_data/GTEx_Analysis_v7_eQTL_expression_matrices.tar.gz")
-    expect(subject.type).to eq("Dataset")
-    expect(subject.additional_type).to eq("DroNc-seq data")
+    expect(subject.types["type"]).to eq("Dataset")
+    expect(subject.types["resource_type"]).to eq("DroNc-seq data")
     expect(subject.creator).to eq("name"=>"The GTEx Consortium", "type"=>"Organization")
     expect(subject.title).to eq("DroNc-seq data")
     expect(subject.keywords).to eq(["gtex", "annotation", "phenotype", "gene regulation", "transcriptomics"])
-    expect(subject.date_published).to eq("2017")
+    expect(subject.dates).to eq([{"date"=>"2017", "date_type"=>"Issued"}])
+    expect(subject.publication_year).to eq("2017")
     expect(subject.related_identifiers.length).to eq(4)
     expect(subject.related_identifiers.last).to eq("id"=>"https://www.ebi.ac.uk/miriam/main/datatypes/MIR:00000663", "related_identifier_type"=>"URL", "relation_type"=>"IsPartOf")
     expect(subject.formats).to eq("application/tar")