bolognese 1.6.2 → 1.6.7

data/spec/readers/npm_reader_spec.rb

@@ -24,7 +24,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.titles).to eq([{"title"=>"fullstack_app"}])
       expect(subject.descriptions).to be_empty
       expect(subject.rights_list).to eq([{"rights"=>"ISC"}])
-      expect(subject.version).to eq("1.0.0")
+      expect(subject.version_info).to eq("1.0.0")
       #expect(subject.dates).to eq([{"date"=>"2016-12-20", "dateType"=>"Issued"}])
       #expect(subject.publication_year).to eq("2016")
     end
@@ -40,7 +40,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creators).to eq([{"name"=>":(unav)", "nameType"=>"Organizational"}])
       expect(subject.titles).to eq([{"title"=>"CITapp"}])
       expect(subject.descriptions).to eq([{"description"=>"Concealed Information Test app", "descriptionType"=>"Abstract"}])
-      expect(subject.version).to eq("1.1.0")
+      expect(subject.version_info).to eq("1.1.0")
       #expect(subject.dates).to eq([{"date"=>"2016-12-20", "dateType"=>"Issued"}])
       #expect(subject.publication_year).to eq("2016")
     end
@@ -58,7 +58,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.descriptions).to eq([{"description"=>
         +   "The EDAM Browser is a client-side web-based visualization javascript widget. Its goals are to help describing bio-related resources and service with EDAM, and to facilitate and foster community contributions to EDAM.",
            "descriptionType"=>"Abstract"}])
-      expect(subject.version).to eq("1.0.0")
+      expect(subject.version_info).to eq("1.0.0")
       #expect(subject.dates).to eq([{"date"=>"2016-12-20", "dateType"=>"Issued"}])
       #expect(subject.publication_year).to eq("2016")
     end

data/spec/readers/schema_org_reader_spec.rb

