bolognese 0.15.9 → 1.0

data/spec/readers/ris_reader_spec.rb

@@ -32,16 +32,16 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.b_url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
       expect(subject.resource_type_general).to eq("Text")
-      expect(subject.author.length).to eq(5)
-      expect(subject.author.first).to eq("type"=>"Person",
+      expect(subject.creator.length).to eq(5)
+      expect(subject.creator.first).to eq("type"=>"Person",
                                          "name"=>"Martial Sankar",
                                          "givenName"=>"Martial",
                                          "familyName"=>"Sankar")
       expect(subject.title).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
       expect(subject.description["text"]).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
       expect(subject.date_published).to eq("2014")
-      expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"eLife")
-      expect(subject.container_title).to eq("eLife")
+      expect(subject.related_identifiers).to eq([{"id"=>"2050084X", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"eLife", "type"=>"Periodical"}])
+      expect(subject.periodical).to eq("id"=>"2050084X", "title"=>"eLife", "type"=>"Periodical")
     end
 
     it "DOI does not exist" do
@@ -54,7 +54,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.ris_type).to eq("THES")
       expect(subject.type).to eq("Thesis")
       expect(subject.resource_type_general).to eq("Text")
-      expect(subject.author).to eq("type"=>"Person", "name"=>"Y. Toparlar", "givenName"=>"Y.", "familyName"=>"Toparlar")
+      expect(subject.creator).to eq("type"=>"Person", "name"=>"Y. Toparlar", "givenName"=>"Y.", "familyName"=>"Toparlar")
       expect(subject.title).to eq("A multiscale analysis of the urban heat island effect")
       expect(subject.description["text"]).to start_with("Designing the climates of cities")
       expect(subject.date_published).to eq("2018-04-25")

data/spec/readers/schema_org_reader_spec.rb

@@ -22,14 +22,14 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(subject.b_url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
       expect(subject.type).to eq("BlogPosting")
-      expect(subject.author).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0003-1419-2405", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
+      expect(subject.creator).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0003-1419-2405", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
       expect(subject.title).to eq("Eating your own Dog Food")
       expect(subject.description["text"]).to start_with("Eating your own dog food")
       expect(subject.keywords).to eq(["datacite", "doi", "metadata", "featured"])
       expect(subject.date_published).to eq("2016-12-20")
       expect(subject.date_modified).to eq("2016-12-20")
-      expect(subject.is_part_of).to eq("id"=>"https://doi.org/10.5438/0000-00ss", "type"=>"Blog", "title"=>"DataCite Blog")
-      expect(subject.references).to eq([{"id"=>"https://doi.org/10.5438/0012", "type"=>"CreativeWork"}, {"id"=>"https://doi.org/10.5438/55e5-t5c0", "type"=>"CreativeWork"}])
+      expect(subject.related_identifiers.length).to eq(3)
+      expect(subject.related_identifiers.last).to eq("id"=>"10.5438/55e5-t5c0", "related_identifier_type"=>"DOI", "relation_type"=>"References")
       expect(subject.publisher).to eq("DataCite")
     end
 
@@ -52,8 +52,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.b_url).to eq("https://zenodo.org/record/1196821")
       expect(subject.type).to eq("Dataset")
       expect(subject.title).to eq("PsPM-SC4B: SCR, ECG, EMG, PSR and respiration measurements in a delay fear conditioning task with auditory CS and electrical US")
-      expect(subject.author.size).to eq(6)
-      expect(subject.author.first).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0001-9688-838X", "name"=>"Matthias Staib", "givenName"=>"Matthias", "familyName"=>"Staib")
+      expect(subject.creator.size).to eq(6)
+      expect(subject.creator.first).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0001-9688-838X", "name"=>"Matthias Staib", "givenName"=>"Matthias", "familyName"=>"Staib")
     end
 
     it "pangaea" do
@@ -65,8 +65,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.b_url).to eq("https://doi.pangaea.de/10.1594/PANGAEA.836178")
       expect(subject.type).to eq("Dataset")
       expect(subject.title).to eq("Hydrological and meteorological investigations in a lake near Kangerlussuaq, west Greenland")
-      expect(subject.author.size).to eq(8)
-      expect(subject.author.first).to eq("type"=>"Person", "name"=>"Johansson, Emma", "givenName"=>"Emma", "familyName"=>"Johansson")
+      expect(subject.creator.size).to eq(8)
+      expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Johansson, Emma", "givenName"=>"Emma", "familyName"=>"Johansson")
     end
 
     # service doesn't return html to script
