bolognese 1.0.7 → 1.0.8

data/spec/readers/datacite_json_reader_spec.rb

@@ -17,16 +17,16 @@ 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"=>"article", "citeproc"=>"article-journal", "resource_type"=>"BlogPosting", "resource_type_general"=>"Text", "ris"=>"RPRT", "type"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"BlogPosting", "resourceTypeGeneral"=>"Text", "ris"=>"RPRT", "schemaOrg"=>"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.alternate_identifiers).to eq([{"alternateIdentifier"=>"MS-49-3632-5083", "alternateIdentifierType"=>"Local accession number"}])
+      expect(subject.dates).to eq([{"date"=>"2016-12-20", "dateType"=>"Created"}, {"date"=>"2016-12-20", "dateType"=>"Issued"}, {"date"=>"2016-12-20", "dateType"=>"Updated"}])
       expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
-      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")
+      expect(subject.related_identifiers.first).to eq("relatedIdentifier"=>"10.5438/0000-00ss", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
+      expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5438/55e5-t5c0", "relatedIdentifierType"=>"DOI", "relationType"=>"References")
+      expect(subject.source).to eq("DataCite")
     end
 
     # it "SoftwareSourceCode" do
@@ -40,7 +40,7 @@ describe Bolognese::Metadata, vcr: true do
     #   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")
+    #   expect(subject.source).to eq("DataCite")
     # end
 
     it "SoftwareSourceCode missing_comma" do

data/spec/readers/datacite_reader_spec.rb

@@ -20,21 +20,21 @@ 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.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["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceType"]).to eq("DataPackage")
+      expect(subject.types["resourceTypeGeneral"]).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.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.alternate_identifiers).to eq([{"alternateIdentifier"=>"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.","alternateIdentifierType"=>"citation"}])
+      expect(subject.rights_list).to eq([{"rightsUri"=>"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("related_identifier"=>"19478877", "related_identifier_type"=>"PMID", "relation_type"=>"IsSupplementTo")
+      expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"19478877", "relatedIdentifierType"=>"PMID", "relationType"=>"IsSupplementTo")
       expect(subject.publisher).to eq("Dryad Digital Repository")
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -43,22 +43,22 @@ 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.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["schemaOrg"]).to eq("ScholarlyArticle")
+      expect(subject.types["resourceType"]).to eq("BlogPosting")
+      expect(subject.types["resourceTypeGeneral"]).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.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.alternate_identifiers).to eq([{"alternateIdentifier"=>"MS-49-3632-5083", "alternateIdentifierType"=>"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.dates).to eq([{"date"=>"2016-12-20", "dateType"=>"Created"}, {"date"=>"2016-12-20", "dateType"=>"Issued"}, {"date"=>"2016-12-20", "dateType"=>"Updated"}])
       expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
-      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.5438/0000-00ss", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
+      expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5438/0000-00ss", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
       expect(subject.publisher).to eq("DataCite")
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -67,16 +67,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.4230/lipics.tqc.2013.93")
-      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.types["schemaOrg"]).to eq("ScholarlyArticle")
+      expect(subject.types["resourceType"]).to eq("ConferencePaper")
+      expect(subject.types["resourceTypeGeneral"]).to eq("Text")
       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.dates).to eq([{"date"=>"2013-11-05", "dateType"=>"Available"}, {"date"=>"2013", "dateType"=>"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.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.1")
     end
 
@@ -85,16 +85,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.17630/bb43e6a3-72e0-464c-9fdd-fbe5d3e56a09")
-      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.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceType"]).to eq("Dataset")
+      expect(subject.types["resourceTypeGeneral"]).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.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.dates).to eq([{"date"=>"2016-01-20", "dateType"=>"Available"}, {"date"=>"2016", "dateType"=>"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.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -103,20 +103,20 @@ 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.types["type"]).to eq("SoftwareSourceCode")
-      expect(subject.types["resource_type_general"]).to eq("Software")
+      expect(subject.types["schemaOrg"]).to eq("SoftwareSourceCode")
+      expect(subject.types["resourceTypeGeneral"]).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.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.rights_list).to eq([{"rightsUri"=>"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", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(1)
-      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.related_identifiers.last).to eq("relatedIdentifier"=>"https://github.com/kjgarza/frame_experiment_analysis/tree/v1.0", "relatedIdentifierType"=>"URL", "relationType"=>"IsSupplementTo")
       expect(subject.publisher).to eq("Zenodo")
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -125,20 +125,20 @@ 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.types["type"]).to eq("Dataset")
-      expect(subject.types["resource_type"]).to eq("Dataset")
-      expect(subject.types["resource_type_general"]).to eq("Dataset")
+      expect(subject.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceType"]).to eq("Dataset")
+      expect(subject.types["resourceTypeGeneral"]).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.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.rights_list).to eq([{"rightsUri"=>"https://creativecommons.org/licenses/by/4.0", "rights"=>"CC-BY"}])
+      expect(subject.dates).to eq([{"date"=>"2016-11-16", "dateType"=>"Created"}, {"date"=>"2016-11-16", "dateType"=>"Updated"}, {"date"=>"2016", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(1)
-      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.6084/m9.figshare.4234751", "related_identifier_type"=>"DOI", "relation_type"=>"IsIdenticalTo")
+      expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.6084/m9.figshare.4234751", "relatedIdentifierType"=>"DOI", "relationType"=>"IsIdenticalTo")
       expect(subject.publisher).to eq("Figshare")
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -147,30 +147,30 @@ 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.types["type"]).to eq("Dataset")
-      expect(subject.types["resource_type_general"]).to eq("Dataset")
+      expect(subject.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceTypeGeneral"]).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.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.dates).to eq([{"date"=>"2013-04-03", "dateType"=>"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",
-        "award_uri"=>"info:eu-repo/grantAgreement/EC/FP7/246686/",
-        "funder_identifier"=>"https://doi.org/10.13039/501100000780",
-        "funder_identifier_type"=>"Crossref Funder ID",
-        "funder_name"=>"European Commission"}])
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.funding_references).to eq([{"awardNumber"=>"246686",
+        "awardTitle"=>"Open Access Infrastructure for Research in Europe",
+        "awardUri"=>"info:eu-repo/grantAgreement/EC/FP7/246686/",
+        "funderIdentifier"=>"https://doi.org/10.13039/501100000780",
+        "funderIdentifierType"=>"Crossref Funder ID",
+        "funderName"=>"European Commission"}])
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
     it "missing resource_type_general" do
       input = fixture_path + 'vivli.xml'
       subject = Bolognese::Metadata.new(input: input)
-      expect(subject.types["type"]).to eq("CreativeWork")
-      expect(subject.types["resource_type_general"]).to be_nil
+      expect(subject.types["schemaOrg"]).to eq("CreativeWork")
+      expect(subject.types["resourceTypeGeneral"]).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
@@ -180,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.types["type"]).to eq("Dataset")
-      expect(subject.types["resource_type"]).to eq("dataset")
-      expect(subject.types["resource_type_general"]).to eq("Dataset")
+      expect(subject.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceType"]).to eq("dataset")
+      expect(subject.types["resourceTypeGeneral"]).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
@@ -199,8 +199,8 @@ describe Bolognese::Metadata, vcr: true do
       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([{"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"}}])
+      expect(subject.related_identifiers).to eq([{"relatedIdentifier"=>"10.5072/timeseries", "relatedIdentifierType"=>"DOI", "relationType"=>"Continues"}])
+      expect(subject.geo_locations).to eq([{"geoLocationPlace"=>"Disko Bay", "geoLocationPoint"=>{"pointLatitude"=>"69.000000", "pointLongitude"=>"-52.000000"}}])
     end
 
     it "geo_location_box" do
@@ -214,16 +214,15 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creator.first).to eq("familyName"=>"Bales", "givenName"=>"Roger", "name"=>"Roger Bales", "type"=>"Person")
       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.dates).to eq([{"date"=>"2014-10-17", "dateType"=>"Updated"}, {"date"=>"2016-03-14T17:02:02Z", "dateType"=>"Available"}, {"date"=>"2013", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2013")
-      expect(subject.geo_locations).to eq([{"geo_location_box"=>
-        {"east_bound_longitude"=>"-119.182",
-         "north_bound_latitude"=>"37.075",
-         "south_bound_latitude"=>"37.046",
-         "west_bound_longitude"=>"-119.211"},
-         "geo_location_place"=>"Providence Creek (Lower, Upper and P301)",
-         "geo_location_point"=>
-        {"point_latitude"=>"37.047756", "point_longitude"=>"-119.221094"}}])
+      expect(subject.geo_locations).to eq([{"geoLocationBox"=>
+        {"eastBoundLongitude"=>"-119.182",
+         "northBoundLatitude"=>"37.075",
+         "southBoundLatitude"=>"37.046",
+         "westBoundLongitude"=>"-119.211"},
+         "geoLocationPlace"=>"Providence Creek (Lower, Upper and P301)",
+         "geoLocationPoint"=>  {"pointLatitude"=>"37.047756", "pointLongitude"=>"-119.221094"}}])
     end
 
     it "author only full name" do
@@ -231,7 +230,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.types["type"]).to eq("Dataset")
+      expect(subject.types["schemaOrg"]).to eq("Dataset")
       expect(subject.creator.length).to eq(1)
       expect(subject.creator.first).to eq("name" => "กัญจนา แซ่เตียว")
     end
@@ -241,7 +240,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.types["type"]).to eq("Dataset")
+      expect(subject.types["schemaOrg"]).to eq("Dataset")
       expect(subject.creator).to eq([{"name" => "Enos, Ryan (Harvard University); Fowler, Anthony (University Of Chicago); Vavreck, Lynn (UCLA)"}])
     end
 
@@ -250,7 +249,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.types["type"]).to eq("ScholarlyArticle")
+      expect(subject.types["schemaOrg"]).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
@@ -260,9 +259,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.2314/coscv1")
-      expect(subject.types["type"]).to eq("ScholarlyArticle")
+      expect(subject.types["schemaOrg"]).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")
+      expect(subject.creator.first).to include("type"=>"Person", "id" => "https://orcid.org/0000-0003-0232-7085", "name"=>"Lambert Heller", "givenName"=>"Lambert", "familyName"=>"Heller")
     end
 
     it "keywords with attributes" do
@@ -270,7 +269,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.subjects).to eq([{"subject_scheme"=>"Library of Congress", "scheme_uri"=>"http://id.loc.gov/authorities/subjects", "subject"=>"Paleoecology"}])
+      expect(subject.subjects).to eq([{"schemeUri"=>"http://id.loc.gov/authorities/subjects", "subject"=>"Paleoecology", "subjectScheme"=>"Library of Congress"}])
     end
 
     it "Funding" do