@@ -180,7 +180,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resourceType"=>"Gene expression matrices", "resourceTypeGeneral"=>"Dataset", "ris"=>"DATA", "schemaOrg"=>"Dataset")
       expect(subject.creators).to eq([{"name"=>"The GTEx Consortium", "nameType"=>"Organizational", "nameIdentifiers"=>[], "affiliation" => []}])
       expect(subject.titles).to eq([{"title"=>"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.version_info).to eq("v7")
       expect(subject.subjects).to eq([{"subject"=>"gtex"}, {"subject"=>"annotation"}, {"subject"=>"phenotype"}, {"subject"=>"gene regulation"}, {"subject"=>"transcriptomics"}])
       expect(subject.dates).to eq([{"date"=>"2017", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2017")
@@ -290,7 +290,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resourceTypeGeneral"=>"Dataset", "ris"=>"DATA", "schemaOrg"=>"Dataset")
       # expect(subject.creators).to eq([{"familyName"=>"Lindman", "givenName"=>"Karin", "name"=>"Lindman, Karin", "nameIdentifiers"=>[{"nameIdentifier"=> "https://orcid.org/0000-0003-1298-517X", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "nameType"=>"Personal"}])
       expect(subject.titles).to eq([{"title"=>"Ovary data from the Visual Sweden project DROID"}])
-      expect(subject.version).to eq("1.0")
+      expect(subject.version_info).to eq("1.0")
       expect(subject.subjects).to eq([{"subject"=>"pathology"}, {"subject"=>"whole slide imaging"}, {"subject"=>"annotated"}])
       expect(subject.dates).to eq([{"date"=>"2019-01-09", "dateType"=>"Issued"}, {"date"=>"2019-01-09", "dateType"=>"Created"}, {"date"=>"2019-01-09", "dateType"=>"Updated"}])
       expect(subject.publication_year).to eq("2019")

data/spec/utils_spec.rb

@@ -212,6 +212,12 @@ describe Bolognese::Metadata, vcr: true do
       expect(response).to eq("http://creativecommons.org/publicdomain/zero/1.0")
     end
 
+    it "with trailing slash and to https" do
+      url = "http://creativecommons.org/publicdomain/zero/1.0/"
+      response = subject.normalize_url(url, https: true)
+      expect(response).to eq("https://creativecommons.org/publicdomain/zero/1.0")
+    end
+
     it "uri" do
       url = "info:eu-repo/semantics/openAccess"
       response = subject.normalize_url(url)
@@ -219,6 +225,26 @@ describe Bolognese::Metadata, vcr: true do
     end
   end
 
+  context "normalize cc url" do
+    it "with trailing slash" do
+      url = "http://creativecommons.org/publicdomain/zero/1.0/"
+      response = subject.normalize_cc_url(url)
+      expect(response).to eq("https://creativecommons.org/publicdomain/zero/1.0/legalcode")
+    end
+
+    it "with trailing slash and to https" do
+      url = "http://creativecommons.org/publicdomain/zero/1.0/"
+      response = subject.normalize_cc_url(url)
+      expect(response).to eq("https://creativecommons.org/publicdomain/zero/1.0/legalcode")
+    end
+
+    it "not found" do
+      url = "http://creativecommons.org/publicdomain/zero/2.0/"
+      response = subject.normalize_cc_url(url)
+      expect(response).to eq("https://creativecommons.org/publicdomain/zero/2.0")
+    end
+  end
+
   context "normalize issn" do
     it "from array" do
       input = [{"media_type"=>"print", "__content__"=>"13040855"}, {"media_type"=>"electronic", "__content__"=>"21468427"}]
@@ -482,6 +508,38 @@ describe Bolognese::Metadata, vcr: true do
     end
   end
 
+  context "spdx" do
+    it "name_to_spdx exists" do
+      name = "Creative Commons Attribution 4.0 International"
+      response = subject.name_to_spdx(name)
+      expect(response).to eq({"rights"=>"Creative Commons Attribution 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode", "rightsIdentifier"=>"CC-BY-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/"})
+    end
+
+    it "name_to_spdx id" do
+      name = "CC-BY-4.0"
+      response = subject.name_to_spdx(name)
+      expect(response).to eq({"rights"=>"Creative Commons Attribution 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode", "rightsIdentifier"=>"CC-BY-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/"})
+    end
+
+    it "hsh_to_spdx id" do
+      hsh = { "rightsIdentifier" => "CC-BY-4.0" }
+      response = subject.hsh_to_spdx(hsh)
+      expect(response).to eq({"rights"=>"Creative Commons Attribution 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode", "rightsIdentifier"=>"CC-BY-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/"})
+    end
+
+    it "hsh_to_spdx url" do
+      hsh = { "rightsURI" => "http://creativecommons.org/licenses/by-nc/4.0/legalcode" }
+      response = subject.hsh_to_spdx(hsh)
+      expect(response).to eq("rights"=>"Creative Commons Attribution Non Commercial 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by-nc/4.0/legalcode", "rightsIdentifier"=>"CC-BY-NC-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/")
+    end
+
+    it "hsh_to_spdx not found" do
+      hsh = { "rightsURI" => "info:eu-repo/semantics/openAccess" }
+      response = subject.hsh_to_spdx(hsh)
+      expect(response).to eq({"rightsUri"=>"info:eu-repo/semantics/openAccess"})
+    end
+  end
+  
   context "fos" do
     it "name_to_fos match" do
       name = "Biological sciences"

data/spec/writers/bibtex_writer_spec.rb

@@ -16,6 +16,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(bibtex[:author]).to eq("Sankar, Martial and Nieminen, Kaisa and Ragni, Laura and Xenarios, Ioannis and Hardtke, Christian S")
       expect(bibtex[:journal]).to eq("eLife")
       expect(bibtex[:year]).to eq("2014")
+      expect(bibtex[:copyright]).to eq("Creative Commons Attribution 3.0 Unported")
     end
 
     it "with pages" do
@@ -31,6 +32,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(bibtex[:journal]).to eq("Pulmonary Medicine")
       expect(bibtex[:pages]).to eq("1-7")
       expect(bibtex[:year]).to eq("2012")
+      expect(bibtex[:copyright]).to eq("Creative Commons Attribution 3.0 Unported")
     end
 
     it "text" do
@@ -71,6 +73,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(bibtex[:publisher]).to eq("DataCite")
       expect(bibtex[:keywords]).to eq("faraday, excon, net/http")
       expect(bibtex[:year]).to eq("2017")
+      expect(bibtex[:copyright]).to eq("MIT License")
     end
 
     it "BlogPosting from string" do
@@ -111,6 +114,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(bibtex[:author]).to eq("Ollomo, Benjamin and Durand, Patrick and Prugnolle, Franck and Douzery, Emmanuel J. P. and Arnathau, Céline and Nkoghe, Dieudonné and Leroy, Eric and Renaud, François")
       expect(bibtex[:publisher]).to eq("Dryad Digital Repository")
       expect(bibtex[:year]).to eq("2011")
+      expect(bibtex[:copyright]).to eq("Creative Commons Zero v1.0 Universal")
     end
 
     it "from schema_org" do
@@ -139,6 +143,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(bibtex[:publisher]).to eq("eyemovement.org")
       expect(bibtex[:keywords]).to eq("eye tracking; eye movements; scanpaths; eye movement sequence; web pages; visual elements; web pages; scanpath analysis techniques; scanpath analysis; pattern detection; common scanpaths")
       expect(bibtex[:year]).to eq("2015")
+      expect(bibtex[:copyright]).to eq("Creative Commons Attribution 4.0 International")
     end
 
     it "keywords subject scheme" do
@@ -150,6 +155,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(bibtex[:doi]).to eq("10.1594/pangaea.721193")
       expect(bibtex[:keywords]).to eq("Animalia, Bottles or small containers/Aquaria ( 20 L), Calcification/Dissolution, Coast and continental shelf, Crassostrea gigas, Development, Growth/Morphology, Laboratory experiment, Mollusca, North Pacific, Pelagos, Single species, Temperate, Zooplankton, Experimental treatment, Carbonate system computation flag, Temperature, water, Salinity, pH, Alkalinity, total, Carbon, inorganic, dissolved, Carbon dioxide, Bicarbonate ion, Carbonate ion, Partial pressure of carbon dioxide (water) at sea surface temperature (wet air), Fugacity of carbon dioxide (water) at sea surface temperature (wet air), Aragonite saturation state, Calcite saturation state, Proportion, Crassostrea gigas, larvae length, Crassostrea gigas, larvae height, Crassostrea gigas, non mineralized, Crassostrea gigas, partially mineralized, Crassostrea gigas, fully mineralized, Calculated using seacarb after Nisumaa et al. (2010), Refractometer (Atago 100-S), pH meter (Mettler Toledo), pH meter (PHM290, Radiometer), Measured, European Project on Ocean Acidification (EPOCA), European network of excellence for Ocean Ecosystems Analysis (EUR-OCEANS), Ocean Acidification International Coordination Centre (OA-ICC)")
       expect(bibtex[:year]).to eq("2007")
+      expect(bibtex[:copyright]).to eq("Creative Commons Attribution 3.0 Unported")
     end
 
     it "author is organization" do

data/spec/writers/citation_writer_spec.rb

@@ -32,5 +32,13 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       expect(subject.citation).to eq("Alexander Kohls, &amp; Salvatore Mele. (2018). Converting the Literature of a Scientific Field to Open Access through Global Collaboration: The Experience of SCOAP3 in Particle Physics. <i>Publications</i>, <i>6</i>(2), 15. https://doi.org/10.3390/publications6020015")
     end
+
+    it "software w/version" do
+      input = "https://doi.org/10.5281/zenodo.2598836"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite")
+      expect(subject.style).to eq("apa")
+      expect(subject.locale).to eq("en-US")
+      expect(subject.citation).to eq("Lab For Exosphere And Near Space Environment Studies. (2019). <i>lenses-lab/LYAO_RT-2018JA026426: Original Release</i> (Version 1.0.0) [Computer software]. Zenodo. https://doi.org/10.5281/zenodo.2598836")
+    end
   end
 end

data/spec/writers/citeproc_writer_spec.rb

@@ -24,6 +24,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["publisher"]).to eq("Dryad Digital Repository")
       expect(json["issued"]).to eq("date-parts" => [[2011]])
       expect(json["submitted"]).to be_nil
+      expect(json["copyright"]).to eq("Creative Commons Zero v1.0 Universal")
     end
 
     it "BlogPosting" do
@@ -83,6 +84,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["container-title"]).to eq("eLife")
       expect(json["volume"]).to eq("3")
       expect(json["issued"]).to eq("date-parts" => [[2014, 2, 11]])
+      expect(json["copyright"]).to eq("Creative Commons Attribution 3.0 Unported")
     end
 
     it "software" do
@@ -92,24 +94,27 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["type"]).to eq("article")
       expect(json["DOI"]).to eq("10.6084/m9.figshare.4906367.v1")
       expect(json["title"]).to eq("Scimag catalogue of LibGen as of January 1st, 2014")
+      expect(json["copyright"]).to eq("Creative Commons Zero v1.0 Universal")
     end
 
     it "software w/version" do
       input = "https://doi.org/10.5281/zenodo.2598836"
       subject = Bolognese::Metadata.new(input: input, from: "datacite")
       json = JSON.parse(subject.citeproc)
-      expect(json["type"]).to eq("article")
+      expect(json["type"]).to eq("book")
       expect(json["DOI"]).to eq("10.5281/zenodo.2598836")
       expect(json["version"]).to eq("1.0.0")
+      expect(json["copyright"]).to eq("Open Access")
     end
 
     it "software w/version from datacite_json" do
       input = fixture_path + "datacite_software_version.json"
       subject = Bolognese::Metadata.new(input: input, from: "datacite_json")
       json = JSON.parse(subject.citeproc)
-      expect(json["type"]).to eq("article")
+      expect(json["type"]).to eq("book")
       expect(json["DOI"]).to eq("10.5281/ZENODO.2598836")
       expect(json["version"]).to eq("1.0.0")
+      expect(json["copyright"]).to eq("Open Access")
     end
 
     it "multiple abstracts" do
@@ -141,6 +146,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["volume"]).to eq("2012")
       expect(json["page"]).to eq("1-7")
       expect(json["issued"]).to eq("date-parts"=>[[2012]])
+      expect(json["copyright"]).to eq("Creative Commons Attribution 3.0 Unported")
     end
 
     it "with only first page" do
@@ -157,6 +163,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["volume"]).to eq("14")
       expect(json["page"]).to eq("e0214986")
       expect(json["issued"]).to eq("date-parts"=>[[2019, 5, 8]])
+      expect(json["copyright"]).to eq("Creative Commons Zero v1.0 Universal")
     end
 
     it "missing creator" do
@@ -173,6 +180,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["publisher"]).to eq("MDPI AG")
       expect(json["page"]).to eq("15")
       expect(json["issued"]).to eq("date-parts"=>[[2018, 4, 9]])