@@ -80,8 +80,8 @@ describe Bolognese::Metadata, vcr: true do
     #   expect(subject.b_url).to eq("https://doi.org/10.3334/ornldaac/1418")
     #   expect(subject.type).to eq("DataSet")
     #   expect(subject.title).to eq("AirMOSS: L2/3 Volumetric Soil Moisture Profiles Derived From Radar, 2012-2015")
-    #   expect(subject.author.size).to eq(8)
-    #   expect(subject.author.first).to eq("type"=>"Person", "name"=>"M. MOGHADDAM", "givenName"=>"M.", "familyName"=>"MOGHADDAM")
+    #   expect(subject.creator.size).to eq(8)
+    #   expect(subject.creator.first).to eq("type"=>"Person", "name"=>"M. MOGHADDAM", "givenName"=>"M.", "familyName"=>"MOGHADDAM")
     # end
 
     it "harvard dataverse" do
@@ -92,8 +92,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.doi).to eq("10.7910/dvn/nj7xso")
       expect(subject.type).to eq("Dataset")
       expect(subject.title).to eq("Summary data ankylosing spondylitis GWAS")
-      expect(subject.container_title).to eq("Harvard Dataverse")
-      expect(subject.author).to eq("name" => "International Genetics Of Ankylosing Spondylitis Consortium (IGAS)")
+      expect(subject.periodical).to eq("title"=>"Harvard Dataverse", "type"=>"DataCatalog", "url"=>"https://dataverse.harvard.edu")
+      expect(subject.creator).to eq("name" => "International Genetics Of Ankylosing Spondylitis Consortium (IGAS)")
       expect(subject.schema_version).to eq("https://schema.org/version/3.3")
     end
 
@@ -105,8 +105,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.doi).to eq("10.7910/dvn/nj7xso")
       expect(subject.type).to eq("Dataset")
       expect(subject.title).to eq("Summary data ankylosing spondylitis GWAS")
-      expect(subject.container_title).to eq("Harvard Dataverse")
-      expect(subject.author).to eq("name" => "International Genetics Of Ankylosing Spondylitis Consortium (IGAS)")
+      expect(subject.periodical).to eq("title"=>"Harvard Dataverse", "type"=>"DataCatalog", "url"=>"https://dataverse.harvard.edu")
+      expect(subject.creator).to eq("name" => "International Genetics Of Ankylosing Spondylitis Consortium (IGAS)")
     end
   end
 
@@ -114,18 +114,18 @@ describe Bolognese::Metadata, vcr: true do
     it "BlogPosting" do
       input = fixture_path + 'schema_org.json'
       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.b_url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
       expect(subject.type).to eq("BlogPosting")
-      expect(subject.author).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-1419-2405", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
+      expect(subject.creator).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-1419-2405", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
       expect(subject.title).to eq("Eating your own Dog Food")
       expect(subject.description["text"]).to start_with("Eating your own dog food")
       expect(subject.keywords).to eq(["datacite", "doi", "metadata", "featured"])
       expect(subject.date_published).to eq("2016-12-20")
       expect(subject.date_modified).to eq("2016-12-20")
-      expect(subject.is_part_of).to eq("id"=>"https://doi.org/10.5438/0000-00ss", "type"=>"Blog", "title"=>"DataCite Blog")
-      expect(subject.references).to eq([{"id"=>"https://doi.org/10.5438/0012", "type"=>"CreativeWork"}, {"id"=>"https://doi.org/10.5438/55e5-t5c0", "type"=>"CreativeWork"}])
+      expect(subject.related_identifiers.length).to eq(3)
+      expect(subject.related_identifiers.last).to eq("id"=>"10.5438/55e5-t5c0", "related_identifier_type"=>"DOI", "relation_type"=>"References")
       expect(subject.publisher).to eq("DataCite")
     end
 
@@ -135,39 +135,20 @@ describe Bolognese::Metadata, vcr: true do
 
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.25491/d50j-3083")
-      expect(subject.alternate_identifier).to eq("name"=>"687610993", "type"=>"md5")
+      expect(subject.alternate_identifiers).to eq("name"=>"687610993", "type"=>"md5")
       expect(subject.b_url).to eq("https://ors.datacite.org/doi:/10.25491/d50j-3083")
       expect(subject.content_url).to eq("https://storage.googleapis.com/gtex_analysis_v7/single_tissue_eqtl_data/GTEx_Analysis_v7_eQTL_expression_matrices.tar.gz")
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("Gene expression matrices")
-      expect(subject.author).to eq("name"=>"The GTEx Consortium", "type"=>"Organization")
+      expect(subject.creator).to eq("name"=>"The GTEx Consortium", "type"=>"Organization")
       expect(subject.title).to eq("Fully processed, filtered and normalized gene expression matrices (in BED format) for each tissue, which were used as input into FastQTL for eQTL discovery")
       expect(subject.b_version).to eq("v7")
       expect(subject.keywords).to eq(["gtex", "annotation", "phenotype", "gene regulation", "transcriptomics"])
       expect(subject.date_published).to eq("2017")
