bolognese 1.8.18 → 1.9

data/spec/readers/datacite_json_reader_spec.rb

@@ -46,7 +46,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "datacite_software_missing_comma.json"
       subject = Bolognese::Metadata.new(input: input, from: "datacite_json", show_errors: true)
       expect(subject.valid?).to be false
-      expect(subject.errors).to eq(["expected comma, not a string (after doi) at line 4, column 11 [parse.c:370]"])
+      expect(subject.errors).to eq(["expected comma, not a string (after doi) at line 4, column 11 [parse.c:364]"])
       expect(subject.codemeta).to be_nil
     end
 

data/spec/readers/datacite_reader_spec.rb

@@ -280,7 +280,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "10.4225/03/5a6931f57c654"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.subjects).to eq([{"subject"=>"90301 Biomaterials", "subjectScheme"=>"FOR", "schemeUri"=>"http://www.abs.gov.au/ausstats/abs@.nsf/0/6BB427AB9696C225CA2574180004463E"}, 
+      expect(subject.subjects).to eq([{"subject"=>"90301 Biomaterials", "subjectScheme"=>"FOR", "schemeUri"=>"http://www.abs.gov.au/ausstats/abs@.nsf/0/6BB427AB9696C225CA2574180004463E"},
         {"subject"=>"FOS: Medical engineering", "subjectScheme"=>"Fields of Science and Technology (FOS)", "schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf"}])
     end
 
@@ -289,8 +289,8 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.subjects).to eq([{"subject"=>"130103 Higher Education", "subjectScheme"=>"FOR", "schemeUri"=>"http://www.abs.gov.au/ausstats/abs@.nsf/0/6BB427AB9696C225CA2574180004463E"},
-        {"subject"=>"FOS: Educational sciences", "subjectScheme"=>"Fields of Science and Technology (FOS)", "schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf"}, 
-        {"subject"=>"130313 Teacher Education and Professional Development of Educators", "subjectScheme"=>"FOR", "schemeUri"=>"http://www.abs.gov.au/ausstats/abs@.nsf/0/6BB427AB9696C225CA2574180004463E"}, 
+        {"subject"=>"FOS: Educational sciences", "subjectScheme"=>"Fields of Science and Technology (FOS)", "schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf"},
+        {"subject"=>"130313 Teacher Education and Professional Development of Educators", "subjectScheme"=>"FOR", "schemeUri"=>"http://www.abs.gov.au/ausstats/abs@.nsf/0/6BB427AB9696C225CA2574180004463E"},
         {"subject"=>"80799 Library and Information Studies not elsewhere classified", "subjectScheme"=>"FOR", "schemeUri"=>"http://www.abs.gov.au/ausstats/abs@.nsf/0/6BB427AB9696C225CA2574180004463E"},
         {"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
@@ -1314,6 +1314,257 @@ describe Bolognese::Metadata, vcr: true do
     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"})
+    expect(subject.geo_locations.first["geoLocationPolygon"][0].first).to eq("polygonPoint"=>{"pointLatitude"=>"52.03913926329928", "pointLongitude"=>"4.1738852605822"})
   end
+
+  it "Schema 4.4 from string" do
+    input = fixture_path + "datacite-example-full-v4.4.xml"
+    subject = Bolognese::Metadata.new(input: input)
+    expect(subject.valid?).to be true
+    expect(subject.types["schemaOrg"]).to eq("SoftwareSourceCode")
+    expect(subject.types["resourceType"]).to eq("XML")
+    expect(subject.types["resourceTypeGeneral"]).to eq("Software")
+    expect(subject.creators).to eq(
+      [
+        {
+          "name"=>"Miller, Elizabeth", "givenName"=>"Elizabeth", "familyName"=>"Miller",
+          "nameType" => "Personal",
+          "nameIdentifiers"=> [{"nameIdentifier"=>"https://orcid.org/0000-0001-5000-0007",
+             "schemeUri"=>"https://orcid.org",
+             "nameIdentifierScheme"=>"ORCID"}],
+          "affiliation" => [{ "name" => "DataCite" }]
+        }
+      ]
+    )
+    expect(subject.titles).to eq(
+      [
+        {"title"=>"Full DataCite XML Example", "lang"=>"en-US"},
+        {"title"=>"Demonstration of DataCite Properties.", "titleType"=>"Subtitle", "lang"=>"en-US"}
+      ]
+    )
+    expect(subject.identifiers).to eq([{"identifier"=>"https://schema.datacite.org/meta/kernel-4.4/example/datacite-example-full-v4.4.xml", "identifierType"=>"URL"}])
+    expect(subject.dates).to eq(
+      [
+        {"date"=>"2021-01-26", "dateInformation"=>"Updated with 4.4 properties", "dateType"=>"Updated"},
+        {"date"=>"2014", "dateType"=>"Issued"}
+      ]
+    )
+    expect(subject.publication_year).to eq("2014")
+    expect(subject.subjects).to eq(
+      [{
+        "subject"=>"computer science",
+        "subjectScheme"=>"dewey",
+        "schemeUri"=>"http://dewey.info/",
+        "lang"=>"en-US",
+        "classificationCode"=>"000"
+      }]
+    )
+    expect(subject.related_identifiers.length).to eq(2)
+    expect(subject.related_identifiers.last).to eq(
+      "relatedIdentifier"=>"arXiv:0706.0001",
+      "relatedIdentifierType"=>"arXiv",
+      "relationType"=>"IsReviewedBy",
+      "resourceTypeGeneral"=>"Text"
+    )
+    expect(subject.rights_list).to eq([
+      {
+      "lang"=>"en-US",
+      "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.publisher).to eq("DataCite")
+    expect(subject.agency).to eq("datacite")
+    expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
+    expect(subject.related_items.last).to eq(
+      {
+        "relatedItemType"=>"Journal",
+        "relationType"=>"IsPublishedIn",
+        "relatedItemIdentifier"=>
+        {
+          "relatedItemIdentifier"=>"10.1016/j.physletb.2017.11.044",
+          "relatedItemIdentifierType"=>"DOI",
+        },
+        "titles"=>
+        [
+          {"title"=>"Physics letters / B"},
+        ],
+        "volume"=>"776",
+        "firstPage"=>"249",
+        "lastPage"=>"264",
+        "publicationYear"=>"2018",
+        "contributors"=>[],
+        "creators"=>[],
+      }
+    )
+  end
+
+  it "Schema 4.4 related items from string" do
+    input = fixture_path + "datacite-example-relateditems.xml"
+    subject = Bolognese::Metadata.new(input: input)
+    expect(subject.valid?).to be true
+
+    expect(subject.related_items.last).to eq(
+      {
+        "relatedItemType"=>"Journal",
+        "relationType"=>"IsPublishedIn",
+        "relatedItemIdentifier"=>
+        {
+          "relatedItemIdentifier"=>"10.5072/john-smiths-1234",
+          "relatedItemIdentifierType"=>"DOI",
+          "relatedMetadataScheme"=>"citeproc+json",
+          "schemeURI"=>"https://github.com/citation-style-language/schema/raw/master/csl-data.json",
+          "schemeType"=>"URL"
+        },
+        "creators" =>
+        [
+          {"nameType"=>"Personal", "name"=>"Smith, John", "givenName"=>"John", "familyName"=>"Smith"}
+        ],
+        "titles"=>
+        [
+          {"title"=>"Understanding the fictional John Smith"},
+          {"title"=>"A detailed look", "titleType"=>"Subtitle"}
+        ],
+        "volume"=>"776",
+        "issue"=>"1",
+        "number"=>"1",
+        "numberType"=>"Chapter",
+        "firstPage"=>"50",
+        "lastPage"=>"60",
+        "publisher"=>"Example Inc",
+        "publicationYear"=>"1776",
+        "edition"=>"1",
+        "contributors"=>
+        [
+          {"name"=>"Hallett, Richard", "givenName"=>"Richard", "familyName"=>"Hallett", "contributorType"=>"ProjectLeader"}
+        ]
+      }
+    )
+  end
+
+  it "Schema 4.4 dissertation from string" do
+    input = fixture_path + "datacite-example-dissertation-v4.4.xml"
+    subject = Bolognese::Metadata.new(input: input)
+    expect(subject.valid?).to be true
+    expect(subject.types["resourceType"]).to eq(nil)
+    expect(subject.types["resourceTypeGeneral"]).to eq("Dissertation")
+    expect(subject.types["schemaOrg"]).to eq("Thesis")
+    expect(subject.types["ris"]).to eq("THES")
+    expect(subject.types["citeproc"]).to eq("thesis")
+    expect(subject.creators).to eq(
+      [
+        {
+          "name"=>"Luo, R",
+          "familyName"=>"Luo",
+          "givenName"=>"R",
+          "nameIdentifiers"=>[],
+          "affiliation"=>[],
+          "nameType" => "Personal"
+        },
+        {
+          "name"=>"Liu, B",
+          "familyName"=>"Liu",
+          "givenName"=>"B",
+          "nameIdentifiers"=>[],
+          "affiliation"=>[],
+          "nameType" => "Personal"
+        },
+        {
+          "name"=>"Xie, Y",
+          "familyName"=>"Xie",
+          "givenName"=>"Y",
+          "nameIdentifiers"=>[],
+          "affiliation"=>[],
+          "nameType" => "Personal"
+        },
+        {
+          "name"=>"Li, Z",
+          "familyName"=>"Li",
+          "givenName"=>"Z",
+          "nameIdentifiers"=>[],
+          "affiliation"=>[],
+          "nameType" => "Personal"
+        }
+      ]
+    )
+    expect(subject.titles).to eq(
+      [
+        {"title"=>"Software and supporting material for \"SOAPdenovo2: An empirically improved memory-efficient short read de novo assembly\"", "lang"=>"en"},
+      ]
+    )
+    expect(subject.dates).to eq(
+      [
+        {"date"=>"2012-12-13", "dateType"=>"Available"},
+        {"date"=>"2012", "dateType"=>"Issued"}
+      ]
+    )
+    expect(subject.publication_year).to eq("2012")
+    expect(subject.subjects).to eq(
+      [
+        {
+        "subject"=>"DNA (Genetics)",
+        "lang"=>"en"
+        },
+        {
+        "subject"=>"Computer Program",
+        "lang"=>"en"
+        }
+      ]
+    )
+    expect(subject.related_identifiers).to eq(
+      [
+        {"relatedIdentifier"=>"10.5072/2047-217x-1-1", "relatedIdentifierType"=>"DOI", "relationType"=>"IsReferencedBy"},
+        {"relatedIdentifier"=>"10.5072/100038", "relatedIdentifierType"=>"DOI", "relationType"=>"Compiles"}
+      ]
+    )
+    expect(subject.rights_list).to eq([
+      {
+      "lang"=>"en-US",
+      "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.publisher).to eq("GigaScience Database")
+    expect(subject.agency).to eq("datacite")
+    expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
+  end
+
+
+  it "Parsing xs-string attribute correctly" do
+    input = fixture_path + "datacite-example-xs-string.xml"
+    subject = Bolognese::Metadata.new(input: input)
+    expect(subject.valid?).to be true
+    expect(subject.id).to eq("https://doi.org/10.4225/13/511c71f8612c3")
+    expect(subject.sizes.first).to eq("1.7 GB")
+    expect(subject.formats.first).to eq("application/xml")
+  end
+
+  it "Parsing multiple geolocationpolygon elements" do
+    input = fixture_path + "datacite-geolocationpolygons-multiple.xml"
+    subject = Bolognese::Metadata.new(input: input)
+    expect(subject.valid?).to be true
+    expect(subject.id).to eq("https://doi.org/10.5072/multiplegeopolygons")
+    expect(subject.geo_locations).to eq([
+      { "geoLocationPolygon"=> [
+        [ {"polygonPoint"=>{"pointLatitude"=>"71", "pointLongitude"=>"41"}},
+          {"polygonPoint"=>{"pointLatitude"=>"75", "pointLongitude"=>"45"}},
+          {"polygonPoint"=>{"pointLatitude"=>"85", "pointLongitude"=>"55"}},
+          {"polygonPoint"=>{"pointLatitude"=>"71", "pointLongitude"=>"41"}}],
+        [
+          {"polygonPoint"=>{"pointLatitude"=>"80", "pointLongitude"=>"65"}},
+          {"polygonPoint"=>{"pointLatitude"=>"75", "pointLongitude"=>"55"}},
+          {"polygonPoint"=>{"pointLatitude"=>"73", "pointLongitude"=>"45"}},
+          {"polygonPoint"=>{"pointLatitude"=>"80", "pointLongitude"=>"65"}}
+        ]
+      ] }
+      ]
+    )
+  end
+
 end

data/spec/readers/ris_reader_spec.rb

@@ -29,14 +29,14 @@ describe Bolognese::Metadata, vcr: true do
     it "Crossref DOI" do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
-      expect(subject.types).to eq("citeproc"=>"misc", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("citeproc"=>"misc", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
       expect(subject.creators.length).to eq(5)
       expect(subject.creators.first).to eq("nameType"=>"Personal",
                                          "name"=>"Sankar, Martial",
                                          "givenName"=>"Martial",
                                          "familyName"=>"Sankar",
-                                         "nameIdentifiers" => [], 
+                                         "nameIdentifiers" => [],
                                          "affiliation" => [])
       expect(subject.titles).to eq([{"title"=>"Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"}])
       expect(subject.descriptions.first["description"]).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
@@ -53,7 +53,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be false
       expect(subject.state).to eq("not_found")
       expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
-      expect(subject.types).to eq("citeproc"=>"misc", "resourceTypeGeneral"=>"Text", "ris"=>"THES", "schemaOrg"=>"Thesis")
+      expect(subject.types).to eq("citeproc"=>"misc", "resourceTypeGeneral"=>"Dissertation", "ris"=>"THES", "schemaOrg"=>"Thesis")
       expect(subject.creators).to eq([{"nameType"=>"Personal", "name"=>"Toparlar, Y.", "givenName"=>"Y.", "familyName"=>"Toparlar", "nameIdentifiers" => [], "affiliation" => []}])
       expect(subject.titles).to eq([{"title"=>"A multiscale analysis of the urban heat island effect"}])
       expect(subject.descriptions.first["description"]).to start_with("Designing the climates of cities")

data/spec/writers/crosscite_writer_spec.rb

@@ -9,7 +9,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       crosscite = JSON.parse(subject.crosscite)
       expect(crosscite.fetch("url")).to eq("https://elifesciences.org/articles/01567")
-      expect(crosscite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      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").first).to eq("relatedIdentifier"=>"2050-084X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
@@ -25,7 +25,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.1155/2012/291294"
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       crosscite = JSON.parse(subject.crosscite)
-      expect(crosscite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(crosscite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(crosscite.fetch("creators").count).to eq(7)
       expect(crosscite.fetch("creators")[2]).to eq("nameType"=>"Personal", "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0003-2043-4925", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "name"=>"Hernandez, Beatriz", "givenName"=>"Beatriz", "familyName"=>"Hernandez", "affiliation" => [{"name"=>"War Related Illness and Injury Study Center (WRIISC) and Mental Illness Research Education and Clinical Center (MIRECC), Department of Veterans Affairs, Palo Alto, CA 94304, USA"}, {"name"=>"Department of Psychiatry and Behavioral Sciences, Stanford University School of Medicine, Stanford, CA 94304, USA"}])
     end
@@ -41,7 +41,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "crossref.bib"
       subject = Bolognese::Metadata.new(input: input, from: "bibtex")
       crosscite = JSON.parse(subject.crosscite)
-      expect(crosscite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceTypeGeneral"=>"Text", "resourceType"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(crosscite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceTypeGeneral"=>"JournalArticle", "resourceType"=>"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.dig("descriptions", 0, "description")).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
       expect(crosscite.fetch("creators").count).to eq(5)

data/spec/writers/csv_writer_spec.rb

@@ -8,12 +8,12 @@ describe Bolognese::Metadata, vcr: true do
       input = "10.7554/eLife.01567"
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       csv = (subject.csv).parse_csv
-      
+
       expect(csv[0]).to eq("10.7554/elife.01567")
       expect(csv[1]).to eq("https://elifesciences.org/articles/01567")
       expect(csv[2]).to eq("2018-08-23")
       expect(csv[3]).to eq("findable")
-      expect(csv[4]).to eq("Text")
+      expect(csv[4]).to eq("JournalArticle")
       expect(csv[5]).to eq("JournalArticle")
       expect(csv[6]).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
       expect(csv[7]).to eq("Sankar, Martial and Nieminen, Kaisa and Ragni, Laura and Xenarios, Ioannis and Hardtke, Christian S")
@@ -30,7 +30,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(csv[1]).to eq("http://www.hindawi.com/journals/pm/2012/291294/")
       expect(csv[2]).to eq("2016-08-02")
       expect(csv[3]).to eq("findable")
-      expect(csv[4]).to eq("Text")
+      expect(csv[4]).to eq("JournalArticle")
       expect(csv[5]).to eq("JournalArticle")
       expect(csv[6]).to eq("Delineating a Retesting Zone Using Receiver Operating Characteristic Analysis on Serial QuantiFERON Tuberculosis Test Results in US Healthcare Workers")
       expect(csv[7]).to eq("Thanassi, Wendy and Noda, Art and Hernandez, Beatriz and Newell, Jeffery and Terpeluk, Paul and Marder, David and Yesavage, Jerome A.")
@@ -73,7 +73,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(csv[8]).to eq("NASA Physical Oceanography DAAC")
       expect(csv[9]).to eq("2012")
     end
-    
+
     it "maremma" do
       input = "https://github.com/datacite/maremma"
       subject = Bolognese::Metadata.new(input: input, from: "codemeta")

data/spec/writers/datacite_json_writer_spec.rb

@@ -9,7 +9,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       datacite = JSON.parse(subject.datacite_json)
       expect(datacite.fetch("url")).to eq("https://elifesciences.org/articles/01567")
-      expect(datacite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      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").first).to eq("relatedIdentifier"=>"2050-084X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
@@ -25,7 +25,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       datacite = JSON.parse(subject.datacite_json)
       expect(datacite.fetch("url")).to eq("http://www.hindawi.com/journals/pm/2012/291294/")
-      expect(datacite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(datacite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(datacite.fetch("creators").length).to eq(7)
       expect(datacite.fetch("creators").first).to eq("nameType"=>"Personal", "name"=>"Thanassi, Wendy", "givenName"=>"Wendy", "familyName"=>"Thanassi", "affiliation" => [{"name"=>"Department of Medicine, Veterans Affairs Palo Alto Health Care System, 3801 Miranda Avenue MC-, Palo Alto, CA 94304-1207, USA"}, {"name"=>"Occupational Health Strategic Health Care Group, Office of Public Health, Veterans Health Administration, Washington, DC 20006, USA"}, {"name"=>"Division of Emergency Medicine, Stanford University School of Medicine, Stanford, CA 94304, USA"}, {"name"=>"War Related Illness and Injury Study Center (WRIISC) and Mental Illness Research Education and Clinical Center (MIRECC), Department of Veterans Affairs, Palo Alto, CA 94304, USA"}])
     end
@@ -34,7 +34,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "crossref.bib"
       subject = Bolognese::Metadata.new(input: input, from: "bibtex")
       datacite = JSON.parse(subject.datacite_json)
-      expect(datacite.fetch("types")).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      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.dig("descriptions", 0, "description")).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
       expect(datacite.fetch("creators").length).to eq(5)

data/spec/writers/datacite_writer_spec.rb

@@ -9,7 +9,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
-      expect(datacite.dig("resourceType", "resourceTypeGeneral")).to eq("Text")
+      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").first).to eq("relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "__content__"=>"2050-084X", "resourceTypeGeneral"=>"Collection")
@@ -24,7 +24,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
-      expect(datacite.dig("resourceType", "resourceTypeGeneral")).to eq("Text")
+      expect(datacite.dig("resourceType", "resourceTypeGeneral")).to eq("JournalArticle")
       expect(datacite.dig("creators", "creator").count).to eq(7)
       expect(datacite.dig("creators", "creator")[2]).to eq("creatorName" => {"__content__"=>"Hernandez, Beatriz", "nameType"=>"Personal"},
         "familyName" => "Hernandez",
@@ -46,7 +46,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "bibtex")
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
-      expect(datacite.dig("resourceType", "resourceTypeGeneral")).to eq("Text")
+      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("descriptions", "description").first).to eq("__content__"=>"eLife, 3", "descriptionType"=>"SeriesInformation")
       expect(datacite.dig("descriptions", "description", 1, "__content__")).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
@@ -341,7 +341,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.dig("identifier", "__content__")).to eq("10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
       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")
-      
+
     end
 
     it "change license" do

data/spec/writers/schema_org_writer_spec.rb

@@ -145,7 +145,7 @@ describe Bolognese::Metadata, vcr: true do
     it "author is organization" do
       input = fixture_path + 'gtex.xml'
       url = "https://ors.datacite.org/doi:/10.25491/9hx8-ke93"
-      content_url = "https://storage.googleapis.com/gtex_analysis_v7/single_tissue_eqtl_data/GTEx_Analysis_v7_eQTL_expression_matrices.tar.gz"  
+      content_url = "https://storage.googleapis.com/gtex_analysis_v7/single_tissue_eqtl_data/GTEx_Analysis_v7_eQTL_expression_matrices.tar.gz"
       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")
@@ -281,8 +281,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["name"]).to eq("Meteo measurements at the Sand Motor")
       expect(json["author"]).to eq("@type"=>"Person", "familyName"=>"Den Heijer", "givenName"=>"C", "name"=>"C Den Heijer")
       expect(json["includedInDataCatalog"]).to be_nil
-      expect(json["spatialCoverage"].dig("geo", "polygon").length).to eq(34)
-      expect(json["spatialCoverage"].dig("geo", "polygon").first).to eq(["4.1738852605822", "52.03913926329928"])
+      expect(json["spatialCoverage"].dig("geo", "polygon")[0].length).to eq(34)
+      expect(json["spatialCoverage"].dig("geo", "polygon")[0].first).to eq(["4.1738852605822", "52.03913926329928"])
     end
 
     it "from schema_org gtex" do