+      expect(json["copyright"]).to eq("Creative Commons Attribution 4.0 International")
     end
 
     it "container title" do
@@ -226,6 +234,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["author"]).to eq([{"family"=>"Fenner", "given"=>"Martin"}])
       expect(json["publisher"]).to eq("DataCite")
       expect(json["issued"]).to eq("date-parts" => [[2017, 2, 24]])
+      expect(json["copyright"]).to eq("MIT License")
     end
 
     it "keywords subject scheme" do
@@ -236,6 +245,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["id"]).to eq("https://doi.org/10.1594/pangaea.721193")
       expect(json["DOI"]).to eq("10.1594/pangaea.721193")
       expect(json["categories"]).to include("Animalia", "Bottles or small containers/Aquaria ( 20 L)", "Calcification/Dissolution", "Coast and continental shelf", "Development", "Growth/Morphology", "Laboratory experiment", "Mollusca", "Pelagos", "Single species", "Temperate", "Zooplankton", "Experimental treatment", "Carbonate system computation flag", "Temperature, water", "Salinity", "pH", "Alkalinity, total", "Carbon, inorganic, dissolved", "Carbon dioxide", "Bicarbonate ion", "Carbonate ion", "Partial pressure of carbon dioxide (water) at sea surface temperature (wet air)", "Fugacity of carbon dioxide (water) at sea surface temperature (wet air)", "Aragonite saturation state", "Calcite saturation state", "Proportion", "Crassostrea gigas, larvae length", "Crassostrea gigas, larvae height", "Crassostrea gigas, non mineralized", "Crassostrea gigas, partially mineralized", "Crassostrea gigas, fully mineralized", "Calculated using seacarb after Nisumaa et al. (2010)", "Refractometer (Atago 100-S)", "pH meter (Mettler Toledo)", "pH meter (PHM290, Radiometer)", "Measured", "European Project on Ocean Acidification (EPOCA)", "European network of excellence for Ocean Ecosystems Analysis (EUR-OCEANS)", "Ocean Acidification International Coordination Centre (OA-ICC)")
