bolognese 1.8.2 → 1.8.7

data/spec/readers/datacite_json_reader_spec.rb

@@ -25,7 +25,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.related_identifiers.length).to eq(3)
       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.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
     end
 
     # it "SoftwareSourceCode" do
@@ -74,7 +74,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.datacite).to include("<version>v0.3.2</version>")
       expect(subject.related_identifiers.length).to eq(2)
       expect(subject.related_identifiers.first).to eq("relatedIdentifier"=>"https://github.com/jakevdp/supersmoother/tree/v0.3.2", "relatedIdentifierType"=>"URL", "relationType"=>"IsSupplementTo")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
     end
   end
 end

data/spec/readers/datacite_reader_spec.rb

@@ -44,7 +44,7 @@ describe Bolognese::Metadata, vcr: true do
         {"subject"=>"phylogeny"},
         {"subject"=>"Parasites"}])
       expect(subject.publisher).to eq("Dryad")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -69,7 +69,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5438/0000-00ss", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
       expect(subject.publisher).to eq("DataCite")
       expect(subject.subjects).to eq([{"subject"=>"datacite"}, {"subject"=>"doi"}, {"subject"=>"metadata"}])
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -90,7 +90,7 @@ describe Bolognese::Metadata, vcr: true do
         "subjectScheme"=>"DDC"}])
       expect(subject.publication_year).to eq("2013")
       expect(subject.publisher).to eq("Schloss Dagstuhl - Leibniz-Zentrum fuer Informatik GmbH, Wadern/Saarbruecken, Germany")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.1")
     end
 
@@ -142,7 +142,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.sizes).to eq(["4 kB"])
       expect(subject.formats).to eq(["application/xml"])
       expect(subject.publisher).to eq("DataCite")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -159,7 +159,7 @@ describe Bolognese::Metadata, vcr: true do
       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.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -178,7 +178,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.sizes).to eq([])
       expect(subject.subjects).to eq([{"subject"=>"Environmental research"}])
       expect(subject.publisher).to eq("EvK2 CNR Committee")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.2")
     end
 
@@ -210,7 +210,7 @@ describe Bolognese::Metadata, vcr: true do
         {"subject"=>"crossover experiment"},
         {"subject"=>"hci"}])
       expect(subject.publisher).to eq("Zenodo")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -242,7 +242,7 @@ describe Bolognese::Metadata, vcr: true do
         "subjectScheme"=>"Fields of Science and Technology (FOS)"},
        {"subject"=>"Computational Biology"},
        {"subject"=>"Systems Biology"}])
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -272,7 +272,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.subjects).to eq([{"subject"=>"Evolutionary Biology"},
         {"subject"=>"FOS: Biological sciences", "subjectScheme"=>"Fields of Science and Technology (FOS)", "schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf"},
         {"subject"=>"60412 Quantitative Genetics (incl. Disease and Trait Mapping Genetics)", "subjectScheme"=>"FOR", "schemeUri"=>"http://www.abs.gov.au/ausstats/abs@.nsf/0/6BB427AB9696C225CA2574180004463E"}])
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -295,6 +295,17 @@ describe Bolognese::Metadata, vcr: true do
         {"subject"=>"FOS: Media and communications", "subjectScheme"=>"Fields of Science and Technology (FOS)", "schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf"}, {"subject"=>"Library and Information Studies"}])
     end
 
+    it "cc-by 3.0 us" do
+      input = "10.6084/m9.figshare.1286826.v1"
+      subject = Bolognese::Metadata.new(input: input)
+      expect(subject.valid?).to be true
+      expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 3.0 Unported",
+        +  "rightsIdentifier"=>"cc-by-3.0",
+        +  "rightsIdentifierScheme"=>"SPDX",
+        +  "rightsUri"=>"https://creativecommons.org/licenses/by/3.0/legalcode",
+        +  "schemeUri"=>"https://spdx.org/licenses/"}])
+    end
+
     it "funding schema version 3" do
       input = "https://doi.org/10.5281/ZENODO.1239"
       subject = Bolognese::Metadata.new(input: input)
@@ -320,7 +331,7 @@ describe Bolognese::Metadata, vcr: true do
         {"subject"=>"Data mining"},
         {"subject"=>"Statistical Computing Language R"},
         {"subject"=>"funded research publications"}])
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -361,7 +372,7 @@ describe Bolognese::Metadata, vcr: true do
         "funderIdentifierType"=>"Crossref Funder ID",
         "funderName"=>"European Commission"}])
       expect(subject.identifiers).to eq([{"identifier"=>"123", "identifierType"=>"Repository ID"}])
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
       expect(subject.state).to eq("findable")
     end
