bolognese 1.0.6 → 1.0.7

data/spec/readers/datacite_json_reader_spec.rb

@@ -17,18 +17,32 @@ describe Bolognese::Metadata, vcr: true do
     it "BlogPosting" do
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
-      expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"article", "ris"=>"GEN", "type"=>"CreativeWork")
-      expect(subject.creator).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-1419-2405", "name"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner")
-      expect(subject.title).to eq([{"text"=>"Eating your own Dog Food"}])
-      expect(subject.alternate_identifiers).to eq([{"alternate-identifier"=>"MS-49-3632-5083", "alternate-identifier-type"=>"Local accession number"}])
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"BlogPosting", "resource_type_general"=>"Text", "ris"=>"RPRT", "type"=>"ScholarlyArticle")
+      expect(subject.creator).to eq([{"type"=>"Person", "id"=>"http://orcid.org/0000-0003-1419-2405", "name"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner"}])
+      expect(subject.titles).to eq([{"title"=>"Eating your own Dog Food"}])
+      expect(subject.alternate_identifiers).to eq([{"alternate_identifier"=>"MS-49-3632-5083", "alternate_identifier_type"=>"Local accession number"}])
       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.first).to eq("id"=>"10.5438/0000-00ss", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
-      expect(subject.related_identifiers.last).to eq("id"=>"10.5438/55e5-t5c0", "related_identifier_type"=>"DOI", "relation_type"=>"References")
+      expect(subject.related_identifiers.first).to eq("related_identifier"=>"10.5438/0000-00ss", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
+      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.5438/55e5-t5c0", "related_identifier_type"=>"DOI", "relation_type"=>"References")
       expect(subject.service_provider).to eq("DataCite")
     end
 
+    # it "SoftwareSourceCode" do
+    #   input = fixture_path + "datacite_software.json"
+    #   subject = Bolognese::Metadata.new(input: input, from: "datacite_json")
+    #   expect(subject.valid?).to be true
+    #   expect(subject.identifier).to eq("https://doi.org/10.5063/f1m61h5x")
+    #   expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"article", "resource_type"=>"Software", "resource_type_general"=>"Software", "ris"=>"COMP", "type"=>"SoftwareSourceCode")
+    #   expect(subject.creator).to eq([{"familyName"=>"Jones", "givenName"=>"Matthew B.", "name"=>"Matthew B. Jones", "type"=>"Person"}])
+    #   expect(subject.titles).to eq([{"title"=>"dataone: R interface to the DataONE network of data repositories"}])
+    #   expect(subject.dates).to eq([{"date"=>"2016", "date_type"=>"Issued"}])
+    #   expect(subject.publication_year).to eq("2016")
+    #   expect(subject.publisher).to eq("KNB Data Repository")
+    #   expect(subject.service_provider).to eq("DataCite")
+    # end
+
     it "SoftwareSourceCode missing_comma" do
       input = fixture_path + "datacite_software_missing_comma.json"
       subject = Bolognese::Metadata.new(input: input, from: "datacite_json")

data/spec/readers/datacite_reader_spec.rb

@@ -27,12 +27,12 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"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.titles).to eq([{"title"=>"Data from: A new malaria agent in African hominids."}])
+      expect(subject.alternate_identifiers).to eq([{"alternate_identifier"=>"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.","alternate_identifier_type"=>"citation"}])
+      expect(subject.rights_list).to eq([{"rights_uri"=>"http://creativecommons.org/publicdomain/zero/1.0"}])
       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.related_identifiers.last).to eq("related_identifier"=>"19478877", "related_identifier_type"=>"PMID", "relation_type"=>"IsSupplementTo")
       expect(subject.publisher).to eq("Dryad Digital Repository")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -49,14 +49,14 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Eating your own Dog Food"}])
-      expect(subject.alternate_identifiers).to eq("type"=>"Local accession number", "name"=>"MS-49-3632-5083")
-      expect(subject.description.first["text"]).to start_with("Eating your own dog food")
+      expect(subject.creator).to eq([{"type"=>"Person", "id"=>"https://orcid.org/0000-0003-1419-2405", "name"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner"}])
+      expect(subject.titles).to eq([{"title"=>"Eating your own Dog Food"}])
+      expect(subject.alternate_identifiers).to eq([{"alternate_identifier"=>"MS-49-3632-5083", "alternate_identifier_type"=>"Local accession number"}])
+      expect(subject.descriptions.first["description"]).to start_with("Eating your own dog food")
       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.related_identifiers.last).to eq("related_identifier"=>"10.5438/0000-00ss", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
       expect(subject.publisher).to eq("DataCite")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -70,9 +70,9 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"The Minimum Size of Qubit Unextendible Product Bases"}])
-      expect(subject.description.first["text"]).to start_with("We investigate the problem of constructing unextendible product bases in the qubit case")
+      expect(subject.creator).to eq([{"type"=>"Person", "name"=>"Nathaniel Johnston", "givenName"=>"Nathaniel", "familyName"=>"Johnston"}])
+      expect(subject.titles).to eq([{"title"=>"The Minimum Size of Qubit Unextendible Product Bases"}])
+      expect(subject.descriptions.first["description"]).to start_with("We investigate the problem of constructing unextendible product bases in the qubit case")
       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")
@@ -90,7 +90,7 @@ describe Bolognese::Metadata, vcr: true do
       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.titles).to eq([{"lang"=>"en", "title"=>"Data underpinning - The Sun as a planet-host star: Proxies from SDO images for HARPS radial-velocity variations"}])
       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")
@@ -107,14 +107,14 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Analysis Tools For Crossover Experiment Of Ui Using Choice Architecture"}])
-      expect(subject.description.first["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.creator).to eq([{"type"=>"Person", "name"=>"Kristian Garza", "givenName"=>"Kristian", "familyName"=>"Garza"}])
+      expect(subject.titles).to eq([{"title"=>"Analysis Tools For Crossover Experiment Of Ui Using Choice Architecture"}])
+      expect(subject.descriptions.first["description"]).to start_with("This tools are used to analyse the data produced by the Crosssover Experiment")
+      expect(subject.rights_list).to eq([{"rights_uri"=>"https://creativecommons.org/licenses/by-nc-sa/4.0", "rights"=>"Creative Commons Attribution-NonCommercial-ShareAlike"}, {"rights"=>"Open Access"}])
       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.related_identifiers.last).to eq("related_identifier"=>"https://github.com/kjgarza/frame_experiment_analysis/tree/v1.0", "related_identifier_type"=>"URL", "relation_type"=>"IsSupplementTo")
       expect(subject.publisher).to eq("Zenodo")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -130,13 +130,13 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"RAIN v1"}])