+      expect(json["copyright"]).to eq("Creative Commons Attribution 3.0 Unported")
     end
 
     it "organization author" do

data/spec/writers/crosscite_writer_spec.rb

@@ -14,7 +14,11 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite.fetch("related_identifiers").length).to eq(27)
       expect(crosscite.fetch("related_identifiers").first).to eq("relatedIdentifier"=>"2050-084X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
       expect(crosscite.fetch("related_identifiers").last).to eq("relatedIdentifier"=>"10.1038/ncb2764", "relatedIdentifierType"=>"DOI", "relationType"=>"References")
-      expect(crosscite.fetch("rights_list")).to eq([{"rightsUri"=>"http://creativecommons.org/licenses/by/3.0"}])
+      expect(crosscite.fetch("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 "with ORCID ID" do

data/spec/writers/datacite_json_writer_spec.rb

@@ -13,7 +13,11 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.fetch("titles")).to eq([{"title"=>"Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"}])
       expect(datacite.fetch("relatedIdentifiers").length).to eq(27)
       expect(datacite.fetch("relatedIdentifiers").first).to eq("relatedIdentifier"=>"2050-084X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
-      expect(datacite.fetch("rightsList")).to eq([{"rightsUri"=>"http://creativecommons.org/licenses/by/3.0"}])
+      expect(datacite.fetch("rightsList")).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 "with ORCID ID" do

data/spec/writers/datacite_writer_spec.rb

@@ -14,7 +14,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").length).to eq(27)
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "__content__"=>"2050-084X", "resourceTypeGeneral"=>"Collection")
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier")[1]).to eq("relatedIdentifierType"=>"DOI", "relationType"=>"References", "__content__"=>"10.1038/nature02100")
-      expect(datacite.dig("rightsList")).to eq("rights"=>{"rightsURI"=>"http://creativecommons.org/licenses/by/3.0"})
+      expect(datacite.dig("rightsList", "rights")).to eq("rightsURI"=>"https://creativecommons.org/licenses/by/3.0/legalcode", "rightsIdentifier"=>"CC-BY-3.0", "rightsIdentifierScheme"=>"SPDX", "schemeURI"=>"https://spdx.org/licenses/", "__content__"=>"Creative Commons Attribution 3.0 Unported")
       expect(datacite.dig("fundingReferences", "fundingReference").count).to eq(4)
       expect(datacite.dig("fundingReferences", "fundingReference").last).to eq("funderName"=>"University of Lausanne", "funderIdentifier" => {"funderIdentifierType"=>"Crossref Funder ID", "__content__"=>"https://doi.org/10.13039/501100006390"})
     end
@@ -145,7 +145,6 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.dates).to eq([{"date"=>"2015-08-19", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2015")
       expect(subject.version_info).to eq("v0.3.2")
-      expect(subject.version).to eq("v0.3.2")
       expect(subject.publisher).to eq("Zenodo")
       expect(subject.agency).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -161,7 +160,11 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creators.length).to eq(20)
       expect(subject.creators.first).to eq("nameType"=>"Personal", "familyName" => "Paglione", "givenName" => "Laura", "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0003-3188-6273", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "name" => "Paglione, Laura", "affiliation" => [])
       expect(subject.titles).to eq([{"title"=>"Recommendation of: ORCID Works Metadata Working Group"}])
-      expect(subject.rights_list).to eq([{"rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0", "rights"=>"CC-0"}])
+      expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Zero v1.0 Universal",
+        "rightsIdentifier"=>"CC0-1.0",
+        "rightsIdentifierScheme"=>"SPDX",
+        "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode",
+        "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.dates).to eq([{"date"=>"2017-06-28", "dateType"=>"Created"}, {"date"=>"2017-06-28", "dateType"=>"Updated"}, {"date"=>"2017", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("Figshare")
@@ -183,7 +186,11 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creators.length).to eq(20)
       expect(subject.creators.first).to eq("nameType" => "Personal", "familyName" => "Paglione", "givenName" => "Laura", "name" => "Paglione, Laura", "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0003-3188-6273", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}],"affiliation" => [])
       expect(subject.titles).to eq([{"title"=>"Recommendation of: ORCID Works Metadata Working Group"}])