@@ -278,9 +277,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.15125/bath-00114")
-      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.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceType"]).to eq("Dataset")
+      expect(subject.types["resourceTypeGeneral"]).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.titles).to eq([{"title"=>"Dataset for \"Direct Evidence for Solid-Like Hydrogen in a Nanoporous Carbon Hydrogen Storage Material at Supercritical Temperatures\""}])
@@ -288,13 +287,13 @@ describe Bolognese::Metadata, vcr: true do
       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",
-        "award_title" => "SUPERGEN Hub Funding",
-        "award_uri" => "EP/J016454/1",
-        "funder_identifier" => "https://doi.org/10.13039/501100000266",
-        "funder_identifier_type" => "Crossref Funder ID",
-        "funder_name" => "Engineering and Physical Sciences Research Council (EPSRC)")
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.funding_references.first).to eq("awardNumber" => "EP/J016454/1",
+        "awardTitle" => "SUPERGEN Hub Funding",
+        "awardUri" => "EP/J016454/1",
+        "funderIdentifier" => "https://doi.org/10.13039/501100000266",
+        "funderIdentifierType" => "Crossref Funder ID",
+        "funderName" => "Engineering and Physical Sciences Research Council (EPSRC)")
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -303,9 +302,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.5438/6423")
-      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["schemaOrg"]).to eq("Collection")
+      expect(subject.types["resourceType"]).to eq("Project")
+      expect(subject.types["resourceTypeGeneral"]).to eq("Collection")
       expect(subject.types["ris"]).to eq("GEN")
       expect(subject.types["citeproc"]).to eq("article")
       expect(subject.creator.length).to eq(24)