-      expect(subject.description.first["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.titles).to eq([{"title"=>"RAIN v1"}])
+      expect(subject.descriptions.first["description"]).to start_with("<b>RAIN: RNA–protein Association and Interaction Networks")
+      expect(subject.rights_list).to eq([{"rights_uri"=>"https://creativecommons.org/licenses/by/4.0", "rights"=>"CC-BY"}])
       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.related_identifiers.last).to eq("related_identifier"=>"10.6084/m9.figshare.4234751", "related_identifier_type"=>"DOI", "relation_type"=>"IsIdenticalTo")
       expect(subject.publisher).to eq("Figshare")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
@@ -151,8 +151,8 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Publication Fp7 Funding Acknowledgment - Plos Openaire"}])
-      expect(subject.description.first["text"]).to start_with("The dataset contains a sample of metadata describing papers")
+      expect(subject.titles).to eq([{"title"=>"Publication Fp7 Funding Acknowledgment - Plos Openaire"}])
+      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", "date_type"=>"Issued"}])
       expect(subject.publication_year).to eq("2013")
       expect(subject.publisher).to eq("Zenodo")
@@ -196,11 +196,11 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.doi).to eq("10.5072/geopointexample")
       expect(subject.creator.length).to eq(3)
       expect(subject.creator.first).to eq("familyName"=>"Schumann", "givenName"=>"Kai", "name"=>"Kai Schumann", "type"=>"Person")