-      expect(subject.rights_list).to eq([{"rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0", "rights"=>"CC-0"}])
+      expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Zero v1.0 Universal",
+        "rightsIdentifier"=>"CC0-1.0",
+        "rightsIdentifierScheme"=>"SPDX",
+        "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode",
+        "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.dates).to eq([{"date"=>"2017-06-28", "dateType"=>"Created"}, {"date"=>"2017-06-28", "dateType"=>"Updated"}, {"date"=>"2017", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("Figshare")
@@ -208,7 +215,11 @@ describe Bolognese::Metadata, vcr: true do
         {"identifier"=>
          "Ollomo B, Durand P, Prugnolle F, Douzery EJP, Arnathau C, Nkoghe D, Leroy E, Renaud F (2009) A new malaria agent in African hominids. PLoS Pathogens 5(5): e1000446.",
          "identifierType"=>"citation"}])
-      expect(subject.rights_list).to eq([{"rightsUri"=>"http://creativecommons.org/publicdomain/zero/1.0"}])
+      expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Zero v1.0 Universal",
+        "rightsIdentifier"=>"CC0-1.0",
+        "rightsIdentifierScheme"=>"SPDX",
+        "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode",
+        "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.dates).to eq([{"date"=>"2011", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2011")
       expect(subject.related_identifiers.length).to eq(6)