@@ -314,13 +313,13 @@ describe Bolognese::Metadata, vcr: true do
       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",
-        "award_title"=>"THOR – Technical and Human Infrastructure for Open Research",
-        "award_uri"=>"http://cordis.europa.eu/project/rcn/194927_en.html",
-        "funder_identifier"=>"https://doi.org/10.13039/501100000780",
-        "funder_identifier_type"=>"Crossref Funder ID",
-        "funder_name"=>"European Commission"}])
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.funding_references).to eq([{"awardNumber"=>"654039",
+        "awardTitle"=>"THOR – Technical and Human Infrastructure for Open Research",
+        "awardUri"=>"http://cordis.europa.eu/project/rcn/194927_en.html",
+        "funderIdentifier"=>"https://doi.org/10.13039/501100000780",
+        "funderIdentifierType"=>"Crossref Funder ID",
+        "funderName"=>"European Commission"}])
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -329,19 +328,19 @@ 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.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["schemaOrg"]).to eq("ScholarlyArticle")
+      expect(subject.types["resourceType"]).to eq("BlogPosting")
+      expect(subject.types["resourceTypeGeneral"]).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.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.alternate_identifiers).to eq([{"alternateIdentifier"=>"MS-49-3632-5083", "alternateIdentifierType"=>"Local accession number"}])
+      expect(subject.dates).to eq([{"date"=>"2016-12-20", "dateType"=>"Created"}, {"date"=>"2016-12-20", "dateType"=>"Issued"}, {"date"=>"2016-12-20", "dateType"=>"Updated"}])
       expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