-        expect(subject.title).to eq([{"text"=>"Gridded results of swath bathymetric mapping of Disko Bay, Western Greenland, 2007-2008"}])
+      expect(subject.titles).to eq([{"title"=>"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.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"}}])
+      expect(subject.related_identifiers).to eq([{"related_identifier"=>"10.5072/timeseries", "related_identifier_type"=>"DOI", "relation_type"=>"Continues"}])
+      expect(subject.geo_locations).to eq([{"geo_location_place"=>"Disko Bay", "geo_location_point"=>{"point_latitude"=>"69.000000", "point_longitude"=>"-52.000000"}}])
     end
 
     it "geo_location_box" do
@@ -212,11 +212,11 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.doi).to eq("10.6071/z7wc73")
       expect(subject.creator.length).to eq(6)
       expect(subject.creator.first).to eq("familyName"=>"Bales", "givenName"=>"Roger", "name"=>"Roger Bales", "type"=>"Person")
-        expect(subject.title).to eq([{"text"=>"Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek\n      meteorological data, soil moisture and temperature, snow depth and air\n      temperature"}])
+      expect(subject.titles).to eq([{"title"=>"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.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"=>
+      expect(subject.geo_locations).to eq([{"geo_location_box"=>
         {"east_bound_longitude"=>"-119.182",
          "north_bound_latitude"=>"37.075",
          "south_bound_latitude"=>"37.046",
@@ -233,7 +233,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.14457/kmitl.res.2006.17")
       expect(subject.types["type"]).to eq("Dataset")
       expect(subject.creator.length).to eq(1)
-      expect(subject.creator.first).to eq(["name", "กัญจนา แซ่เตียว"])
+      expect(subject.creator.first).to eq("name" => "กัญจนา แซ่เตียว")
     end
 
     it "multiple author names in one creatorName" do
@@ -242,7 +242,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.7910/dvn/eqtqyo")
       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)")
+      expect(subject.creator).to eq([{"name" => "Enos, Ryan (Harvard University); Fowler, Anthony (University Of Chicago); Vavreck, Lynn (UCLA)"}])
     end
 
     it "author with scheme" do
@@ -270,7 +270,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.21233/n34n5q")
-      expect(subject.keywords).to eq([{"subject_scheme"=>"Library of Congress", "scheme_uri"=>"http://id.loc.gov/authorities/subjects", "text"=>"Paleoecology"}])
+      expect(subject.subjects).to eq([{"subject_scheme"=>"Library of Congress", "scheme_uri"=>"http://id.loc.gov/authorities/subjects", "subject"=>"Paleoecology"}])
     end
 
     it "Funding" do
@@ -283,8 +283,8 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"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.titles).to eq([{"title"=>"Dataset for \"Direct Evidence for Solid-Like Hydrogen in a Nanoporous Carbon Hydrogen Storage Material at Supercritical Temperatures\""}])
+      expect(subject.descriptions.first["description"]).to start_with("Dataset for Direct Evidence for Solid-Like Hydrogen")
       expect(subject.publication_year).to eq("2015")
       expect(subject.publisher).to eq("University of Bath")
       expect(subject.funding_references.length).to eq(5)
@@ -310,8 +310,8 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Technical and Human Infrastructure for Open Research (THOR)"}])
-      expect(subject.description.first["text"]).to start_with("Five years ago, a global infrastructure")
+      expect(subject.titles).to eq([{"title"=>"Technical and Human Infrastructure for Open Research (THOR)"}])
+      expect(subject.descriptions.first["description"]).to start_with("Five years ago, a global infrastructure")
       expect(subject.publication_year).to eq("2015")
       expect(subject.publisher).to eq("DataCite")
       expect(subject.funding_references).to eq([{"award_number"=>"654039",
@@ -334,13 +334,13 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Eating your own Dog Food"}])
-      expect(subject.alternate_identifiers).to eq("type"=>"Local accession number", "name"=>"MS-49-3632-5083")
+      expect(subject.creator).to eq([{"type"=>"Person", "id"=>"https://orcid.org/0000-0003-1419-2405", "name"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner"}])
+      expect(subject.titles).to eq([{"title"=>"Eating your own Dog Food"}])
+      expect(subject.alternate_identifiers).to eq([{"alternate_identifier"=>"MS-49-3632-5083", "alternate_identifier_type"=>"Local accession number"}])
       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.related_identifiers.last).to eq("related_identifier"=>"10.5438/0000-00ss", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
       expect(subject.service_provider).to eq("DataCite")
     end
 
@@ -355,13 +355,13 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Właściwości rzutowań podprzestrzeniowych"}, {"text"=>"Translation of Polish titles", "title_type"=>"TranslatedTitle"}])
-      expect(subject.alternate_identifiers).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
-      expect(subject.dates).to eq([{"date"=>"2012-12-13", "date_type"=>"Other"}, {"date"=>"2010", "date_type"=>"Issued"}])
+      expect(subject.titles).to eq([{"title"=>"Właściwości rzutowań podprzestrzeniowych"}, {"title"=>"Translation of Polish titles", "title_type"=>"TranslatedTitle"}])
+      expect(subject.alternate_identifiers).to eq([{"alternate_identifier"=>"937-0-4523-12357-6", "alternate_identifier_type"=>"ISBN"}])
+      expect(subject.dates).to eq([{"date"=>"2012-12-13", "date_information"=>"Correction", "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"}])
+      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.5272/oldertestpub", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf", "resource_type_general"=>"Text")
+      expect(subject.rights_list).to eq([{"lang"=>"eng", "rights_uri"=>"http://creativecommons.org/licenses/by-nd/2.0", "rights"=>"Creative Commons Attribution-NoDerivs 2.0 Generic"}])
       expect(subject.publisher).to eq("Springer")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -378,12 +378,12 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Właściwości rzutowań podprzestrzeniowych"}, {"text"=>"Translation of Polish titles", "title_type"=>"TranslatedTitle"}])
-      expect(subject.alternate_identifiers).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
+      expect(subject.titles).to eq([{"title"=>"Właściwości rzutowań podprzestrzeniowych"}, {"title"=>"Translation of Polish titles", "title_type"=>"TranslatedTitle"}])
+      expect(subject.alternate_identifiers).to eq([{"alternate_identifier"=>"937-0-4523-12357-6", "alternate_identifier_type"=>"ISBN"}])
       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"}])
+      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.5272/oldertestpub", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
+      expect(subject.rights_list).to eq([{"rights_uri"=>"http://creativecommons.org/licenses/by-nd/2.0", "rights"=>"Creative Commons Attribution-NoDerivs 2.0 Generic"}])
       expect(subject.publisher).to eq("Springer")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4.0")
@@ -400,12 +400,12 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Właściwości rzutowań podprzestrzeniowych"}, {"text"=>"Translation of Polish titles", "title_type"=>"TranslatedTitle"}])
-      expect(subject.alternate_identifiers).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
+      expect(subject.titles).to eq([{"title"=>"Właściwości rzutowań podprzestrzeniowych"}, {"title"=>"Translation of Polish titles", "title_type"=>"TranslatedTitle"}])
+      expect(subject.alternate_identifiers).to eq([{"alternate_identifier"=>"937-0-4523-12357-6", "alternate_identifier_type"=>"ISBN"}])
       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"}])
+      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.5272/oldertestpub", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
+      expect(subject.rights_list).to eq([{"rights_uri"=>"http://creativecommons.org/licenses/by-nd/2.0", "rights"=>"Creative Commons Attribution-NoDerivs 2.0 Generic"}])
       expect(subject.publisher).to eq("Springer")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3.0")
@@ -422,12 +422,12 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Właściwości rzutowań podprzestrzeniowych"}, {"text"=>"Translation of Polish titles", "title_type"=>"TranslatedTitle"}])
-      expect(subject.alternate_identifiers).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
+      expect(subject.titles).to eq([{"title"=>"Właściwości rzutowań podprzestrzeniowych"}, {"title"=>"Translation of Polish titles", "title_type"=>"TranslatedTitle"}])
+      expect(subject.alternate_identifiers).to eq([{"alternate_identifier"=>"937-0-4523-12357-6", "alternate_identifier_type"=>"ISBN"}])
       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.related_identifiers.last).to eq("related_identifier"=>"10.5272/oldertestpub", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
       expect(subject.publisher).to eq("Springer")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.2")
@@ -442,17 +442,17 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Właściwości rzutowań podprzestrzeniowych"}, {"text"=>"Translation of Polish titles", "title_type"=>"TranslatedTitle"}])
-      expect(subject.alternate_identifiers).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
-      expect(subject.dates).to eq([{"date"=>"2012-12-13", "date_type"=>"Other"}, {"date"=>"2010", "date_type"=>"Issued"}])
+      expect(subject.titles).to eq([{"title"=>"Właściwości rzutowań podprzestrzeniowych"}, {"title"=>"Translation of Polish titles", "title_type"=>"TranslatedTitle"}])
+      expect(subject.alternate_identifiers).to eq([{"alternate_identifier"=>"937-0-4523-12357-6", "alternate_identifier_type"=>"ISBN"}])
+      expect(subject.dates).to eq([{"date"=>"2012-12-13", "date_information"=>"Correction", "date_type"=>"Other"}, {"date"=>"2010", "date_type"=>"Issued"}])
       expect(subject.publication_year).to eq("2010")
-      expect(subject.size).to eq(["256 pages"])
+      expect(subject.sizes).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.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"}])
+      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.5272/oldertestpub", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf", "resource_type_general"=>"Text")
+      expect(subject.rights_list).to eq([{"lang"=>"eng", "rights_uri"=>"http://creativecommons.org/licenses/by-nd/2.0", "rights"=>"Creative Commons Attribution-NoDerivs 2.0 Generic"}])
       expect(subject.publisher).to eq("Springer")
       expect(subject.service_provider).to eq("DataCite")
     end
@@ -467,7 +467,7 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"LAMMPS Data-File Generator"}])
+      expect(subject.titles).to eq([{"title"=>"LAMMPS Data-File Generator"}])
       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")
@@ -482,8 +482,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.5067/terra+aqua/ceres/cldtyphist_l3.004")
       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([{"text"=>"CERES Level 3 Cloud Type Historgram Terra+Aqua HDF file - Edition4"}])
+      expect(subject.creator).to eq([{"type"=>"Person", "name"=>"Takmeng Wong", "givenName"=>"Takmeng", "familyName"=>"Wong"}])
+      expect(subject.titles).to eq([{"title"=>"CERES Level 3 Cloud Type Historgram Terra+Aqua HDF file - Edition4"}])
       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")
@@ -497,9 +497,9 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.4232/1.2745")
       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.creator).to eq([{"type"=>"Organization", "name"=>"Europäische Kommission"}])
+      expect(subject.titles).to eq([{"lang"=>"de", "title"=>"Flash Eurobarometer 54 (Madrid Summit)"}, {"lang"=>"en", "title"=>"Flash Eurobarometer 54 (Madrid Summit)"}, {"title_type"=>"Subtitle","lang"=>"de", "title"=>"The Common European Currency"}, {"title_type"=>"Subtitle", "lang"=>"en", "title"=>"The Common European Currency"}])
+      expect(subject.subjects).to eq([{"subject_scheme"=>"ZA", "lang"=>"en", "subject"=>"KAT12 International Institutions, Relations, Conditions"}])
       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")
@@ -517,11 +517,11 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Rural Electrification With Hybrid Power Systems Based on Renewables - Technical System Configurations From the Point of View of the European Industry"}])
+      expect(subject.titles).to eq([{"title"=>"Rural Electrification With Hybrid Power Systems Based on Renewables - Technical System Configurations From the Point of View of the European Industry"}])
       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.first["text"]).to start_with("Aim of this paper is the presentation")
+      expect(subject.descriptions.first["description"]).to start_with("Aim of this paper is the presentation")
       expect(subject.publisher).to eq("WIP-Munich")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.2")
@@ -533,7 +533,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.doi).to eq("10.23725/8na3-9s47")
       expect(subject.identifier).to eq("https://doi.org/10.23725/8na3-9s47")
-      expect(subject.alternate_identifiers).to include({"name"=>"3b33f6b9338fccab0901b7d317577ea3", "type"=>"md5"}, {"name"=>"ark:/99999/fk41CrU4eszeLUDe", "type"=>"minid"}, {"name"=>"dg.4503/c3d66dc9-58da-411c-83c4-dd656aa3c4b7", "type"=>"dataguid"})
+      expect(subject.alternate_identifiers.length).to eq(3)
+      expect(subject.alternate_identifiers.first).to eq("alternate_identifier"=>"ark:/99999/fk41CrU4eszeLUDe", "alternate_identifier_type"=>"minid")
       expect(subject.content_url).to include("s3://cgp-commons-public/topmed_open_access/197bc047-e917-55ed-852d-d563cdbc50e4/NWD165827.recab.cram", "gs://topmed-irc-share/public/NWD165827.recab.cram")
     end
 
@@ -545,8 +546,8 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Messung der Bildunschaerfe in H.264-codierten Bildern und Videosequenzen"}])
+      expect(subject.creator).to eq([{"name"=>"Anonymous"}])
+      expect(subject.titles).to eq([{"title"=>"Messung der Bildunschaerfe in H.264-codierten Bildern und Videosequenzen"}])
       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")
@@ -576,7 +577,7 @@ describe Bolognese::Metadata, vcr: true do
                                      "name"=>"Henk Eskes",
                                      "givenName"=>"Henk",
                                      "familyName"=>"Eskes"}])