@@ -231,7 +242,11 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creators.first).to eq("affiliation"=>[{"name"=>"UC Merced"}, {"name"=>"NSF"}], "familyName"=>"Bales", "givenName"=>"Roger", "name"=>"Bales, Roger", "nameType"=>"Personal", "nameIdentifiers"=>[])
       expect(subject.titles).to eq([{"title"=>"Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek meteorological data, soil moisture and temperature, snow depth and air temperature"}])
       expect(subject.identifiers).to eq([{"identifier"=>"https://doi.org/10.6071/z7wc73", "identifierType"=>"DOI"}])
-      expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International (CC BY 4.0)", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0"}])
+      expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International",
+        "rightsIdentifier"=>"CC-BY-4.0",
+        "rightsIdentifierScheme"=>"SPDX",
+        "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode",
+        "schemeUri"=>"https://spdx.org/licenses/"}])
       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")
@@ -291,7 +306,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").length).to eq(27)
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("__content__"=>"2050-084X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier")[1]).to eq("relatedIdentifierType"=>"DOI", "relationType"=>"References", "__content__"=>"10.1038/nature02100")
-      expect(datacite.dig("rightsList")).to eq("rights"=>{"rightsURI"=>"http://creativecommons.org/licenses/by/3.0"})
+      expect(datacite.dig("rightsList", "rights")).to eq("rightsURI"=>"https://creativecommons.org/licenses/by/3.0/legalcode", "rightsIdentifier"=>"CC-BY-3.0", "rightsIdentifierScheme"=>"SPDX", "schemeURI"=>"https://spdx.org/licenses/", "__content__"=>"Creative Commons Attribution 3.0 Unported")
       expect(datacite.dig("fundingReferences", "fundingReference").count).to eq(4)
       expect(datacite.dig("fundingReferences", "fundingReference").last).to eq("funderName"=>"University of Lausanne", "funderIdentifier" => {"funderIdentifierType"=>"Crossref Funder ID", "__content__"=>"https://doi.org/10.13039/501100006390"})
     end

data/spec/writers/schema_org_writer_spec.rb

@@ -9,6 +9,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.7554/elife.01567")
+      expect(json["@type"]).to eq("ScholarlyArticle")
       expect(json["isPartOf"]).to eq("@type"=>"Periodical", "issn"=>"2050-084X")
       expect(json["periodical"]).to eq("@type"=>"Journal", "identifier"=>"2050-084X", "identifierType"=>"ISSN", "name"=>"eLife", "volume"=>"3")
       expect(json["citation"].length).to eq(26)
@@ -23,6 +24,7 @@ describe Bolognese::Metadata, vcr: true do
                                      {"name"=>"University of Lausanne",
                                       "@type"=>"Organization",
                                       "@id"=>"https://doi.org/10.13039/501100006390"}])