@@ -614,7 +625,7 @@ describe Bolognese::Metadata, vcr: true do
         "http://www.rcuk.ac.uk/research/efficiency/researchadmin/harmonisation/",
         "subject"=>"Materials Characterisation",
         "subjectScheme"=>"RCUK Research Classifications"}])
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -640,7 +651,7 @@ describe Bolognese::Metadata, vcr: true do
         "funderIdentifier"=>"https://doi.org/10.13039/501100000780",
         "funderIdentifierType"=>"Crossref Funder ID",
         "funderName"=>"European Commission"}])
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -660,7 +671,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publisher).to eq("МОДЕЛИРОВАНИЕ, ОПТИМИЗАЦИЯ И ИНФОРМАЦИОННЫЕ ТЕХНОЛОГИИ")
       expect(subject.funding_references.length).to eq(1)
       expect(subject.funding_references.first).to eq("awardNumber"=>"проект № 170100728", "funderName"=>"РФФИ")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -681,7 +692,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5438/0000-00ss", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
     end
 
     it "Schema 4.1 from string" do
@@ -711,7 +722,7 @@ describe Bolognese::Metadata, vcr: true do
         "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.publisher).to eq("Springer")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -741,7 +752,7 @@ describe Bolognese::Metadata, vcr: true do
         "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.publisher).to eq("Springer")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4.0")
     end
 
@@ -770,7 +781,7 @@ describe Bolognese::Metadata, vcr: true do
         "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.publisher).to eq("Dryad Digital Repository")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -800,7 +811,7 @@ describe Bolognese::Metadata, vcr: true do
         "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.publisher).to eq("Springer")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3.0")
     end
 
@@ -824,7 +835,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
       expect(subject.publisher).to eq("Springer")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.2")
     end
 
@@ -858,7 +869,7 @@ describe Bolognese::Metadata, vcr: true do
         "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.publisher).to eq("Springer")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
     end
 
     it "namespaced xml from string" do
@@ -875,7 +886,7 @@ describe Bolognese::Metadata, vcr: true do
       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.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.2")
     end
 
@@ -907,7 +918,7 @@ describe Bolognese::Metadata, vcr: true do
       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.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -928,7 +939,7 @@ describe Bolognese::Metadata, vcr: true do
       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.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -950,7 +961,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.descriptions[1]["description"]).to start_with("Aim of this paper is the presentation")
       expect(subject.subjects).to eq([{"subject"=>"PV Systems"}, {"subject"=>"Off-grid Applications"}])
       expect(subject.publisher).to eq("WIP-Munich")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.2")
     end
 