-      expect(subject.title).to eq([{"text"=>"Multi-Sensor Reanalysis (MSR) of total ozone, version 2"}])
+      expect(subject.titles).to eq([{"title"=>"Multi-Sensor Reanalysis (MSR) of total ozone, version 2"}])
       expect(subject.version).to eq("2")
       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")
@@ -602,8 +603,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://handle.test.datacite.org/10.22002/d1.694")
       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([{"text"=>"Test license"}])
+      expect(subject.creator).to eq([{"name"=>"Tester"}])
+      expect(subject.titles).to eq([{"title"=>"Test license"}])
       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")
@@ -623,7 +624,7 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Referee report. For: Gates - add article keywords to the metatags [version 2; referees: 1 approved]"}])
+      expect(subject.titles).to eq([{"title"=>"Referee report. For: Gates - add article keywords to the metatags [version 2; referees: 1 approved]"}])
       expect(subject.publication_year).to eq("2018")
       expect(subject.publisher).to eq("Gates Open Research")
       expect(subject.service_provider).to eq("DataCite")
@@ -633,7 +634,7 @@ describe Bolognese::Metadata, vcr: true do
     it "missing creator" do
       input = fixture_path + "datacite_missing_creator.xml"
       subject = Bolognese::Metadata.new(input: input, regenerate: true)
