briard 2.2.7 → 2.4

data/spec/utils_spec.rb

@@ -207,13 +207,18 @@ describe Briard::Metadata, vcr: true do
     it "doi" do
       ids = [{"@type"=>"CreativeWork", "@id"=>"https://doi.org/10.5438/0012"}, {"@type"=>"CreativeWork", "@id"=>"https://doi.org/10.5438/55E5-T5C0"}]
       response = subject.normalize_ids(ids: ids)
-      expect(response).to eq([{"relatedIdentifier"=>"10.5438/0012", "relatedIdentifierType"=>"DOI"}, {"relatedIdentifier"=>"10.5438/55e5-t5c0", "relatedIdentifierType"=>"DOI"}])
+      expect(response).to eq([{"relatedIdentifier"=>"10.5438/0012",
+        "relatedIdentifierType"=>"DOI",
+        "resourceTypeGeneral"=>"Text"},
+       {"relatedIdentifier"=>"10.5438/55e5-t5c0",
+        "relatedIdentifierType"=>"DOI",
+        "resourceTypeGeneral"=>"Text"}])
     end
 
     it "url" do
       ids = [{"@type"=>"CreativeWork", "@id"=>"https://blog.datacite.org/eating-your-own-dog-food/"}]
       response = subject.normalize_ids(ids: ids)
-      expect(response).to eq("relatedIdentifier"=>"https://blog.datacite.org/eating-your-own-dog-food", "relatedIdentifierType"=>"URL")
+      expect(response).to eq("relatedIdentifier"=>"https://blog.datacite.org/eating-your-own-dog-food", "relatedIdentifierType"=>"URL", "resourceTypeGeneral" => "Text")
     end
   end
 
@@ -568,7 +573,7 @@ describe Briard::Metadata, vcr: true do
     it "name_to_fos match" do
       name = "Biological sciences"
       response = subject.name_to_fos(name)