-      expect(subject.container_title).to eq("GTEx")
+      expect(subject.periodical).to eq("title"=>"GTEx", "type"=>"DataCatalog")
       expect(subject.publisher).to eq("GTEx")
-      expect(subject.funding).to eq([{"id"=>"https://doi.org/10.13039/100000052",
-                                      "name"=>"Common Fund of the Office of the Director of the NIH",
-                                      "type"=>"Organization"},
-                                     {"id"=>"https://doi.org/10.13039/100000054",
-                                      "name"=>"National Cancer Institute (NCI)",
-                                      "type"=>"Organization"},
-                                     {"id"=>"https://doi.org/10.13039/100000051",
-                                      "name"=>"National Human Genome Research Institute (NHGRI)",
-                                      "type"=>"Organization"},
-                                     {"id"=>"https://doi.org/10.13039/100000050",
-                                      "name"=>"National Heart, Lung, and Blood Institute (NHLBI)",
-                                      "type"=>"Organization"},
-                                     {"id"=>"https://doi.org/10.13039/100000026",
-                                      "name"=>"National Institute on Drug Abuse (NIDA)",
-                                      "type"=>"Organization"},
-                                     {"id"=>"https://doi.org/10.13039/100000025",
-                                      "name"=>"National Institute of Mental Health (NIMH)",
-                                      "type"=>"Organization"},
-                                     {"id"=>"https://doi.org/10.13039/100000065",
-                                      "name"=>"National Institute of Neurological Disorders and Stroke (NINDS)",
-                                      "type"=>"Organization"}])
+      expect(subject.funding_references.length).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")
     end
 
     it "TOPMed dataset" do
@@ -176,18 +157,51 @@ describe Bolognese::Metadata, vcr: true do
 
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.23725/8na3-9s47")
-      expect(subject.alternate_identifier).to eq([{"name"=>"3b33f6b9338fccab0901b7d317577ea3", "type"=>"md5"}, {"name"=>"ark:/99999/fk41CrU4eszeLUDe", "type"=>"minid"}, {"name"=>"dg.4503/c3d66dc9-58da-411c-83c4-dd656aa3c4b7", "type"=>"dataguid"}])
+      expect(subject.alternate_identifiers).to eq([{"name"=>"3b33f6b9338fccab0901b7d317577ea3", "type"=>"md5"}, {"name"=>"ark:/99999/fk41CrU4eszeLUDe", "type"=>"minid"}, {"name"=>"dg.4503/c3d66dc9-58da-411c-83c4-dd656aa3c4b7", "type"=>"dataguid"}])
       expect(subject.b_url).to eq("https://ors.datacite.org/doi:/10.23725/8na3-9s47")
       expect(subject.content_url).to eq(["s3://cgp-commons-public/topmed_open_access/197bc047-e917-55ed-852d-d563cdbc50e4/NWD165827.recab.cram", "gs://topmed-irc-share/public/NWD165827.recab.cram"])
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("CRAM file")
-      expect(subject.author).to eq("name"=>"TOPMed IRC", "type"=>"Organization")
+      expect(subject.creator).to eq("name"=>"TOPMed IRC", "type"=>"Organization")
       expect(subject.title).to eq("NWD165827.recab.cram")
       expect(subject.keywords).to eq(["topmed", "whole genome sequencing"])
       expect(subject.date_published).to eq("2017-11-30")
       expect(subject.publisher).to eq("TOPMed")
