bolognese 1.0.2 → 1.0.3

data/spec/readers/ris_reader_spec.rb

@@ -29,9 +29,8 @@ describe Bolognese::Metadata, vcr: true do
     it "Crossref DOI" do
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.7554/elife.01567")
-      expect(subject.type).to eq("ScholarlyArticle")
+      expect(subject.types).to eq("citeproc"=>"misc", "resource_type_general"=>"Text", "ris"=>"JOUR", "type"=>"ScholarlyArticle")
       expect(subject.url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
-      expect(subject.resource_type_general).to eq("Text")
       expect(subject.creator.length).to eq(5)
       expect(subject.creator.first).to eq("type"=>"Person",
                                          "name"=>"Martial Sankar",
@@ -39,7 +38,8 @@ describe Bolognese::Metadata, vcr: true do
                                          "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.dates).to eq([{"date"=>"2014", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2014")
       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
@@ -51,13 +51,12 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be false
       expect(subject.state).to eq("not_found")
       expect(subject.identifier).to eq("https://doi.org/10.7554/elife.01567")
-      expect(subject.ris_type).to eq("THES")
-      expect(subject.type).to eq("Thesis")
-      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.types).to eq("citeproc"=>"misc", "resource_type_general"=>"Text", "ris"=>"THES", "type"=>"Thesis")
       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")
+      expect(subject.dates).to eq([{"date"=>"2018-04-25", "date_type"=>"Issued"}, {"date"=>"2018-04-25", "date_type"=>"Created"}])
+      expect(subject.publication_year).to eq("2018")
     end
   end
 end

data/spec/readers/schema_org_reader_spec.rb

@@ -21,13 +21,13 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(subject.url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
-      expect(subject.type).to eq("BlogPosting")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"post-weblog", "resource_type_general"=>"Text", "ris"=>"GEN", "type"=>"BlogPosting")
       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.dates).to eq([{"date"=>"2016-12-20", "date_type"=>"Issued"}, {"date"=>"2016-12-20", "date_type"=>"Created"}, {"date"=>"2016-12-20", "date_type"=>"Updated"}])
+      expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
       expect(subject.related_identifiers.last).to eq("id"=>"10.5438/55e5-t5c0", "related_identifier_type"=>"DOI", "relation_type"=>"References")
       expect(subject.publisher).to eq("DataCite")
@@ -39,7 +39,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.5438/0000-00ss")
       expect(subject.doi).to eq("10.5438/0000-00ss")
       expect(subject.url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
-      expect(subject.type).to eq("BlogPosting")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"post-weblog", "resource_type_general"=>"Text", "ris"=>"GEN", "type"=>"BlogPosting")
     end
 
     it "zenodo" do
@@ -50,7 +50,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.5281/zenodo.1196821")
       expect(subject.doi).to eq("10.5281/zenodo.1196821")
       expect(subject.url).to eq("https://zenodo.org/record/1196821")
-      expect(subject.type).to eq("Dataset")
+      expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resource_type_general"=>"Dataset", "ris"=>"DATA", "type"=>"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.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")
@@ -63,7 +63,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.1594/pangaea.836178")
       expect(subject.doi).to eq("10.1594/pangaea.836178")
       expect(subject.url).to eq("https://doi.pangaea.de/10.1594/PANGAEA.836178")
-      expect(subject.type).to eq("Dataset")
+      expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resource_type_general"=>"Dataset", "ris"=>"DATA", "type"=>"Dataset")
       expect(subject.title).to eq("Hydrological and meteorological investigations in a lake near Kangerlussuaq, west Greenland")
       expect(subject.creator.size).to eq(8)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Johansson, Emma", "givenName"=>"Emma", "familyName"=>"Johansson")
@@ -90,7 +90,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.7910/dvn/nj7xso")
       expect(subject.doi).to eq("10.7910/dvn/nj7xso")
-      expect(subject.type).to eq("Dataset")
+      expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resource_type_general"=>"Dataset", "ris"=>"DATA", "type"=>"Dataset")
       expect(subject.title).to eq("Summary data ankylosing spondylitis GWAS")
       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)")
@@ -103,7 +103,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.7910/dvn/nj7xso")
       expect(subject.doi).to eq("10.7910/dvn/nj7xso")
-      expect(subject.type).to eq("Dataset")
+      expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resource_type_general"=>"Dataset", "ris"=>"DATA", "type"=>"Dataset")
       expect(subject.title).to eq("Summary data ankylosing spondylitis GWAS")
       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)")
@@ -117,13 +117,13 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(subject.url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
-      expect(subject.type).to eq("BlogPosting")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"post-weblog", "resource_type_general"=>"Text", "ris"=>"GEN", "type"=>"BlogPosting")
       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.dates).to eq([{"date"=>"2016-12-20", "date_type"=>"Issued"}, {"date"=>"2016-12-20", "date_type"=>"Created"}, {"date"=>"2016-12-20", "date_type"=>"Updated"}])
+      expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
       expect(subject.related_identifiers.last).to eq("id"=>"10.5438/55e5-t5c0", "related_identifier_type"=>"DOI", "relation_type"=>"References")
       expect(subject.publisher).to eq("DataCite")