-      expect(subject.creator).to be_nil
+      expect(subject.creator).to be_blank
       expect(subject.valid?).to be false
       expect(subject.errors).to eq("4:0: ERROR: Element '{http://datacite.org/schema/kernel-4}creators': Missing child element(s). Expected is ( {http://datacite.org/schema/kernel-4}creator ).")
     end
@@ -641,7 +642,7 @@ describe Bolognese::Metadata, vcr: true do
     it "malformed creator" do
       input = fixture_path + "datacite_malformed_creator.xml"
       subject = Bolognese::Metadata.new(input: input, regenerate: false)
-      expect(subject.creator).to be_nil
+      expect(subject.creator).to be_blank
       expect(subject.valid?).to be false
       expect(subject.errors).to eq("16:0: ERROR: Element '{http://datacite.org/schema/kernel-4}creatorName': This element is not expected. Expected is ( {http://datacite.org/schema/kernel-4}affiliation ).")
     end
@@ -664,8 +665,8 @@ describe Bolognese::Metadata, vcr: true do
       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([{"text"=>"Dynamics of colloids in molecular glass forming liquids studied via X-ray photon correlation spectroscopy"}])
+      expect(subject.creator).to eq([{"type"=>"Person", "name"=>"Heiko Conrad", "givenName"=>"Heiko", "familyName"=>"Conrad"}])
+      expect(subject.titles).to eq([{"title"=>"Dynamics of colloids in molecular glass forming liquids studied via X-ray photon correlation spectroscopy"}])
       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"}])