+      expect(json["license"]).to eq("https://creativecommons.org/licenses/by/3.0/legalcode")
     end
 
     it "maremma schema.org JSON" do
@@ -40,7 +42,9 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "datacite")
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.5281/zenodo.48440")
+      expect(json["@type"]).to eq("SoftwareSourceCode")
       expect(json["name"]).to eq("Analysis Tools For Crossover Experiment Of Ui Using Choice Architecture")
+      expect(json["license"]).to eq(["https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode", "info:eu-repo/semantics/openAccess"])
     end
 
     it "Schema.org JSON isReferencedBy" do
@@ -48,19 +52,30 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "datacite")
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.5061/dryad.8515")
+      expect(json["@type"]).to eq("Dataset")
       expect(json["@reverse"]).to eq("citation" => [{"@id"=>"https://doi.org/10.1371/journal.ppat.1000446", "@type"=>"ScholarlyArticle"}, {"@type"=>"ScholarlyArticle", "identifier"=>{"@type"=>"PropertyValue", "propertyID"=>"PMID", "value"=>"19478877"}}],
         "isBasedOn" => [{"@id"=>"https://doi.org/10.1371/journal.ppat.1000446", "@type"=>"ScholarlyArticle"}, {"@type"=>"ScholarlyArticle", "identifier"=>{"@type"=>"PropertyValue", "propertyID"=>"PMID", "value"=>"19478877"}}])
+      expect(json["license"]).to eq("https://creativecommons.org/publicdomain/zero/1.0/legalcode")
       expect(json["keywords"]).to eq("Phylogeny, Malaria, Parasites, Taxonomy, Mitochondrial genome, Africa, Plasmodium")
     end
 
     it "Schema.org JSON IsSupplementTo" do
       input = "https://doi.org/10.5517/CC8H01S"
-      subject = Bolognese::Metadata.new(input: input, from: "datacite")
+      subject = Bolognese::Metadata.new(input: input)
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.5517/cc8h01s")
+      expect(json["@type"]).to eq("Dataset")
       expect(json["@reverse"]).to eq("isBasedOn"=>{"@id"=>"https://doi.org/10.1107/s1600536804021154", "@type"=>"ScholarlyArticle"})
     end
 
+    it "Schema.org JSON Cyark" do
+      input = "https://doi.org/10.26301/jgf3-jm06"
+      subject = Bolognese::Metadata.new(input: input)
+      json = JSON.parse(subject.schema_org)
+      expect(json["@id"]).to eq("https://doi.org/10.26301/jgf3-jm06")
+      expect(json["@type"]).to eq("Dataset")
+    end
+
     it "rdataone" do
       input = fixture_path + 'codemeta.json'
       subject = Bolognese::Metadata.new(input: input, from: "codemeta")
@@ -87,20 +102,24 @@ describe Bolognese::Metadata, vcr: true do
 
     it "Funding" do
       input = "https://doi.org/10.5438/6423"
-      subject = Bolognese::Metadata.new(input: input, from: "datacite")
+      subject = Bolognese::Metadata.new(input: input)
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.5438/6423")
+      expect(json["@type"]).to eq("Collection")
       expect(json["hasPart"].length).to eq(25)
       expect(json["hasPart"].first).to eq("@type"=>"CreativeWork", "@id"=>"https://doi.org/10.5281/zenodo.30799")
       expect(json["funder"]).to eq("@id"=>"https://doi.org/10.13039/501100000780", "@type"=>"Organization", "name"=>"European Commission")
+      expect(json["license"]).to eq("https://creativecommons.org/licenses/by/4.0/legalcode")
     end
 
     it "Funding OpenAIRE" do
       input = "https://doi.org/10.5281/ZENODO.1239"
-      subject = Bolognese::Metadata.new(input: input, from: "datacite")
+      subject = Bolognese::Metadata.new(input: input)
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.5281/zenodo.1239")
+      expect(json["@type"]).to eq("Dataset")
       expect(json["funder"]).to eq("@id"=>"https://doi.org/10.13039/501100000780", "@type"=>"Organization", "name"=>"European Commission")
+      expect(json["license"]).to eq(["https://creativecommons.org/publicdomain/zero/1.0/legalcode", "info:eu-repo/semantics/openAccess"])
     end
 
     it "subject scheme" do