-      expect(response).to eq([{"subject"=>"Biological sciences"},
+      expect(response).to eq([{"subject"=>"biological sciences"},
        {"schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf",
         "subject"=>"FOS: Biological sciences",
         "subjectScheme"=>"Fields of Science and Technology (FOS)"}])
@@ -577,7 +582,7 @@ describe Briard::Metadata, vcr: true do
     it "name_to_fos for match" do
       name = "Statistics"
       response = subject.name_to_fos(name)
-      expect(response).to eq([{"subject"=>"Statistics"},
+      expect(response).to eq([{"subject"=>"statistics"},
        {"schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf",
         "subject"=>"FOS: Mathematics",
         "subjectScheme"=>"Fields of Science and Technology (FOS)"}])
@@ -586,7 +591,7 @@ describe Briard::Metadata, vcr: true do
     it "name_to_fos no match" do
       name = "Random tag"
       response = subject.name_to_fos(name)
-      expect(response).to eq([{"subject"=>"Random tag"}])
+      expect(response).to eq([{"subject"=>"random tag"}])
     end
 
     it "hsh_to_fos match" do
@@ -624,6 +629,26 @@ describe Briard::Metadata, vcr: true do
       response = subject.hsh_to_fos(hsh)
       expect(response).to eq([{"subject"=>"Random tag"}])
     end
+  end
 
+  context "random doi" do
+    it "encode doi" do
+      prefix = "10.53731"
+      response = subject.encode_doi(prefix)
+      expect(response).to match(/#{prefix}\/[-._;()\/:A-Za-z0-9]+/)
+      expect(response.length).to eq(40)
+    end
+
+    it "decode doi" do
+      doi = "https://doi.org/10.53731/revzwnv-rpd913d-8drwz"
+      response = subject.decode_doi(doi)
+      expect(response).to eq (30286005717401267192153432991)
+    end
+
+    it "decode anothe doi" do
+      doi = "https://doi.org/10.53731/rckvde5-tzg61kj-7zvc1"
+      response = subject.decode_doi(doi)
+      expect(response).to eq (30198793950250854133601922433)
+    end
   end
 end

data/spec/writers/bibtex_writer_spec.rb

@@ -130,16 +130,16 @@ describe Briard::Metadata, vcr: true do
     end
 
     it "from schema_org" do
-      input = "https://blog.datacite.org/eating-your-own-dog-food/"
+      input = "https://blog.front-matter.io/posts/eating-your-own-dog-food/"
       subject = Briard::Metadata.new(input: input, from: "schema_org")
       bibtex = BibTeX.parse(subject.bibtex).to_a(quotes: '').first
       expect(bibtex[:bibtex_type].to_s).to eq("article")
-      expect(bibtex[:bibtex_key]).to eq("https://doi.org/10.5438/4k3m-nyvg")
-      expect(bibtex[:doi]).to eq("10.5438/4k3m-nyvg")
+      expect(bibtex[:bibtex_key]).to eq("https://doi.org/10.53731/r79vxn1-97aq74v-ag58n")
+      expect(bibtex[:doi]).to eq("10.53731/r79vxn1-97aq74v-ag58n")
       expect(bibtex[:title]).to eq("Eating your own Dog Food")
       expect(bibtex[:author]).to eq("Fenner, Martin")
-      expect(bibtex[:publisher]).to eq("DataCite")
-      expect(bibtex[:keywords]).to eq("datacite, doi, metadata, featured")
+      expect(bibtex[:publisher]).to eq("Front Matter")
+      expect(bibtex[:keywords]).to eq("feature")
       expect(bibtex[:year]).to eq("2016")
     end
 
@@ -163,7 +163,7 @@ describe Briard::Metadata, vcr: true do
       expect(bibtex[:bibtex_type].to_s).to eq("misc")
       expect(bibtex[:bibtex_key]).to eq("https://doi.org/10.1594/pangaea.721193")
       expect(bibtex[:doi]).to eq("10.1594/pangaea.721193")
-      expect(bibtex[:keywords]).to start_with("Animalia, Bottles or small containers/Aquaria (<20 L), Calcification/Dissolution")
+      expect(bibtex[:keywords]).to start_with("animalia, bottles or small containers/aquaria (<20 l), calcification/dissolution")
       expect(bibtex[:year]).to eq("2007")
       expect(bibtex[:copyright]).to eq("Creative Commons Attribution 3.0 Unported")
     end
@@ -188,7 +188,7 @@ describe Briard::Metadata, vcr: true do
       expect(bibtex[:title]).to eq("Single-unit recordings from two auditory areas in male zebra finches")
       expect(bibtex[:author]).to eq("Theunissen, Frederic E. and Hauber, ME and Woolley, Sarah M. N. and Gill, Patrick and Shaevitz, SS and Amin, Noopur and Hsu, A and Singh, NC and Grace, GA and Fremouw, Thane and Zhang, Junli and Cassey, P and Doupe, AJ and David, SV and Vinje, WE")
       expect(bibtex[:publisher]).to eq("CRCNS.org")
-      expect(bibtex[:keywords]).to eq("Neuroscience, Electrophysiology, auditory area, avian (zebra finch)")
+      expect(bibtex[:keywords]).to eq("neuroscience, electrophysiology, auditory area, avian (zebra finch)")
       expect(bibtex[:year]).to eq("2009")
     end
   end

data/spec/writers/cff_writer_spec.rb

@@ -23,7 +23,7 @@ describe Briard::Metadata, vcr: true do
       expect(json["abstract"]).to eq("<em>PyPinT</em> is a framework for Parallel-in-Time integration routines. The main purpose of <em>PyPinT</em> is to provide a framework for educational use and prototyping new parallel-in-time algorithms. As well it will aid in developing a high-performance C++ implementation for massively parallel computers providing the benefits of parallel-in-time routines to a zoo of time integrators in various applications.")
       expect(json["date-released"]).to eq("2014-05-27")
       expect(json["repository-code"]).to eq("https://zenodo.org/record/10164")
-      expect(json["keywords"]).to eq(["Parallel-in-Time Integration", "Spectral Deferred Corrections", "Multigrid", "Multi-Level Spectral Deferred Corrections", "Python Framework"])
+      expect(json["keywords"]).to eq(["parallel-in-time integration", "spectral deferred corrections", "multigrid", "multi-level spectral deferred corrections", "python framework"])
       expect(json["license"]).to be_nil
       expect(json["references"]).to eq("identifiers"=>[{"type"=>"url", "value"=>"https://github.com/Parallel-in-Time/PyPinT/tree/release-v0.0.4"}])
     end
@@ -70,7 +70,7 @@ describe Briard::Metadata, vcr: true do
       expect(json["abstract"]).to eq("This library provides a Ruby interface to manipulate Citation File Format files")
       expect(json["date-released"]).to eq("2021-08-18")
       expect(json["repository-code"]).to eq("https://github.com/citation-file-format/ruby-cff")
-      expect(json["keywords"]).to eq(["ruby", "credit", "software citation", "research software", "software sustainability", "metadata", "citation file format", "CFF"])
+      expect(json["keywords"]).to eq(["ruby", "credit", "software citation", "research software", "software sustainability", "metadata", "citation file format", "cff"])
       expect(json["license"]).to eq("apache-2.0")
       expect(json["references"]).to eq("identifiers"=>[{"type"=>"doi", "value"=>"10.5281/zenodo.1003149"}])
     end

data/spec/writers/citeproc_writer_spec.rb

@@ -55,15 +55,15 @@ describe Briard::Metadata, vcr: true do
     end
 
     it "BlogPosting schema.org" do
-      input = "https://blog.datacite.org/eating-your-own-dog-food/"
+      input = "https://blog.front-matter.io/posts/eating-your-own-dog-food/"
       subject = Briard::Metadata.new(input: input, from: "schema_org")
       json = JSON.parse(subject.citeproc)
-      expect(json["type"]).to eq("post-weblog")
-      expect(json["id"]).to eq("https://doi.org/10.5438/4k3m-nyvg")
-      expect(json["DOI"]).to eq("10.5438/4k3m-nyvg")
+      expect(json["type"]).to eq("article-newspaper")
+      expect(json["id"]).to eq("https://doi.org/10.53731/r79vxn1-97aq74v-ag58n")
+      expect(json["DOI"]).to eq("10.53731/r79vxn1-97aq74v-ag58n")
       expect(json["title"]).to eq("Eating your own Dog Food")
       expect(json["author"]).to eq([{"family"=>"Fenner", "given"=>"Martin"}])
-      expect(json["publisher"]).to eq("DataCite")
+      expect(json["publisher"]).to eq("Front Matter")
       expect(json["issued"]).to eq("date-parts" => [[2016, 12, 20]])
     end
 
@@ -263,7 +263,7 @@ describe Briard::Metadata, vcr: true do
       expect(json["type"]).to eq("dataset")
       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)")
+      expect(json["categories"]).to include("animalia", "bottles or small containers/aquaria (<20 l)")
       expect(json["copyright"]).to eq("Creative Commons Attribution 3.0 Unported")
     end
 

data/spec/writers/crosscite_writer_spec.rb

@@ -11,7 +11,7 @@ describe Briard::Metadata, vcr: true do
       expect(crosscite.fetch("url")).to eq("https://elifesciences.org/articles/01567")
       expect(crosscite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(crosscite.fetch("titles")).to eq([{"title"=>"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").length).to eq(28)
       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([{"rights"=>"Creative Commons Attribution 3.0 Unported",
@@ -107,16 +107,5 @@ describe Briard::Metadata, vcr: true do
             "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}],
         "nameType"=>"Personal"}])
     end
-
-    it "with data citation schema.org" do
-      input = "https://blog.datacite.org/eating-your-own-dog-food/"
-      subject = Briard::Metadata.new(input: input, from: "schema_org")
-      expect(subject.valid?).to be true
-      crosscite = JSON.parse(subject.crosscite)
-      expect(crosscite.fetch("titles")).to eq([{"title"=>"Eating your own Dog Food"}])
-      expect(crosscite.fetch("related_identifiers").count).to eq(3)
-      expect(crosscite.fetch("related_identifiers").first).to eq("relatedIdentifier"=>"10.5438/0000-00ss", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
-      expect(crosscite.fetch("related_identifiers").last).to eq("relatedIdentifier"=>"10.5438/55e5-t5c0", "relatedIdentifierType"=>"DOI", "relationType"=>"References")
-    end
   end
 end

data/spec/writers/crossref_writer_spec.rb

@@ -24,33 +24,33 @@ describe Briard::Metadata, vcr: true do
       expect(crossref.dig("doi_data", "doi")).to eq("10.1101/2020.12.01.406702")
     end
 
-    it "schema.org from datacite" do
-      input = "https://blog.datacite.org/farewell-to-datacite/"
-      subject = Briard::Metadata.new(input: input, from: "schema_org")
+    it "journal article from datacite" do
+      input = "10.2312/geowissenschaften.1989.7.181"
+      subject = Briard::Metadata.new(input: input, from: "datacite")
+     
       expect(subject.valid?).to be true
-      expect(subject.doi).to eq("10.5438/zx3k-3923")
-      expect(subject.url).to eq("https://blog.datacite.org/farewell-to-datacite")
-      expect(subject.types["schemaOrg"]).to eq("BlogPosting")
-      expect(subject.types["resourceTypeGeneral"]).to eq("Preprint")
-      expect(subject.types["ris"]).to eq("GEN")
-      expect(subject.types["citeproc"]).to eq("post-weblog")
-      expect(subject.container).to eq("title"=>"DataCite Blog", "type"=>"Blog")
-      expect(subject.titles).to eq([{"title"=>"Farewell to DataCite"}])
-      expect(subject.rights_list).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/"}])
-      crossref = Maremma.from_xml(subject.crossref).dig("doi_batch", "body", "posted_content")
-      expect(crossref.dig("titles", "title")).to eq("Farewell to DataCite")
+      expect(subject.doi).to eq("10.2312/geowissenschaften.1989.7.181")
+      expect(subject.url).to eq("https://www.tib.eu/suchen/id/awi:7058a56c5e43afd705af945d01536b9aaeeee491")
+      expect(subject.types["schemaOrg"]).to eq("ScholarlyArticle")
+      expect(subject.types["resourceTypeGeneral"]).to eq("JournalArticle")
+      expect(subject.types["ris"]).to eq("JOUR")
+      expect(subject.types["citeproc"]).to eq("article-journal")
+      expect(subject.titles).to eq([{"title"=>"An Overview of the Geology of Canadian Gold Occurrences"}])
+      expect(subject.publisher).to eq("VCH Verlagsgesellschaft mbH")
+      expect(subject.rights_list).to eq([{"rights"=>"VCH Verlagsgesellschaft mbH"}])
     end
 
     it "schema.org from front matter" do
       input = "https://blog.front-matter.io/posts/editorial-by-more-than-200-call-for-emergency-action-to-limit-global-temperature-increases-restore-biodiversity-and-protect-health"
       subject = Briard::Metadata.new(input: input, from: "schema_org")
+      
       expect(subject.valid?).to be true
       expect(subject.doi).to eq("10.53731/r9nqx6h-97aq74v-ag7bw")
       expect(subject.url).to eq("https://blog.front-matter.io/posts/editorial-by-more-than-200-call-for-emergency-action-to-limit-global-temperature-increases-restore-biodiversity-and-protect-health")
-      expect(subject.types["schemaOrg"]).to eq("BlogPosting")
+      expect(subject.types["schemaOrg"]).to eq("Article")
       expect(subject.types["resourceTypeGeneral"]).to eq("Preprint")
       expect(subject.types["ris"]).to eq("GEN")
-      expect(subject.types["citeproc"]).to eq("post-weblog")
+      expect(subject.types["citeproc"]).to eq("article-newspaper")
       expect(subject.titles).to eq([{"title"=>"Editorial by more than 200 health journals: Call for emergency action to limit global temperature increases, restore biodiversity, and protect health"}])
       expect(subject.creators).to eq([{"affiliation"=>[],
         "familyName"=>"Fenner",
@@ -62,13 +62,40 @@ describe Briard::Metadata, vcr: true do
           "schemeUri"=>"https://orcid.org"}],
           "nameType"=>"Personal"}])
       expect(subject.subjects).to eq([{"subject"=>"news"}])
-      expect(subject.container).to eq("identifier"=>"2749-9952", "identifierType"=>"ISSN", "title"=>"Front Matter", "type"=>"Blog")
       expect(subject.language).to eq("en")
       expect(subject.rights_list).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/"}])
       crossref = Maremma.from_xml(subject.crossref).dig("doi_batch", "body", "posted_content")
       expect(crossref.dig("titles", "title")).to eq("Editorial by more than 200 health journals: Call for emergency action to limit global temperature increases, restore biodiversity, and protect health")
     end
 
+    it "another schema.org from front-matter" do
+      input = "https://blog.front-matter.io/posts/dryad-interview-jen-gibson"
+      subject = Briard::Metadata.new(input: input, from: "schema_org")
+      expect(subject.valid?).to be true
+      expect(subject.doi).to eq("10.53731/rceh7pn-tzg61kj-7zv63")
+      expect(subject.url).to eq("https://blog.front-matter.io/posts/dryad-interview-jen-gibson")
+      expect(subject.types["schemaOrg"]).to eq("Article")
+      expect(subject.types["resourceTypeGeneral"]).to eq("Preprint")
+      expect(subject.types["ris"]).to eq("GEN")
+      expect(subject.types["citeproc"]).to eq("article-newspaper")
+      expect(subject.titles).to eq([{"title"=>"Dryad: Interview with Jen Gibson"}])
+      expect(subject.creators).to eq([{"affiliation"=>[],
+        "familyName"=>"Fenner",
+        "givenName"=>"Martin",
+        "name"=>"Fenner, Martin",
+        "nameIdentifiers"=>
+          [{"nameIdentifier"=>"https://orcid.org/0000-0003-1419-2405",
+           "nameIdentifierScheme"=>"ORCID",
+           "schemeUri"=>"https://orcid.org"}],
+        "nameType"=>"Personal"}])
+      expect(subject.subjects).to eq([{"subject"=>"interview"}])
+      expect(subject.container).to eq("identifier"=>"2749-9952", "identifierType"=>"ISSN", "title"=>"Front Matter", "type"=>"Blog")
+      expect(subject.language).to eq("en")
+      expect(subject.rights_list).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/"}])
+      crossref = Maremma.from_xml(subject.crossref).dig("doi_batch", "body", "posted_content")
+      expect(crossref.dig("titles", "title")).to eq("Dryad: Interview with Jen Gibson")
+    end
+
     it "embedded schema.org from front matter" do
       input = fixture_path + 'schema_org_front-matter.json'
       subject = Briard::Metadata.new(input: input, from: "schema_org")

data/spec/writers/datacite_json_writer_spec.rb

@@ -11,7 +11,7 @@ describe Briard::Metadata, vcr: true do
       expect(datacite.fetch("url")).to eq("https://elifesciences.org/articles/01567")
       expect(datacite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       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").length).to eq(28)
       expect(datacite.fetch("relatedIdentifiers").first).to eq("relatedIdentifier"=>"2050-084X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
       expect(datacite.fetch("rightsList")).to eq([{"rights"=>"Creative Commons Attribution 3.0 Unported",
         "rightsIdentifier"=>"cc-by-3.0",
@@ -77,14 +77,20 @@ describe Briard::Metadata, vcr: true do
         "nameType"=>"Personal"}])
     end
 
-    it "with data citation schema.org" do
-      input = "https://blog.datacite.org/eating-your-own-dog-food/"
+    it "from schema.org" do
+      input = "https://blog.front-matter.io/posts/eating-your-own-dog-food/"
       subject = Briard::Metadata.new(input: input, from: "schema_org")
       expect(subject.valid?).to be true
       datacite = JSON.parse(subject.datacite_json)
       expect(datacite.fetch("titles")).to eq([{"title"=>"Eating your own Dog Food"}])
-      expect(datacite.fetch("relatedIdentifiers").count).to eq(3)
-      expect(datacite.fetch("relatedIdentifiers").first).to eq("relatedIdentifier"=>"10.5438/0000-00ss", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
+      expect(datacite.fetch("creators")).to eq([{"affiliation"=>[],
+      "familyName"=>"Fenner",
+      "givenName"=>"Martin",
+      "name"=>"Fenner, Martin",
+      "nameIdentifiers"=>
+       [{"nameIdentifier"=>"https://orcid.org/0000-0003-1419-2405",
+         "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}],
+      "nameType"=>"Personal"}])
     end
   end
 end

data/spec/writers/datacite_writer_spec.rb

@@ -11,7 +11,7 @@ describe Briard::Metadata, vcr: true do
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("resourceType", "resourceTypeGeneral")).to eq("JournalArticle")
       expect(datacite.dig("titles", "title")).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
-      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").length).to eq(27)
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").length).to eq(28)
       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", "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")
@@ -169,7 +169,7 @@ describe Briard::Metadata, vcr: true do
       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")
-      expect(subject.subjects).to eq([{"subject"=>"Information Systems"},
+      expect(subject.subjects).to eq([{"subject"=>"information systems"},
        {"schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf",
         "subject"=>"FOS: Computer and information sciences",
         "subjectScheme"=>"Fields of Science and Technology (FOS)"}])
@@ -195,7 +195,7 @@ describe Briard::Metadata, vcr: true do
       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")
-      expect(subject.subjects).to eq([{"subject"=>"Information Systems"},
+      expect(subject.subjects).to eq([{"subject"=>"information systems"},
        {"schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf",
         "subject"=>"FOS: Computer and information sciences",
         "subjectScheme"=>"Fields of Science and Technology (FOS)"}])
@@ -222,7 +222,7 @@ describe Briard::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2011")
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("relatedIdentifier" => "10.1371/journal.ppat.1000446",
-        "relatedIdentifierType" => "DOI","relationType"=>"Cites")
+        "relatedIdentifierType" => "DOI","relationType"=>"IsCitedBy")
       expect(subject.publisher).to eq("Dryad")
       expect(subject.agency).to eq("datacite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -257,16 +257,6 @@ describe Briard::Metadata, vcr: true do
       expect(datacite.dig("creators", "creator", 0, "affiliation")).to eq(["UC Merced", "NSF"])
     end
 
-    it "with data citation schema.org" do
-      input = "https://blog.datacite.org/eating-your-own-dog-food/"
-      subject = Briard::Metadata.new(input: input, from: "schema_org")
-      expect(subject.valid?).to be true
-      datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
-      expect(datacite.dig("titles", "title")).to eq("Eating your own Dog Food")
-      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").count).to eq(3)
-      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("__content__"=>"10.5438/0000-00ss", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
-    end
-
     it "DOI not found" do
       input = "https://doi.org/10.4124/05F6C379-DD68-4CDB-880D-33D3E9576D52/1"
       subject = Briard::Metadata.new(input: input, from: "datacite")
@@ -302,7 +292,7 @@ describe Briard::Metadata, vcr: true do
       expect(datacite.dig("identifier", "__content__")).to eq("10.5061/DRYAD.8515")
       expect(datacite.dig("resourceType", "resourceTypeGeneral")).to eq("Dataset")
       expect(datacite.dig("titles", "title")).to eq("Data from: Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
-      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").length).to eq(27)
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").length).to eq(28)
       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", "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")

data/spec/writers/jats_writer_spec.rb

@@ -145,18 +145,19 @@ describe Briard::Metadata, vcr: true do
       expect(jats.dig("pub_id")).to eq("pub_id_type"=>"doi", "__content__"=>"10.5061/dryad.8515")
     end
 
-    it "with data citation schema.org" do
-      input = "https://blog.datacite.org/eating-your-own-dog-food/"
+    it "from schema_org" do
+      input = "https://blog.front-matter.io/posts/eating-your-own-dog-food/"
       subject = Briard::Metadata.new(input: input, from: "schema_org")
       jats = Maremma.from_xml(subject.jats).fetch("element_citation", {})
-      expect(jats.dig("publication_type")).to be_nil
-      expect(jats.dig("source")).to eq("Eating your own Dog Food")
-      expect(jats.dig("publisher_name")).to eq("DataCite")
+      expect(jats.dig("publication_type")).to eq("journal")
+      expect(jats.dig("article_title")).to eq("Eating your own Dog Food")
+      expect(jats.dig("source")).to eq("Front Matter")
+      expect(jats.dig("publisher_name")).to eq("Front Matter")
       expect(jats.dig("person_group", "name")).to eq("surname"=>"Fenner", "given_names"=>"Martin")
-      expect(jats.dig("year")).to eq("iso_8601_date"=>"2016-12-20", "__content__"=>"2016")
+      expect(jats.dig("year")).to eq("iso_8601_date"=>"2016-12-20T00:00:00Z", "__content__"=>"2016")
       expect(jats.dig("month")).to eq("12")
       expect(jats.dig("day")).to eq("20")
-      expect(jats.dig("pub_id")).to eq("pub_id_type"=>"doi", "__content__"=>"10.5438/4k3m-nyvg")
+      expect(jats.dig("pub_id")).to eq("pub_id_type"=>"doi", "__content__"=>"10.53731/r79vxn1-97aq74v-ag58n")
     end
 
     it "interactive resource without dates" do

data/spec/writers/rdf_xml_writer_spec.rb

@@ -71,16 +71,16 @@ describe Briard::Metadata, vcr: true do
     end
 
     it "BlogPosting schema.org" do
-      input = "https://blog.datacite.org/eating-your-own-dog-food/"
+      input = "https://blog.front-matter.io/posts/eating-your-own-dog-food/"
       subject = Briard::Metadata.new(input: input, from: "schema_org")
       expect(subject.valid?).to be true
       rdf_xml = Maremma.from_xml(subject.rdf_xml).fetch("RDF", {})
-      expect(rdf_xml.dig("BlogPosting", "rdf:about")).to eq("https://doi.org/10.5438/4k3m-nyvg")
-      expect(rdf_xml.dig("BlogPosting", "author", "Person", "rdf:about")).to eq("https://orcid.org/0000-0003-1419-2405")
-      expect(rdf_xml.dig("BlogPosting", "author", "Person", "name")).to eq("Martin Fenner")
-      expect(rdf_xml.dig("BlogPosting", "name")).to eq("Eating your own Dog Food")
-      expect(rdf_xml.dig("BlogPosting", "keywords")).to eq("datacite, doi, metadata, featured")
-      expect(rdf_xml.dig("BlogPosting", "datePublished", "__content__")).to eq("2016-12-20")
+      expect(rdf_xml.dig("Article", "rdf:about")).to eq("https://doi.org/10.53731/r79vxn1-97aq74v-ag58n")
+      expect(rdf_xml.dig("Article", "author", "Person", "rdf:about")).to eq("https://orcid.org/0000-0003-1419-2405")
+      expect(rdf_xml.dig("Article", "author", "Person", "name")).to eq("Martin Fenner")
+      expect(rdf_xml.dig("Article", "name")).to eq("Eating your own Dog Food")
+      expect(rdf_xml.dig("Article", "keywords")).to eq("feature")
+      expect(rdf_xml.dig("Article", "datePublished", "__content__")).to eq("2016-12-20T00:00:00Z")
     end
   end
 end

data/spec/writers/ris_writer_spec.rb

@@ -115,7 +115,7 @@ describe Briard::Metadata, vcr: true do
       expect(ris[4]).to eq("DO  - 10.5438/4k3m-nyvg")
       expect(ris[5]).to eq("UR  - https://blog.datacite.org/eating-your-own-dog-food")
       expect(ris[6]).to eq("AB  - Eating your own dog food is a slang term to describe that an organization should itself use the products and services it provides. For DataCite this means that we should use DOIs with appropriate metadata and strategies for long-term preservation for...")
-      expect(ris[7]).to eq("KW  - Phylogeny")
+      expect(ris[7]).to eq("KW  - phylogeny")
       expect(ris[14]).to eq("PY  - 2016")
       expect(ris[15]).to eq("PB  - DataCite")
       expect(ris[16]).to eq("ER  - ")
@@ -138,21 +138,21 @@ describe Briard::Metadata, vcr: true do
     end
 
     it "BlogPosting schema.org" do
-      input = "https://blog.datacite.org/eating-your-own-dog-food/"
+      input = "https://blog.front-matter.io/posts/eating-your-own-dog-food/"
       subject = Briard::Metadata.new(input: input, from: "schema_org")
       ris = subject.ris.split("\r\n")
       expect(ris[0]).to eq("TY  - GEN")
       expect(ris[1]).to eq("T1  - Eating your own Dog Food")
-      expect(ris[2]).to eq("T2  - DataCite Blog")
+      expect(ris[2]).to eq("T2  - Front Matter")
       expect(ris[3]).to eq("AU  - Fenner, Martin")
-      expect(ris[4]).to eq("DO  - 10.5438/4k3m-nyvg")
-      expect(ris[5]).to eq("UR  - https://blog.datacite.org/eating-your-own-dog-food")
-      expect(ris[6]).to eq("AB  - Eating your own dog food is a slang term to describe that an organization should itself use the products and services it provides. For DataCite this means that we should use DOIs with appropriate metadata and strategies for long-term preservation for...")
-      expect(ris[7]).to eq("KW  - datacite")
-      expect(ris[11]).to eq("PY  - 2016")
-      expect(ris[12]).to eq("PB  - DataCite")
-      expect(ris[13]).to eq("SN  - 10.5438/0000-00ss")
-      expect(ris[14]).to eq("ER  - ")
+      expect(ris[4]).to eq("DO  - 10.53731/r79vxn1-97aq74v-ag58n")
+      expect(ris[5]).to eq("UR  - https://blog.front-matter.io/posts/eating-your-own-dog-food")
+      expect(ris[6]).to eq("AB  - Eating your own dog food is a slang term to describe that an organization should itself use the products and services it provides. For DataCite this means that we should use DOIs with appropriate metadata and strategies for long-term preservation for the scholarly outputs we produce. For the most part this is not research data, but rather technical documents such as the DataCite Schema and its documentation (2016). These outputs also include the posts on this blog, where we discuss topics relev")
+      expect(ris[7]).to eq("KW  - feature")
+      expect(ris[8]).to eq("PY  - 2016")
+      expect(ris[9]).to eq("PB  - Front Matter")
+      expect(ris[10]).to eq("LA  - en")
+      expect(ris[11]).to eq("ER  - ")
     end
 
     it "Dataset" do
@@ -165,7 +165,7 @@ describe Briard::Metadata, vcr: true do
       expect(ris[2]).to eq("AU  - Ollomo, Benjamin")
       expect(ris[10]).to eq("DO  - 10.5061/dryad.8515")
       expect(ris[11]).to eq("UR  - http://datadryad.org/stash/dataset/doi:10.5061/dryad.8515")
-      expect(ris[13]).to eq("KW  - Plasmodium")
+      expect(ris[13]).to eq("KW  - plasmodium")
       expect(ris[18]).to eq("PB  - Dryad")
       expect(ris[19]).to eq("LA  - en")
       expect(ris[20]).to eq("ER  - ")
@@ -196,8 +196,8 @@ describe Briard::Metadata, vcr: true do
       expect(ris).to include("AU  - Kurihara, Haruko")
       expect(ris).to include("DO  - 10.1594/pangaea.721193")
       expect(ris).to include("UR  - https://doi.pangaea.de/10.1594/PANGAEA.721193")
-      expect(ris).to include("KW  - Animalia")
-      expect(ris).to include("KW  - Bottles or small containers/Aquaria (<20 L)")
+      expect(ris).to include("KW  - animalia")
+      expect(ris).to include("KW  - bottles or small containers/aquaria (<20 l)")
       expect(ris).to include("PY  - 2007")
       expect(ris).to include("PB  - PANGAEA - Data Publisher for Earth & Environmental Science")
       expect(ris).to include("LA  - en")

data/spec/writers/schema_org_writer_spec.rb

@@ -12,7 +12,7 @@ describe Briard::Metadata, vcr: true do
       expect(json["@type"]).to eq("ScholarlyArticle")
       expect(json["isPartOf"]).to eq("@type"=>"Periodical", "issn"=>"2050-084X")
       expect(json["periodical"]).to eq("@type"=>"Journal", "firstPage" => "e01567", "identifier"=>"2050-084X", "identifierType"=>"ISSN", "name"=>"eLife", "volume"=>"3")
-      expect(json["citation"].length).to eq(26)
+      expect(json["citation"].length).to eq(27)
       expect(json["citation"].first).to eq("@id"=>"https://doi.org/10.1038/nature02100", "@type"=>"CreativeWork")
       expect(json["funder"]).to eq([{"name"=>"SystemsX", "@type"=>"Organization"},
                                      {"name"=>"EMBO",
@@ -47,15 +47,14 @@ describe Briard::Metadata, vcr: true do
       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
+    it "Another Schema.org JSON" do
       input = "https://doi.org/10.5061/DRYAD.8515"
       subject = Briard::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["citation"]).to eq("@id"=>"https://doi.org/10.1371/journal.ppat.1000446", "@type"=>"CreativeWork")
       expect(json["license"]).to eq("https://creativecommons.org/publicdomain/zero/1.0/legalcode")
-      expect(json["keywords"]).to eq("Plasmodium, malaria, mitochondrial genome, Parasites")
+      expect(json["keywords"]).to eq("plasmodium, malaria, mitochondrial genome, parasites")
     end
 
     it "Schema.org JSON IsSupplementTo" do
@@ -96,7 +95,7 @@ describe Briard::Metadata, vcr: true do
                                      "affiliation"=>{"@type"=>"Organization", "name"=>"NCEAS"}},
                                     {"name"=>"University Of California, Santa Barbara", "@type"=>"Organization"}])
       expect(json["version"]).to eq("2.0.0")
-      expect(json["keywords"]).to eq("data sharing, data repository, DataONE")
+      expect(json["keywords"]).to eq("data sharing, data repository, dataone")
     end
 
     it "Funding" do
@@ -138,7 +137,7 @@ describe Briard::Metadata, vcr: true do
       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 include("Animalia, Bottles or small containers/Aquaria (<20 L)")
+      expect(json["keywords"]).to include("animalia, bottles or small containers/aquaria (<20 l)")
       expect(json["license"]).to eq("https://creativecommons.org/licenses/by/3.0/legalcode")
     end
 

data/spec/writers/turtle_writer_spec.rb

@@ -47,12 +47,13 @@ describe Briard::Metadata, vcr: true do
     end
 
     it "BlogPosting schema.org" do
-      input = "https://blog.datacite.org/eating-your-own-dog-food/"
+      input = "https://blog.front-matter.io/posts/eating-your-own-dog-food//"
       subject = Briard::Metadata.new(input: input, from: "schema_org")
       expect(subject.valid?).to be true
       ttl = subject.turtle.split("\n")
       expect(ttl[0]).to eq("@prefix schema: <http://schema.org/> .")
-      expect(ttl[2]).to eq("<https://doi.org/10.5438/4k3m-nyvg> a schema:BlogPosting;")
+      expect(ttl[2]).to eq("<https://doi.org/10.53731/r79vxn1-97aq74v-ag58n> a schema:Article;")
+      expect(ttl[3]).to eq("  schema:author <https://orcid.org/0000-0003-1419-2405>;")
     end
 
     it "DataONE" do