@@ -682,8 +683,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.4121/uuid:3926db30-f712-4394-aebc-75976070e91f")
       expect(subject.types["type"]).to eq("Dataset")
       expect(subject.types["resource_type_general"]).to eq("Dataset")
-      expect(subject.title).to eq([{"text"=>"BPI Challenge 2012"}])
-      expect(subject.dates).to eq([{"date"=>"2011-10-01/2012-03-14", "date_type"=>"Other"}, {"date"=>"2012", "date_type"=>"Issued"}])
+      expect(subject.titles).to eq([{"title"=>"BPI Challenge 2012"}])
+      expect(subject.dates).to eq([{"date"=>"2011-10-01/2012-03-14", "date_information"=>"Temporal coverage of this dataset.", "date_type"=>"Other"}, {"date"=>"2012", "date_type"=>"Issued"}])
       expect(subject.publication_year).to eq("2012")
       expect(subject.state).to eq("findable")
     end
@@ -691,13 +692,13 @@ describe Bolognese::Metadata, vcr: true do
 
   context "change datacite metadata" do
     it "change title" do
-      subject.title = "A new malaria agent in African hominids."
+      subject.titles = [{"title"=> "A new malaria agent in African hominids." }]
       expect(subject.valid?).to be true
       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.types["type"]).to eq("Dataset")