@@ -108,6 +127,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "datacite")
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.4232/1.2745")
+      expect(json["@type"]).to eq("Dataset")
       expect(json["name"]).to eq("Flash Eurobarometer 54 (Madrid Summit)")
       expect(json["keywords"]).to eq("KAT12 International Institutions, Relations, Conditions")
     end
@@ -117,8 +137,10 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "datacite")
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.1594/pangaea.721193")
+      expect(json["@type"]).to eq("Dataset")
       expect(json["name"]).to eq("Seawater carbonate chemistry and processes during experiments with Crassostrea gigas, 2007, supplement to: Kurihara, Haruko; Kato, Shoji; Ishimatsu, Atsushi (2007): Effects of increased seawater pCO2 on early development of the oyster Crassostrea gigas. Aquatic Biology, 1(1), 91-98")
       expect(json["keywords"]).to eq("Animalia, Bottles or small containers/Aquaria ( 20 L), Calcification/Dissolution, Coast and continental shelf, Crassostrea gigas, Development, Growth/Morphology, Laboratory experiment, Mollusca, North Pacific, Pelagos, Single species, Temperate, Zooplankton, Experimental treatment, Carbonate system computation flag, Temperature, water, Salinity, pH, Alkalinity, total, Carbon, inorganic, dissolved, Carbon dioxide, Bicarbonate ion, Carbonate ion, Partial pressure of carbon dioxide (water) at sea surface temperature (wet air), Fugacity of carbon dioxide (water) at sea surface temperature (wet air), Aragonite saturation state, Calcite saturation state, Proportion, Crassostrea gigas, larvae length, Crassostrea gigas, larvae height, Crassostrea gigas, non mineralized, Crassostrea gigas, partially mineralized, Crassostrea gigas, fully mineralized, Calculated using seacarb after Nisumaa et al. (2010), Refractometer (Atago 100-S), pH meter (Mettler Toledo), pH meter (PHM290, Radiometer), Measured, European Project on Ocean Acidification (EPOCA), European network of excellence for Ocean Ecosystems Analysis (EUR-OCEANS), Ocean Acidification International Coordination Centre (OA-ICC)")
+      expect(json["license"]).to eq("https://creativecommons.org/licenses/by/3.0/legalcode")
     end
 
     it "author is organization" do
@@ -128,6 +150,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, url: url, content_url: content_url, from: "datacite")
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.25491/9hx8-ke93")
+      expect(json["@type"]).to eq("Dataset")
       expect(json["author"]).to eq("@type"=>"Organization", "name"=>"The GTEx Consortium")
       expect(json["url"]).to eq("https://ors.datacite.org/doi:/10.25491/9hx8-ke93")
       expect(json["encodingFormat"]).to eq("application/tar")
@@ -210,6 +233,7 @@ describe Bolognese::Metadata, vcr: true do
           "propertyID"=>"URL",
           "value"=>"https://schema.datacite.org/meta/kernel-4.2/example/datacite-example-full-v4.2.xml"}]
       )
+      expect(json["license"]).to eq("https://creativecommons.org/publicdomain/zero/1.0/legalcode")
     end
 
     it "geo_location_point" do
@@ -234,6 +258,7 @@ describe Bolognese::Metadata, vcr: true do
         {"@type"=>"GeoShape",
          "address"=>"Providence Creek (Lower, Upper and P301)",
          "box"=>"37.046 -119.211 37.075 -119.182"}}])
+      expect(json["license"]).to eq("https://creativecommons.org/licenses/by/4.0/legalcode")
     end
 
     it "geo_location_box" do
@@ -252,6 +277,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["includedInDataCatalog"]).to be_nil
       expect(json["identifier"]).to eq("@type"=>"PropertyValue", "propertyID"=>"DOI", "value"=>"https://doi.org/10.1594/pangaea.842237")
       expect(json["spatialCoverage"]).to eq("@type"=>"Place", "geo"=>{"@type"=>"GeoShape", "box"=>"-64.3088 -168.5182 79.6753 174.9006"})
+      expect(json["license"]).to eq("https://creativecommons.org/licenses/by/3.0/legalcode")
     end
 
     it "geo_location_polygon" do