@@ -138,13 +138,13 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.alternate_identifiers).to eq("name"=>"687610993", "type"=>"md5")
       expect(subject.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.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resource_type"=>"Gene expression matrices", "resource_type_general"=>"Dataset", "ris"=>"DATA", "type"=>"Dataset")
       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.version).to eq("v7")
       expect(subject.keywords).to eq(["gtex", "annotation", "phenotype", "gene regulation", "transcriptomics"])
-      expect(subject.date_published).to eq("2017")
+      expect(subject.dates).to eq([{"date"=>"2017", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2017")
       expect(subject.periodical).to eq("title"=>"GTEx", "type"=>"DataCatalog")
       expect(subject.publisher).to eq("GTEx")
       expect(subject.funding_references.length).to eq(7)
@@ -160,12 +160,12 @@ describe Bolognese::Metadata, vcr: true do
       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.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.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resource_type"=>"CRAM file", "resource_type_general"=>"Dataset", "ris"=>"DATA", "type"=>"Dataset")
       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.dates).to eq([{"date"=>"2017-11-30", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("TOPMed")
       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)"}])
@@ -177,13 +177,13 @@ describe Bolognese::Metadata, vcr: true do
 
       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.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resource_type"=>"dataset", "resource_type_general"=>"Dataset", "ris"=>"DATA", "type"=>"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.dates).to eq([{"date"=>"2013", "date_type"=>"Issued"}, {"date"=>"2014-10-17", "date_type"=>"Updated"}])
+      expect(subject.publication_year).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"}}])
@@ -195,11 +195,12 @@ describe Bolognese::Metadata, vcr: true do
 
       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.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resource_type_general"=>"Dataset", "ris"=>"DATA", "type"=>"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.dates).to eq([{"date"=>"2015-02-03", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2015")
       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
@@ -213,12 +214,12 @@ describe Bolognese::Metadata, vcr: true do
       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.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.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resource_type"=>"CRAM file", "resource_type_general"=>"Dataset", "ris"=>"DATA", "type"=>"Dataset")
       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.dates).to eq([{"date"=>"2017-11-30", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("TOPMed")
       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

data/spec/utils_spec.rb

@@ -324,6 +324,14 @@ describe Bolognese::Metadata, vcr: true do
     end
   end
 
+  context "get_date" do
+    it "publication date" do
+      dates = [{ "date"=>"2016-12-20", "date_type" => "Issued" }]
+      response = subject.get_date(dates, "Issued")
+      expect(response).to eq("2016-12-20")
+    end
+  end
+
   context "github" do
     it "github_from_url" do
       url = "https://github.com/datacite/bolognese"

data/spec/writers/bibtex_writer_spec.rb

@@ -76,7 +76,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "datacite.json"
       subject = Bolognese::Metadata.new(input: input, from: "datacite_json")
       bibtex = BibTeX.parse(subject.bibtex).to_a(quotes: '').first
-      expect(bibtex[:bibtex_type].to_s).to eq("article")
+      expect(bibtex[:bibtex_type].to_s).to eq("misc")
       expect(bibtex[:bibtex_key]).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(bibtex[:doi]).to eq("10.5438/4k3m-nyvg")
       expect(bibtex[:title]).to eq("Eating your own Dog Food")

data/spec/writers/citeproc_writer_spec.rb

@@ -44,7 +44,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "datacite.json"
       subject = Bolognese::Metadata.new(input: input, from: "datacite_json")
       json = JSON.parse(subject.citeproc)
-      expect(json["type"]).to eq("report")
+      expect(json["type"]).to eq("article")
       expect(json["id"]).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(json["DOI"]).to eq("10.5438/4k3m-nyvg")
       expect(json["title"]).to eq("Eating your own Dog Food")

data/spec/writers/crosscite_writer_spec.rb

@@ -9,7 +9,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       crosscite = JSON.parse(subject.crosscite)
       expect(crosscite.fetch("url")).to eq("https://elifesciences.org/articles/01567")
-      expect(crosscite.fetch("resource_type_general")).to eq("Text")
+      expect(crosscite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"JournalArticle", "resource_type_general"=>"Text", "ris"=>"JOUR", "type"=>"ScholarlyArticle")
       expect(crosscite.fetch("title")).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
       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")
@@ -24,7 +24,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.1155/2012/291294"
       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("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"JournalArticle", "resource_type_general"=>"Text", "ris"=>"JOUR", "type"=>"ScholarlyArticle")
       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
@@ -40,7 +40,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "crossref.bib"
       subject = Bolognese::Metadata.new(input: input, from: "bibtex")
       crosscite = JSON.parse(subject.crosscite)
-      expect(crosscite.fetch("resource_type_general")).to eq("Text")
+      expect(crosscite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"JournalArticle", "resource_type_general"=>"Text", "ris"=>"JOUR", "type"=>"ScholarlyArticle")
       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("creator").count).to eq(5)
@@ -52,7 +52,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "citeproc")
       expect(subject.valid?).to be true
       crosscite = JSON.parse(subject.crosscite)
-      expect(crosscite["resource_type_general"]).to eq("Text")
+      expect(crosscite["types"]).to eq("bibtex"=>"article", "citeproc"=>"post-weblog", "resource_type_general"=>"Text", "ris"=>"GEN", "type"=>"BlogPosting")
       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("creator")).to eq("type"=>"Person", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
@@ -76,7 +76,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite.fetch("title")).to eq("Data from: A new malaria agent in African hominids.")
       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("dates")).to eq([{"date"=>"2011", "date_type"=>"Issued"}])
+      expect(crosscite.fetch("publication_year")).to eq("2011")
       expect(crosscite.fetch("provider_id")).to eq("DRYAD")
       expect(crosscite.fetch("client_id")).to eq("DRYAD.DRYAD")
     end

data/spec/writers/datacite_writer_spec.rb

@@ -103,14 +103,13 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "datacite")
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.23640/07243.5153971")
-      expect(subject.type).to eq("ScholarlyArticle")
-      expect(subject.additional_type).to eq("Paper")
-      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"Paper", "resource_type_general"=>"Text", "ris"=>"RPRT", "type"=>"ScholarlyArticle")
       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.rights).to eq("id"=>"https://creativecommons.org/publicdomain/zero/1.0", "name"=>"CC-0")
-      expect(subject.date_published).to eq("2017")
+      expect(subject.dates).to eq([{"date"=>"2017-06-28", "date_type"=>"Created"}, {"date"=>"2017-06-28", "date_type"=>"Updated"}, {"date"=>"2017", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("Figshare")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
@@ -122,14 +121,13 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "datacite", doi: "10.5072/07243.5153971")
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5072/07243.5153971")
-      expect(subject.type).to eq("ScholarlyArticle")
-      expect(subject.additional_type).to eq("Paper")
-      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"Paper", "resource_type_general"=>"Text", "ris"=>"RPRT", "type"=>"ScholarlyArticle")
       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.rights).to eq("id"=>"https://creativecommons.org/publicdomain/zero/1.0", "name"=>"CC-0")
-      expect(subject.date_published).to eq("2017")
+      expect(subject.dates).to eq([{"date"=>"2017-06-28", "date_type"=>"Created"}, {"date"=>"2017-06-28", "date_type"=>"Updated"}, {"date"=>"2017", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("Figshare")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
@@ -141,15 +139,14 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "datacite", regenerate: true)
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5061/dryad.8515")
-      expect(subject.type).to eq("Dataset")
-      expect(subject.additional_type).to eq("DataPackage")
-      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resource_type"=>"DataPackage", "resource_type_general"=>"Dataset", "ris"=>"DATA", "type"=>"Dataset")
       expect(subject.creator.length).to eq(8)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Benjamin Ollomo", "givenName"=>"Benjamin", "familyName"=>"Ollomo")
       expect(subject.title).to eq("Data from: A new malaria agent in African hominids.")
       expect(subject.alternate_identifiers).to eq("type"=>"citation", "name"=>"Ollomo B, Durand P, Prugnolle F, Douzery EJP, Arnathau C, Nkoghe D, Leroy E, Renaud F (2009) A new malaria agent in African hominids. PLoS Pathogens 5(5): e1000446.")
       expect(subject.rights).to eq("id"=>"http://creativecommons.org/publicdomain/zero/1.0")
-      expect(subject.date_published).to eq("2011")
+      expect(subject.dates).to eq([{"date"=>"2011", "date_type"=>"Issued"}])
+      expect(subject.publication_year).to eq("2011")
       expect(subject.related_identifiers.length).to eq(6)
       expect(subject.related_identifiers.last).to eq("id"=>"19478877", "related_identifier_type"=>"PMID", "relation_type"=>"IsSupplementTo")
       expect(subject.publisher).to eq("Dryad Digital Repository")
@@ -199,7 +196,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       subject.doi = "10.5061/DRYAD.8515"
       subject.title = "Data from: Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"
-      subject.resource_type_general = "Dataset"
+      subject.types = { "type" => "Dataset", "resource_type_general" => "Dataset" }
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("identifier", "__content__")).to eq("10.5061/DRYAD.8515")
@@ -237,10 +234,10 @@ describe Bolognese::Metadata, vcr: true do
       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"
-      subject.additional_type = "DataPackage"
-      subject.date_published = "2011"
+      subject.types = "Dataset"
+      subject.publication_year = "2011"
       subject.state = "findable"
+      subject.types = { "type" => "Dataset", "resource_type_general" => "Dataset" }
       expect(subject.exists?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("identifier", "__content__")).to eq("10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
@@ -292,7 +289,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       subject.doi = "123"
       subject.title = "Data from: Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"
-      subject.type = "Dataset"
+      subject.types = "Dataset"
       expect(subject.doi).to eq("123")
       expect(subject.valid?).to be false
       expect(subject.errors.first).to start_with("3:0: ERROR: Element '{http://datacite.org/schema/kernel-4}identifier'")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -806,6 +806,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/series-information.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/subject_scheme.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/xs_string_attributes.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_date/publication_date.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_date_from_date_parts/date.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_date_from_date_parts/year-month.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_date_from_date_parts/year.yml