-      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")
+      expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5438/0000-00ss", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
+      expect(subject.source).to eq("DataCite")
     end
 
     it "Schema 4.1 from string" do
@@ -349,21 +348,21 @@ 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.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["schemaOrg"]).to eq("Book")
+      expect(subject.types["resourceType"]).to eq("Monograph")
+      expect(subject.types["resourceTypeGeneral"]).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.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.titles).to eq([{"title"=>"Właściwości rzutowań podprzestrzeniowych"}, {"title"=>"Translation of Polish titles", "titleType"=>"TranslatedTitle"}])
+      expect(subject.alternate_identifiers).to eq([{"alternateIdentifier"=>"937-0-4523-12357-6", "alternateIdentifierType"=>"ISBN"}])
+      expect(subject.dates).to eq([{"date"=>"2012-12-13", "dateInformation"=>"Correction", "dateType"=>"Other"}, {"date"=>"2010", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2010")
       expect(subject.related_identifiers.length).to eq(1)
-      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.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
+      expect(subject.rights_list).to eq([{"lang"=>"eng", "rightsUri"=>"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.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -372,20 +371,20 @@ 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.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["schemaOrg"]).to eq("Book")
+      expect(subject.types["resourceType"]).to eq("Monograph")
+      expect(subject.types["resourceTypeGeneral"]).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.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.titles).to eq([{"title"=>"Właściwości rzutowań podprzestrzeniowych"}, {"title"=>"Translation of Polish titles", "titleType"=>"TranslatedTitle"}])
+      expect(subject.alternate_identifiers).to eq([{"alternateIdentifier"=>"937-0-4523-12357-6", "alternateIdentifierType"=>"ISBN"}])
       expect(subject.publication_year).to eq("2010")
       expect(subject.related_identifiers.length).to eq(1)
-      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.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
+      expect(subject.rights_list).to eq([{"rightsUri"=>"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.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4.0")
     end
 
@@ -394,20 +393,20 @@ 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.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["schemaOrg"]).to eq("Book")
+      expect(subject.types["resourceType"]).to eq("Monograph")
+      expect(subject.types["resourceTypeGeneral"]).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.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.titles).to eq([{"title"=>"Właściwości rzutowań podprzestrzeniowych"}, {"title"=>"Translation of Polish titles", "titleType"=>"TranslatedTitle"}])
+      expect(subject.alternate_identifiers).to eq([{"alternateIdentifier"=>"937-0-4523-12357-6", "alternateIdentifierType"=>"ISBN"}])
       expect(subject.publication_year).to eq("2010")
       expect(subject.related_identifiers.length).to eq(1)
-      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.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
+      expect(subject.rights_list).to eq([{"rightsUri"=>"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.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3.0")
     end
 
@@ -416,20 +415,20 @@ 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.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["schemaOrg"]).to eq("Book")
+      expect(subject.types["resourceType"]).to eq("Monograph")
+      expect(subject.types["resourceTypeGeneral"]).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.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.titles).to eq([{"title"=>"Właściwości rzutowań podprzestrzeniowych"}, {"title"=>"Translation of Polish titles", "titleType"=>"TranslatedTitle"}])
+      expect(subject.alternate_identifiers).to eq([{"alternateIdentifier"=>"937-0-4523-12357-6", "alternateIdentifierType"=>"ISBN"}])
+      expect(subject.dates).to eq([{"date"=>"2009-04-29", "dateType"=>"StartDate"}, {"date"=>"2010-01-05", "dateType"=>"EndDate"}, {"date"=>"2010", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2010")
       expect(subject.related_identifiers.length).to eq(1)
-      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.5272/oldertestpub", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf")
+      expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
       expect(subject.publisher).to eq("Springer")
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.2")
     end
 
@@ -438,23 +437,23 @@ 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.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["schemaOrg"]).to eq("Book")
+      expect(subject.types["resourceType"]).to eq("Monograph")
+      expect(subject.types["resourceTypeGeneral"]).to eq("Text")
       expect(subject.creator).to eq([{"type"=>"Person", "name"=>"John Smith", "givenName"=>"John", "familyName"=>"Smith"}, {"name"=>"つまらないものですが"}])
-      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.titles).to eq([{"title"=>"Właściwości rzutowań podprzestrzeniowych"}, {"title"=>"Translation of Polish titles", "titleType"=>"TranslatedTitle"}])
+      expect(subject.alternate_identifiers).to eq([{"alternateIdentifier"=>"937-0-4523-12357-6", "alternateIdentifierType"=>"ISBN"}])
+      expect(subject.dates).to eq([{"date"=>"2012-12-13", "dateInformation"=>"Correction", "dateType"=>"Other"}, {"date"=>"2010", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2010")
       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("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.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
+      expect(subject.rights_list).to eq([{"lang"=>"eng", "rightsUri"=>"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.source).to eq("DataCite")
     end
 
     it "namespaced xml from string" do
@@ -462,16 +461,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.4231/d38g8fk8b")
-      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.types["schemaOrg"]).to eq("SoftwareSourceCode")
+      expect(subject.types["resourceType"]).to eq("Simulation Tool")
+      expect(subject.types["resourceTypeGeneral"]).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.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.dates).to eq([{"date"=>"2018-07-18", "dateType"=>"Valid"}, {"date"=>"2018-07-18", "dateType"=>"Accepted"}, {"date"=>"2018", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2018")
       expect(subject.publisher).to eq("nanoHUB")
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.2")
     end
 
@@ -480,13 +479,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.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.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceTypeGeneral"]).to eq("Dataset")
       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")
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -495,15 +494,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.4232/1.2745")
-      expect(subject.types["type"]).to eq("Dataset")
-      expect(subject.types["resource_type_general"]).to eq("Dataset")
+      expect(subject.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceTypeGeneral"]).to eq("Dataset")
       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.titles).to eq([{"lang"=>"de", "title"=>"Flash Eurobarometer 54 (Madrid Summit)"}, {"lang"=>"en", "title"=>"Flash Eurobarometer 54 (Madrid Summit)"}, {"titleType"=>"Subtitle","lang"=>"de", "title"=>"The Common European Currency"}, {"titleType"=>"Subtitle", "lang"=>"en", "title"=>"The Common European Currency"}])
+      expect(subject.subjects).to eq([{"subjectScheme"=>"ZA", "lang"=>"en", "subject"=>"KAT12 International Institutions, Relations, Conditions"}])
+      expect(subject.dates).to eq([{"date"=>"1995-12", "dateType"=>"Collected"}, {"date"=>"1996", "dateType"=>"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.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -512,18 +511,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.4229/23rdeupvsec2008-5co.8.3")
-      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.types["schemaOrg"]).to eq("ScholarlyArticle")
+      expect(subject.types["resourceType"]).to eq("Article")
+      expect(subject.types["resourceTypeGeneral"]).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.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.dates).to eq([{"date"=>"2008-11-01", "dateType"=>"Valid"}, {"date"=>"2008", "dateType"=>"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.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.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.2")
     end
 
@@ -534,7 +533,7 @@ describe Bolognese::Metadata, vcr: true do
       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.length).to eq(3)
-      expect(subject.alternate_identifiers.first).to eq("alternate_identifier"=>"ark:/99999/fk41CrU4eszeLUDe", "alternate_identifier_type"=>"minid")
+      expect(subject.alternate_identifiers.first).to eq("alternateIdentifier"=>"ark:/99999/fk41CrU4eszeLUDe", "alternateIdentifierType"=>"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
 
@@ -543,15 +542,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.18169/papdeottx00502")
-      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.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceType"]).to eq("Disclosure")
+      expect(subject.types["resourceTypeGeneral"]).to eq("Dataset")
       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.dates).to eq([{"date"=>"07.04.2017", "dateType"=>"Available"}, {"date"=>"2017", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("Siemens AG")
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -560,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.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.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceType"]).to eq("Satellite data")
+      expect(subject.types["resourceTypeGeneral"]).to eq("Dataset")
       expect(subject.creator).to eq([{"type"=>"Person",
                                      "id"=>"https://orcid.org/0000-0002-0077-5338",
                                      "name"=>"Ronald Van Der A",
@@ -579,10 +578,10 @@ describe Bolognese::Metadata, vcr: true do
                                      "familyName"=>"Eskes"}])
       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.dates).to eq([{"date"=>"2014-04-25", "dateType"=>"Available"}, {"date"=>"1970-04-01 / (:tba)", "dateType"=>"Collected"}, {"date"=>"2015", "dateType"=>"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.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -592,7 +591,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be false
       expect(subject.identifier).to eq("https://doi.org/10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
       expect(subject.doi).to eq("10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.source).to eq("DataCite")
       expect(subject.state).to eq("not_found")
     end
 
@@ -601,14 +600,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.22002/d1.694")
-      expect(subject.types["type"]).to eq("Dataset")
-      expect(subject.types["resource_type_general"]).to eq("Dataset")
+      expect(subject.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceTypeGeneral"]).to eq("Dataset")
       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.dates).to eq([{"date"=>"2018-01-12", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2018")
       expect(subject.publisher).to eq("CaltechDATA")
-      expect(subject.service_provider).to eq("DataCite")
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
       expect(subject.state).to eq("findable")
     end
@@ -618,8 +617,8 @@ 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.types["type"]).to eq("ScholarlyArticle")
-      expect(subject.types["resource_type_general"]).to eq("Text")
+      expect(subject.types["schemaOrg"]).to eq("ScholarlyArticle")
+      expect(subject.types["resourceTypeGeneral"]).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)
@@ -627,7 +626,7 @@ describe Bolognese::Metadata, vcr: true do
       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")
+      expect(subject.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -651,7 +650,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "funding_reference.xml"
       subject = Bolognese::Metadata.new(input: input, regenerate: false)
       expect(subject.valid?).to be false
-      expect(subject.funding_references).to eq([{"funder_name"=>"Agency for Science, Technology and Research (Singapore)"}])
+      expect(subject.funding_references).to eq([{"funderName"=>"Agency for Science, Technology and Research (Singapore)"}])
       expect(subject.errors.first).to eq("31:0: ERROR: Element '{http://datacite.org/schema/kernel-4}fundingReference': Missing child element(s). Expected is one of ( {http://datacite.org/schema/kernel-4}funderName, {http://datacite.org/schema/kernel-4}funderIdentifier, {http://datacite.org/schema/kernel-4}awardNumber, {http://datacite.org/schema/kernel-4}awardTitle ).")
     end
 
@@ -660,19 +659,19 @@ 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.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["resourceTypeGeneral"]).to eq("Text")
+      expect(subject.types["resourceType"]).to eq("Dissertation")
+      expect(subject.types["schemaOrg"]).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.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"}])
+      expect(subject.dates).to eq([{"date"=>"2014", "dateType"=>"Issued"},
+        {"date"=>"2014", "dateType"=>"Copyrighted"},
+        {"date"=>"2009-10-01/2014-01-23", "dateType"=>"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.source).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -681,10 +680,10 @@ 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.types["type"]).to eq("Dataset")
-      expect(subject.types["resource_type_general"]).to eq("Dataset")
+      expect(subject.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceTypeGeneral"]).to eq("Dataset")
       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.dates).to eq([{"date"=>"2011-10-01/2012-03-14", "dateInformation"=>"Temporal coverage of this dataset.", "dateType"=>"Other"}, {"date"=>"2012", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2012")
       expect(subject.state).to eq("findable")
     end
@@ -697,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.types["type"]).to eq("Dataset")
+      expect(subject.types["schemaOrg"]).to eq("Dataset")
       expect(subject.titles).to eq([{"title"=> "A new malaria agent in African hominids." }])
     end
 
@@ -707,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.types["type"]).to eq("Dataset")
+      expect(subject.types["schemaOrg"]).to eq("Dataset")
       expect(subject.titles).to eq([{"title"=>"Data from: A new malaria agent in African hominids."}])
       expect(subject.state).to eq("registered")
     end
@@ -738,20 +737,20 @@ 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.types["type"]).to eq("Dataset")
-    expect(subject.types["resource_type"]).to eq("DroNc-seq data")
+    expect(subject.types["schemaOrg"]).to eq("Dataset")
+    expect(subject.types["resourceType"]).to eq("DroNc-seq data")
     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.dates).to eq([{"date"=>"2017", "dateType"=>"Issued"}])
     expect(subject.publication_year).to eq("2017")
     expect(subject.related_identifiers.length).to eq(4)
-    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.related_identifiers.last).to eq("relatedIdentifier"=>"https://www.ebi.ac.uk/miriam/main/datatypes/MIR:00000663", "relatedIdentifierType"=>"URL", "relationType"=>"IsPartOf")
     expect(subject.formats).to eq(["application/tar"])
     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)
-    expect(subject.funding_references.first).to eq("funder_identifier"=>"https://doi.org/10.13039/100000052", "funder_identifier_type"=>"Crossref Funder ID", "funder_name"=>"Common Fund of the Office of the Director of the NIH")
+    expect(subject.funding_references.first).to eq("funderIdentifier"=>"https://doi.org/10.13039/100000052", "funderIdentifierType"=>"Crossref Funder ID", "funderName"=>"Common Fund of the Office of the Director of the NIH")
   end
 end