-      expect(subject.title).to eq("A new malaria agent in African hominids.")
+      expect(subject.titles).to eq([{"title"=> "A new malaria agent in African hominids." }])
     end
 
     it "change state" do
@@ -707,7 +708,7 @@ describe Bolognese::Metadata, vcr: true do
       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.types["type"]).to eq("Dataset")
-      expect(subject.title).to eq([{"text"=>"Data from: A new malaria agent in African hominids."}])
+      expect(subject.titles).to eq([{"title"=>"Data from: A new malaria agent in African hominids."}])
       expect(subject.state).to eq("registered")
     end
   end
@@ -720,8 +721,8 @@ 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.doi).to eq("10.5061/dryad.8515")
-      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([{"text"=>"Eating your own Dog Food"}])
+      expect(subject.creator).to eq([{"type"=>"Person", "id"=>"https://orcid.org/0000-0003-1419-2405", "name"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner"}])
+      expect(subject.titles).to eq([{"title"=>"Eating your own Dog Food"}])
       expect(subject.publisher).to eq("DataCite")
       expect(subject.publication_year).to eq("2016")
     end
@@ -739,15 +740,15 @@ describe Bolognese::Metadata, vcr: true do
     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.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([{"text"=>"DroNc-seq data"}])
-    expect(subject.keywords).to eq([{"text"=>"gtex"}, {"text"=>"annotation"}, {"text"=>"phenotype"}, {"text"=>"gene regulation"}, {"text"=>"transcriptomics"}])
+    expect(subject.creator).to eq([{"name"=>"The GTEx Consortium", "type"=>"Organization"}])
+    expect(subject.titles).to eq([{"title"=>"DroNc-seq data"}])
+    expect(subject.subjects).to eq([{"subject"=>"gtex"}, {"subject"=>"annotation"}, {"subject"=>"phenotype"}, {"subject"=>"gene regulation"}, {"subject"=>"transcriptomics"}])
     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.related_identifiers.last).to eq("related_identifier"=>"https://www.ebi.ac.uk/miriam/main/datatypes/MIR:00000663", "related_identifier_type"=>"URL", "relation_type"=>"IsPartOf")
     expect(subject.formats).to eq(["application/tar"])
-    expect(subject.size).to eq(["15.7M"])
+    expect(subject.sizes).to eq(["15.7M"])
     expect(subject.periodical).to eq("id"=>"https://www.ebi.ac.uk/miriam/main/datatypes/MIR:00000663", "title"=>"GTEx", "type"=>"DataCatalog")
     expect(subject.publisher).to eq("GTEx")
     expect(subject.funding_references.count).to eq(7)