-      expect(subject.references).to eq("id"=>"https://doi.org/10.23725/2g4s-qv04", "type"=>"Dataset")
-      expect(subject.funding).to eq("id"=>"https://doi.org/10.13039/100000050", "name"=>"National Heart, Lung, and Blood Institute (NHLBI)", "type"=>"Organization")
+      expect(subject.related_identifiers).to eq([{"id"=>"10.23725/2g4s-qv04", "related_identifier_type"=>"DOI", "relation_type"=>"References", "resource_type_general"=>"Dataset"}])
+      expect(subject.funding_references).to eq([{"funder_identifier"=>"https://doi.org/10.13039/100000050", "funder_identifier_type"=>"Crossref Funder ID", "funder_name"=>"National Heart, Lung, and Blood Institute (NHLBI)"}])
+    end
+
+    it "geolocation" do
+      input = fixture_path + 'schema_org_geolocation.json'
+      subject = Bolognese::Metadata.new(input: input)
+
+      expect(subject.valid?).to be true
+      expect(subject.identifier).to eq("https://doi.org/10.6071/z7wc73")
+      expect(subject.type).to eq("Dataset")
+      expect(subject.additional_type).to eq("dataset")
+      expect(subject.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("Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek meteorological data, soil moisture and temperature, snow depth and air temperature")
+      expect(subject.keywords).to eq(["Earth sciences", "soil moisture", "soil temperature", "snow depth", "air temperature", "water balance", "Nevada", "Sierra (mountain range)"])
+      expect(subject.date_published).to eq("2013")
+      expect(subject.publisher).to eq("UC Merced")
+      expect(subject.funding_references).to eq([{"funder_name"=>"National Science Foundation, Division of Earth Sciences, Critical Zone Observatories"}])
+      expect(subject.geo_location).to eq([{"geo_location_place"=>"Providence Creek (Lower, Upper and P301)", "geo_location_point"=>{"point_latitude"=>"37.047756", "point_longitude"=>"-119.221094"}}])
+    end
+
+    it "geolocation geoshape" do
+      input = fixture_path + 'schema_org_geoshape.json'
+      subject = Bolognese::Metadata.new(input: input)
+
+      expect(subject.valid?).to be true
+      expect(subject.identifier).to eq("https://doi.org/10.1594/pangaea.842237")
+      expect(subject.type).to eq("Dataset")
+      expect(subject.creator.length).to eq(2)
+      expect(subject.creator.first).to eq("name"=>"Tara Oceans Consortium, Coordinators", "type"=>"Organization")
+      expect(subject.title).to eq("Registry of all stations from the Tara Oceans Expedition (2009-2013)")
+      expect(subject.date_published).to eq("2015-02-03")
+      expect(subject.publisher).to eq("PANGAEA")
+      expect(subject.geo_location).to eq([{"geo_location_box"=>{"east_bound_longitude"=>"174.9006", "north_bound_latitude"=>"79.6753", "south_bound_latitude"=>"-64.3088", "west_bound_longitude"=>"-168.5182"}}])
     end
 
     it "schema_org list" do
@@ -196,17 +210,17 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.23725/7jg3-v803")
-      expect(subject.alternate_identifier).to eq([{"name"=>"ark:/99999/fk4E1n6n1YHKxPk", "type"=>"minid"}, {"name"=>"dg.4503/01b048d0-e128-4cb0-94e9-b2d2cab7563d", "type"=>"dataguid"}, {"name"=>"f9e72bdf25bf4b4f0e581d9218fec2eb", "type"=>"md5"}])
+      expect(subject.alternate_identifiers).to eq([{"name"=>"ark:/99999/fk4E1n6n1YHKxPk", "type"=>"minid"}, {"name"=>"dg.4503/01b048d0-e128-4cb0-94e9-b2d2cab7563d", "type"=>"dataguid"}, {"name"=>"f9e72bdf25bf4b4f0e581d9218fec2eb", "type"=>"md5"}])
       expect(subject.b_url).to eq("https://ors.datacite.org/doi:/10.23725/7jg3-v803")
       expect(subject.content_url).to eq(["s3://cgp-commons-public/topmed_open_access/44a8837b-4456-5709-b56b-54e23000f13a/NWD100953.recab.cram","gs://topmed-irc-share/public/NWD100953.recab.cram","dos://dos.commons.ucsc-cgp.org/01b048d0-e128-4cb0-94e9-b2d2cab7563d?version=2018-05-26T133719.491772Z"])
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("CRAM file")
-      expect(subject.author).to eq("name"=>"TOPMed", "type"=>"Organization")
+      expect(subject.creator).to eq("name"=>"TOPMed", "type"=>"Organization")
       expect(subject.title).to eq("NWD100953.recab.cram")
       expect(subject.keywords).to eq(["topmed", "whole genome sequencing"])
       expect(subject.date_published).to eq("2017-11-30")
       expect(subject.publisher).to eq("TOPMed")
-      expect(subject.funding).to eq("id"=>"https://doi.org/10.13039/100000050", "name"=>"National Heart, Lung, and Blood Institute (NHLBI)", "type"=>"Organization")
+      expect(subject.funding_references).to eq([{"funder_identifier"=>"https://doi.org/10.13039/100000050", "funder_identifier_type"=>"Crossref Funder ID", "funder_name"=>"National Heart, Lung, and Blood Institute (NHLBI)"}])
     end
   end
 end

data/spec/utils_spec.rb

@@ -195,13 +195,13 @@ describe Bolognese::Metadata, vcr: true do
     it "doi" do
       ids = [{"@type"=>"CreativeWork", "@id"=>"https://doi.org/10.5438/0012"}, {"@type"=>"CreativeWork", "@id"=>"https://doi.org/10.5438/55E5-T5C0"}]
       response = subject.normalize_ids(ids: ids)
-      expect(response).to eq([{"id"=>"https://doi.org/10.5438/0012", "type"=>"CreativeWork"}, {"id"=>"https://doi.org/10.5438/55e5-t5c0", "type"=>"CreativeWork"}])
+      expect(response).to eq([{"id"=>"10.5438/0012", "related_identifier_type"=>"DOI"}, {"id"=>"10.5438/55e5-t5c0", "related_identifier_type"=>"DOI"}])
     end
 
     it "url" do
       ids = [{"@type"=>"CreativeWork", "@id"=>"https://blog.datacite.org/eating-your-own-dog-food/"}]
       response = subject.normalize_ids(ids: ids)
-      expect(response).to eq("id"=>"https://blog.datacite.org/eating-your-own-dog-food", "type" => "CreativeWork")
+      expect(response).to eq("id"=>"https://blog.datacite.org/eating-your-own-dog-food", "related_identifier_type"=>"URL")
     end
   end
 
@@ -238,8 +238,8 @@ describe Bolognese::Metadata, vcr: true do
   context "to_schema_org_identifier" do
     it "with alternate_identifier" do
       identifier = "https://doi.org/10.23725/8na3-9s47"
-      alternate_identifier = [{"type"=>"md5", "name"=>"3b33f6b9338fccab0901b7d317577ea3"}, {"type"=>"minid", "name"=>"ark:/99999/fk41CrU4eszeLUDe"}, {"type"=>"dataguid", "name"=>"dg.4503/c3d66dc9-58da-411c-83c4-dd656aa3c4b7"}]
-      response = subject.to_schema_org_identifier(identifier, alternate_identifier: alternate_identifier, type: "Dataset")
+      alternate_identifiers = [{"type"=>"md5", "name"=>"3b33f6b9338fccab0901b7d317577ea3"}, {"type"=>"minid", "name"=>"ark:/99999/fk41CrU4eszeLUDe"}, {"type"=>"dataguid", "name"=>"dg.4503/c3d66dc9-58da-411c-83c4-dd656aa3c4b7"}]
+      response = subject.to_schema_org_identifier(identifier, alternate_identifiers: alternate_identifiers, type: "Dataset")
       expect(response).to eq([{"@type"=>"PropertyValue", "propertyID"=>"doi", "value"=>"https://doi.org/10.23725/8na3-9s47"},
         {"@type"=>"PropertyValue",
          "propertyID"=>"md5",

data/spec/writers/crosscite_writer_spec.rb

@@ -11,9 +11,13 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite.fetch("url")).to eq("https://elifesciences.org/articles/01567")
       expect(crosscite.fetch("resource_type_general")).to eq("Text")
       expect(crosscite.fetch("title")).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
-      expect(crosscite.fetch("references").length).to eq(26)
-      expect(crosscite.fetch("references").first).to eq("type"=>"CreativeWork", "id"=>"https://doi.org/10.1038/nature02100", "title"=>"APL regulates vascular tissue identity in Arabidopsis")
-      expect(crosscite.fetch("license")).to eq("id"=>"http://creativecommons.org/licenses/by/3.0")
+      expect(crosscite.fetch("related_identifiers").length).to eq(27)
+      expect(crosscite.fetch("related_identifiers").first).to eq("id"=>"2050-084X", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"eLife", "type"=>"Periodical")
+      expect(crosscite.fetch("related_identifiers").last).to eq(       +"id" => "10.1038/ncb2764",
+        "related_identifier_type" => "DOI",
+        "relation_type" => "References",
+        "title" => "A screen for morphological complexity identifies regulators of switch-like transitions between discrete cell shapes")
+      expect(crosscite.fetch("rights")).to eq("id"=>"http://creativecommons.org/licenses/by/3.0")
     end
 
     it "with ORCID ID" do
@@ -21,8 +25,8 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       crosscite = JSON.parse(subject.crosscite)
       expect(crosscite.fetch("resource_type_general")).to eq("Text")
-      expect(crosscite.fetch("author").count).to eq(7)
-      expect(crosscite.fetch("author")[2]).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-2043-4925", "name"=>"Beatriz Hernandez", "givenName"=>"Beatriz", "familyName"=>"Hernandez")
+      expect(crosscite.fetch("creator").count).to eq(7)
+      expect(crosscite.fetch("creator")[2]).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-2043-4925", "name"=>"Beatriz Hernandez", "givenName"=>"Beatriz", "familyName"=>"Hernandez")
     end
 
     # it "with editor" do
@@ -39,8 +43,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite.fetch("resource_type_general")).to eq("Text")
       expect(crosscite.fetch("title")).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
       expect(crosscite.dig("description", "text")).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
-      expect(crosscite.fetch("author").count).to eq(5)
-      expect(crosscite.fetch("author").first).to eq("type"=>"Person", "name"=>"Martial Sankar", "givenName"=>"Martial", "familyName"=>"Sankar")
+      expect(crosscite.fetch("creator").count).to eq(5)
+      expect(crosscite.fetch("creator").first).to eq("type"=>"Person", "name"=>"Martial Sankar", "givenName"=>"Martial", "familyName"=>"Sankar")
     end
 
     it "BlogPosting Citeproc JSON" do
@@ -51,7 +55,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite["resource_type_general"]).to eq("Text")
       expect(crosscite.fetch("title")).to eq("Eating your own Dog Food")
       expect(crosscite.dig("description", "text")).to start_with("Eating your own dog food")
-      expect(crosscite.fetch("author")).to eq("type"=>"Person", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
+      expect(crosscite.fetch("creator")).to eq("type"=>"Person", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
     end
 
     it "rdataone" do
@@ -59,8 +63,8 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "codemeta")
       crosscite = JSON.parse(subject.crosscite)
       expect(crosscite["title"]).to eq("R Interface to the DataONE REST API")
-      expect(crosscite["author"].length).to eq(3)
-      expect(crosscite["author"].last).to eq("type"=>"Organization", "name"=>"University Of California, Santa Barbara")
+      expect(crosscite["creator"].length).to eq(3)
+      expect(crosscite["creator"].last).to eq("type"=>"Organization", "name"=>"University Of California, Santa Barbara")
       expect(crosscite["version"]).to eq("2.0.0")
     end
 
@@ -70,10 +74,9 @@ describe Bolognese::Metadata, vcr: true do
       crosscite = JSON.parse(subject.crosscite)
       expect(crosscite.fetch("url")).to eq("http://datadryad.org/resource/doi:10.5061/dryad.8515")
       expect(crosscite.fetch("title")).to eq("Data from: A new malaria agent in African hominids.")
-      expect(crosscite.fetch("author").length).to eq(8)
-      expect(crosscite.fetch("author").first).to eq("type"=>"Person", "familyName" => "Ollomo", "givenName" => "Benjamin", "name" => "Benjamin Ollomo")
-      expect(crosscite.fetch("date_registered")).to eq("2011-02-01T17:32:02Z")
-      expect(crosscite.fetch("date_updated")).to eq("2018-03-30T21:47:26Z")
+      expect(crosscite.fetch("creator").length).to eq(8)
+      expect(crosscite.fetch("creator").first).to eq("type"=>"Person", "familyName" => "Ollomo", "givenName" => "Benjamin", "name" => "Benjamin Ollomo")
+      expect(crosscite.fetch("date_published")).to eq("2011")
       expect(crosscite.fetch("provider_id")).to eq("DRYAD")
       expect(crosscite.fetch("client_id")).to eq("DRYAD.DRYAD")
     end
@@ -83,7 +86,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "codemeta")
       crosscite = JSON.parse(subject.crosscite)
       expect(crosscite.fetch("title")).to eq("Maremma: a Ruby library for simplified network calls")
-      expect(crosscite.fetch("author")).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
+      expect(crosscite.fetch("creator")).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
     end
 
     it "with data citation schema.org" do
@@ -92,8 +95,9 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       crosscite = JSON.parse(subject.crosscite)
       expect(crosscite.fetch("title")).to eq("Eating your own Dog Food")
-      expect(crosscite.fetch("references").count).to eq(2)
-      expect(crosscite.fetch("references").first).to eq("id"=>"https://doi.org/10.5438/0012", "type"=>"CreativeWork")
+      expect(crosscite.fetch("related_identifiers").count).to eq(3)
+      expect(crosscite.fetch("related_identifiers").first).to eq("id"=>"10.5438/0000-00ss", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf", "resource_type_general"=>"Text", "title"=>"DataCite Blog")
+      expect(crosscite.fetch("related_identifiers").last).to eq("id"=>"10.5438/55e5-t5c0", "related_identifier_type"=>"DOI", "relation_type"=>"References")
     end
   end
 end

data/spec/writers/datacite_json_writer_spec.rb

@@ -9,10 +9,10 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       datacite = JSON.parse(subject.datacite_json)
       expect(datacite.fetch("url")).to eq("https://elifesciences.org/articles/01567")
-      expect(datacite.fetch("resource_type_general")).to eq("Text")
+      expect(datacite.fetch("resource-type-general")).to eq("Text")
       expect(datacite.fetch("title")).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
-      expect(datacite.fetch("references").length).to eq(26)
-      expect(datacite.fetch("references").first).to eq("id"=>"https://doi.org/10.1038/nature02100", "type"=>"CreativeWork", "title" => "APL regulates vascular tissue identity in Arabidopsis")
+      expect(datacite.fetch("related-identifiers").length).to eq(27)
+      expect(datacite.fetch("related-identifiers").first).to eq("id"=>"2050-084X", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"eLife", "type"=>"Periodical")
       expect(datacite.fetch("rights")).to eq("id"=>"http://creativecommons.org/licenses/by/3.0")
     end
 
@@ -21,7 +21,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       datacite = JSON.parse(subject.datacite_json)
       expect(datacite.fetch("url")).to eq("http://www.hindawi.com/journals/pm/2012/291294/")
-      expect(datacite.fetch("resource_type_general")).to eq("Text")
+      expect(datacite.fetch("resource-type-general")).to eq("Text")
       expect(datacite.fetch("creator").length).to eq(7)
       expect(datacite.fetch("creator").first).to eq("type"=>"Person", "name"=>"Wendy Thanassi", "givenName"=>"Wendy", "familyName"=>"Thanassi")
     end
@@ -30,7 +30,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "crossref.bib"
       subject = Bolognese::Metadata.new(input: input, from: "bibtex")
       datacite = JSON.parse(subject.datacite_json)
-      expect(datacite.fetch("resource_type_general")).to eq("Text")
+      expect(datacite.fetch("resource-type-general")).to eq("Text")
       expect(datacite.fetch("title")).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
       expect(datacite.dig("description", "text")).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
       expect(datacite.fetch("creator").length).to eq(5)
@@ -41,7 +41,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "citeproc.json"
       subject = Bolognese::Metadata.new(input: input, from: "citeproc")
       datacite = JSON.parse(subject.datacite_json)
-      expect(datacite.fetch("resource_type_general")).to eq("Text")
+      expect(datacite.fetch("resource-type-general")).to eq("Text")
       expect(datacite.fetch("title")).to eq("Eating your own Dog Food")
       expect(datacite.dig("description", "text")).to start_with("Eating your own dog food")
       expect(datacite.fetch("creator")).to eq("type"=>"Person", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
@@ -71,8 +71,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       datacite = JSON.parse(subject.datacite_json)
       expect(datacite.fetch("title")).to eq("Eating your own Dog Food")
-      expect(datacite.fetch("references").count).to eq(2)
-      expect(datacite.fetch("references").first).to eq("id"=>"https://doi.org/10.5438/0012", "type"=>"CreativeWork")
+      expect(datacite.fetch("related-identifiers").count).to eq(3)
+      expect(datacite.fetch("related-identifiers").first).to eq("id"=>"10.5438/0000-00ss", "related_identifier_type"=>"DOI", "relation_type"=>"IsPartOf", "resource_type_general"=>"Text", "title"=>"DataCite Blog")
     end
   end
 end

data/spec/writers/datacite_writer_spec.rb

@@ -106,10 +106,10 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("Paper")
       expect(subject.resource_type_general).to eq("Text")
-      expect(subject.author.length).to eq(20)
-      expect(subject.author.first).to eq("type"=>"Person", "familyName" => "Paglione", "givenName" => "Laura", "id" => "https://orcid.org/0000-0003-3188-6273", "name" => "Laura Paglione")
+      expect(subject.creator.length).to eq(20)
+      expect(subject.creator.first).to eq("type"=>"Person", "familyName" => "Paglione", "givenName" => "Laura", "id" => "https://orcid.org/0000-0003-3188-6273", "name" => "Laura Paglione")
       expect(subject.title).to eq("Recommendation of: ORCID Works Metadata Working Group")
-      expect(subject.license).to eq("id"=>"https://creativecommons.org/publicdomain/zero/1.0", "name"=>"CC-0")
+      expect(subject.rights).to eq("id"=>"https://creativecommons.org/publicdomain/zero/1.0", "name"=>"CC-0")
       expect(subject.date_published).to eq("2017")
       expect(subject.publisher).to eq("Figshare")
       expect(subject.service_provider).to eq("DataCite")
@@ -125,10 +125,10 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("Paper")
       expect(subject.resource_type_general).to eq("Text")
-      expect(subject.author.length).to eq(20)
-      expect(subject.author.first).to eq("type"=>"Person", "familyName" => "Paglione", "givenName" => "Laura", "id" => "https://orcid.org/0000-0003-3188-6273", "name" => "Laura Paglione")
+      expect(subject.creator.length).to eq(20)
+      expect(subject.creator.first).to eq("type"=>"Person", "familyName" => "Paglione", "givenName" => "Laura", "id" => "https://orcid.org/0000-0003-3188-6273", "name" => "Laura Paglione")
       expect(subject.title).to eq("Recommendation of: ORCID Works Metadata Working Group")
-      expect(subject.license).to eq("id"=>"https://creativecommons.org/publicdomain/zero/1.0", "name"=>"CC-0")
+      expect(subject.rights).to eq("id"=>"https://creativecommons.org/publicdomain/zero/1.0", "name"=>"CC-0")
       expect(subject.date_published).to eq("2017")
       expect(subject.publisher).to eq("Figshare")
       expect(subject.service_provider).to eq("DataCite")
@@ -144,15 +144,14 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("DataPackage")
       expect(subject.resource_type_general).to eq("Dataset")
-      expect(subject.author.length).to eq(8)
-      expect(subject.author.first).to eq("type"=>"Person", "name"=>"Benjamin Ollomo", "givenName"=>"Benjamin", "familyName"=>"Ollomo")
+      expect(subject.creator.length).to eq(8)
+      expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Benjamin Ollomo", "givenName"=>"Benjamin", "familyName"=>"Ollomo")
       expect(subject.title).to eq("Data from: A new malaria agent in African hominids.")
-      expect(subject.alternate_identifier).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.license).to eq("id"=>"http://creativecommons.org/publicdomain/zero/1.0")
+      expect(subject.alternate_identifiers).to eq("type"=>"citation", "name"=>"Ollomo B, Durand P, Prugnolle F, Douzery EJP, Arnathau C, Nkoghe D, Leroy E, Renaud F (2009) A new malaria agent in African hominids. PLoS Pathogens 5(5): e1000446.")
+      expect(subject.rights).to eq("id"=>"http://creativecommons.org/publicdomain/zero/1.0")
       expect(subject.date_published).to eq("2011")
-      expect(subject.has_part).to eq([{"type"=>"CreativeWork", "id"=>"https://doi.org/10.5061/dryad.8515/1"},
-                                      {"type"=>"CreativeWork", "id"=>"https://doi.org/10.5061/dryad.8515/2"}])
-      expect(subject.is_referenced_by).to eq("type"=>"CreativeWork", "id"=>"https://doi.org/10.1371/journal.ppat.1000446")
+      expect(subject.related_identifiers.length).to eq(6)
+      expect(subject.related_identifiers.last).to eq("id"=>"19478877", "related_identifier_type"=>"PMID", "relation_type"=>"IsSupplementTo")
       expect(subject.publisher).to eq("Dryad Digital Repository")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -168,7 +167,7 @@ describe Bolognese::Metadata, vcr: true do
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("titles", "title")).to eq("Eating your own Dog Food")
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").count).to eq(3)
-      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "__content__"=>"10.5438/0000-00ss")
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("__content__"=>"10.5438/0000-00ss", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
     end
 
     it "DOI not found" do
@@ -235,7 +234,7 @@ describe Bolognese::Metadata, vcr: true do
     it "required metadata no input" do
       input = nil
       subject = Bolognese::Metadata.new(input: input, doi: "10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
-      subject.author = [{"creatorName"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner"}]
+      subject.creator = [{"creatorName"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner"}]
       subject.title = "Data from: Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"
       subject.publisher = "Dryad"
       subject.resource_type_general = "Dataset"
@@ -253,7 +252,7 @@ describe Bolognese::Metadata, vcr: true do
     it "change license" do
       input = "10.7554/eLife.01567"
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
-      subject.license = { "id" => "https://creativecommons.org/licenses/by-nc-sa/4.0", "name" => "Creative Commons Attribution-NonCommercial-ShareAlike" }
+      subject.rights = { "id" => "https://creativecommons.org/licenses/by-nc-sa/4.0", "name" => "Creative Commons Attribution-NonCommercial-ShareAlike" }
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("rightsList", "rights")).to eq("rightsURI"=>"https://creativecommons.org/licenses/by-nc-sa/4.0", "__content__"=>"Creative Commons Attribution-NonCommercial-ShareAlike")
@@ -262,7 +261,7 @@ describe Bolognese::Metadata, vcr: true do
     it "change license url" do
       input = "10.7554/eLife.01567"
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
-      subject.license = "https://creativecommons.org/licenses/by-nc-sa/4.0"
+      subject.rights = "https://creativecommons.org/licenses/by-nc-sa/4.0"
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("rightsList", "rights")).to eq("rightsURI"=>"https://creativecommons.org/licenses/by-nc-sa/4.0", "__content__"=>"https://creativecommons.org/licenses/by-nc-sa/4.0")
@@ -271,7 +270,7 @@ describe Bolognese::Metadata, vcr: true do
     it "change license name" do
       input = "10.7554/eLife.01567"
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
-      subject.license = "Creative Commons Attribution-NonCommercial-ShareAlike"
+      subject.rights = "Creative Commons Attribution-NonCommercial-ShareAlike"
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("rightsList", "rights")).to eq("Creative Commons Attribution-NonCommercial-ShareAlike")