@@ -981,7 +992,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.dates).to eq([{"date"=>"2017", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("Siemens AG")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -1021,7 +1032,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.dates).to eq([{"date"=>"2014-04-25", "dateType"=>"Available"}, {"date"=>"2015", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2015")
       expect(subject.publisher).to eq("Royal Netherlands Meteorological Institute (KNMI)")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -1031,7 +1042,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be false
       expect(subject.id).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.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.state).to eq("not_found")
     end
 
@@ -1047,7 +1058,7 @@ describe Bolognese::Metadata, vcr: true do
       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.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
       expect(subject.state).to eq("findable")
     end
@@ -1064,7 +1075,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.dates).to eq([{"date"=>"2018", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2018")
       expect(subject.publisher).to eq("F1000 Research Limited")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
       expect(subject.state).to eq("findable")
     end
@@ -1083,7 +1094,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.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -1176,7 +1187,7 @@ describe Bolognese::Metadata, vcr: true do
         {"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.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -1203,7 +1214,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publisher).to eq("МОДЕЛИРОВАНИЕ, ОПТИМИЗАЦИЯ И ИНФОРМАЦИОННЫЕ ТЕХНОЛОГИИ")
       expect(subject.funding_references.count).to eq(1)
       expect(subject.funding_references.first).to eq("awardNumber"=>"проект № 170100728", "funderName"=>"РФФИ")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -1300,7 +1311,7 @@ describe Bolognese::Metadata, vcr: true do
     expect(subject.titles).to eq([{"lang"=>"en", "title"=>"Meteo measurements at the Sand Motor"}])
     expect(subject.publication_year).to eq("2017")
     expect(subject.publisher).to eq("4TU.Centre for Research Data")
-    expect(subject.agency).to eq("DataCite")
+    expect(subject.agency).to eq("datacite")
     expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     expect(subject.geo_locations.first["geoLocationPlace"]).to eq("Zandmotor, sand suppletion area on the Dutch coast.")
     expect(subject.geo_locations.first["geoLocationPolygon"].first).to eq("polygonPoint"=>{"pointLatitude"=>"52.03913926329928", "pointLongitude"=>"4.1738852605822"})

data/spec/writers/datacite_writer_spec.rb

@@ -147,7 +147,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2015")
       expect(subject.version_info).to eq("v0.3.2")
       expect(subject.publisher).to eq("Zenodo")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
       expect(subject.datacite).to include("<version>v0.3.2</version>")
     end
@@ -173,7 +173,7 @@ describe Bolognese::Metadata, vcr: true do
        {"schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf",
         "subject"=>"FOS: Computer and information sciences",
         "subjectScheme"=>"Fields of Science and Technology (FOS)"}])
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
       expect(subject.datacite).to end_with("</resource>")
     end
@@ -199,7 +199,7 @@ describe Bolognese::Metadata, vcr: true do
        {"schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf",
         "subject"=>"FOS: Computer and information sciences",
         "subjectScheme"=>"Fields of Science and Technology (FOS)"}])
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
       expect(subject.datacite).to end_with("</resource>")
     end
@@ -224,7 +224,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.related_identifiers.last).to eq("relatedIdentifier" => "10.1371/journal.ppat.1000446",
         "relatedIdentifierType" => "DOI","relationType"=>"IsSupplementTo")
       expect(subject.publisher).to eq("Dryad")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
 
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
@@ -249,7 +249,7 @@ describe Bolognese::Metadata, vcr: true do
       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.publisher).to eq("UC Merced")
-      expect(subject.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
 
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
@@ -273,7 +273,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be false
       expect(subject.id).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.agency).to eq("DataCite")
+      expect(subject.agency).to eq("datacite")
       expect(subject.state).to eq("not_found")
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite["identifier"]).to eq("identifierType"=>"DOI", "__content__"=>"10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
@@ -386,11 +386,11 @@ describe Bolognese::Metadata, vcr: true do
       input = "10.7554/eLife.01567"
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       expect(subject.valid?).to be true
-      expect(subject.identifiers).to eq( [{"identifier"=>"e01567", "identifierType"=>"Publisher ID"}])
-      subject.identifiers = [{ "identifierType" => "Publisher ID", "identifier" => "abc" }]
+      expect(subject.identifiers).to eq([{"identifier"=>"e01567", "identifierType"=>"article_number"}])
+      subject.identifiers = [{ "identifierType" => "article_number", "identifier" => "abc" }]
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("identifier", "__content__")).to eq("10.7554/elife.01567")
-      expect(subject.identifiers).to eq([{"identifier"=>"abc", "identifierType"=>"Publisher ID"}])
+      expect(subject.identifiers).to eq([{"identifier"=>"abc", "identifierType"=>"article_number"}])
     end
 
     it "validates against schema" do

data/spec/writers/jats_writer_spec.rb

@@ -53,7 +53,7 @@ describe Bolognese::Metadata, vcr: true do
       jats = Maremma.from_xml(subject.jats).fetch("element_citation", {})
       expect(jats.dig("publication_type")).to eq("chapter")
       expect(jats.dig("chapter_title")).to eq("Physical Examinations")
-      expect(jats.dig("source")).to eq("Jaypee Brothers Medical Publishers (P) Ltd.")
+      expect(jats.dig("source")).to eq("Jaypee Brothers Medical Publishing")
       expect(jats.dig("person_group", "name")).to eq("surname"=>"Saha", "given_names"=>"Ashis")
       expect(jats.dig("year")).to eq("iso_8601_date"=>"2015", "__content__"=>"2015")
       expect(jats.dig("fpage")).to eq("27")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.7
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -130,22 +130,16 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -908,6 +902,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/book.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/book_chapter.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/book_chapter_with_RDF_for_container.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/book_oup.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/component.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/dataset.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/dataset_usda.yml
@@ -926,6 +921,8 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/multiple_titles.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/not_found_error.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/posted_content.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/posted_content_copernicus.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/report_osti.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/vor_with_url.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/yet_another_book.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/yet_another_book_chapter.yml
@@ -944,6 +941,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/author_only_full_name.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/author_with_scheme.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/author_with_wrong_orcid_scheme.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/cc-by_3_0_us.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/content_url.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/date.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/dissertation.yml