bolognese 1.5.17 → 1.6.3

data/spec/readers/schema_org_reader_spec.rb

@@ -78,6 +78,18 @@ describe Bolognese::Metadata, vcr: true do
         "nameType" => "Personal", "givenName"=>"Matthias", "familyName"=>"Staib", "affiliation" => [{"name"=>"University of Zurich, Zurich, Switzerland"}])
       expect(subject.publisher).to be_nil
       expect(subject.publication_year).to eq("2018")
+      expect(subject.subjects).to eq([{"subject"=>"Pupil Size Response"},
+        {"subject"=>"Skin Conductance Response"},
+        {"subject"=>"Electrocardiogram"},
+        {"subject"=>"Electromyogram"},
+        {"subject"=>"Electrodermal Activity"},
+        {"subject"=>"Galvanic Skin Response"},
+        {"subject"=>"PSR"},
+        {"subject"=>"SCR"},
+        {"subject"=>"ECG"},
+        {"subject"=>"EMG"},
+        {"subject"=>"EDA"},
+        {"subject"=>"GSR"}])
     end
 
     it "pangaea" do
@@ -119,6 +131,9 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.titles).to eq([{"title"=>"Summary data ankylosing spondylitis GWAS"}])
       expect(subject.container).to eq("identifier"=>"https://dataverse.harvard.edu", "identifierType"=>"URL", "title"=>"Harvard Dataverse", "type"=>"DataRepository")
       expect(subject.creators).to eq([{"name" => "International Genetics Of Ankylosing Spondylitis Consortium (IGAS)", "nameIdentifiers"=>[], "affiliation" => []}])
+      expect(subject.subjects).to eq([{"subject"=>"Medicine, Health and Life Sciences"},
+        {"subject"=>"Genome-Wide Association Studies"},
+        {"subject"=>"Ankylosing spondylitis"}])
     end
 
     it "harvard dataverse via identifiers.org" do
@@ -285,7 +300,6 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.23698/aida/drov")
     end
 
-
     it "from attributes" do
       subject = Bolognese::Metadata.new(input: nil,
         from: "schema_org",

data/spec/utils_spec.rb

@@ -481,4 +481,54 @@ describe Bolognese::Metadata, vcr: true do
       expect(response).to eq("https://raw.githubusercontent.com/datacite/metadata-reports/master/software/codemeta.json")
     end
   end
+
+  context "fos" do
+    it "name_to_fos match" do
+      name = "Biological sciences"
+      response = subject.name_to_fos(name)
+      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)"}])
+    end
+
+    it "name_to_fos for match" do
+      name = "Statistics"
+      response = subject.name_to_fos(name)
+      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)"}])
+    end
+
+    it "name_to_fos no match" do
+      name = "Random tag"
+      response = subject.name_to_fos(name)
+      expect(response).to eq([{"subject"=>"Random tag"}])
+    end
+
+    it "hsh_to_fos match" do
+      hsh = { "__content__" => "Biological sciences" }
+      response = subject.hsh_to_fos(hsh)
+      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)"}])
+    end
+
+    it "hsh_to_fos for match" do
+      hsh = { "__content__" => "Statistics" }
+      response = subject.hsh_to_fos(hsh)
+      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)"}])
+    end
+
+    it "hsh_to_fos no match" do
+      hsh = { "__content__"=>"Random tag" }
+      response = subject.hsh_to_fos(hsh)
+      expect(response).to eq([{"subject"=>"Random tag"}])
+    end
+  end
 end

data/spec/writers/citeproc_writer_spec.rb

@@ -94,6 +94,24 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["title"]).to eq("Scimag catalogue of LibGen as of January 1st, 2014")
     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["DOI"]).to eq("10.5281/zenodo.2598836")
+      expect(json["version"]).to eq("1.0.0")
+    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["DOI"]).to eq("10.5281/ZENODO.2598836")
+      expect(json["version"]).to eq("1.0.0")
+    end
+
     it "multiple abstracts" do
       input = "https://doi.org/10.12763/ona1045"
       subject = Bolognese::Metadata.new(input: input, from: "datacite")

data/spec/writers/datacite_writer_spec.rb

@@ -164,6 +164,10 @@ describe Bolognese::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"},
+       {"schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf",
+        "subject"=>"FOS: Computer and information sciences",
+        "subjectScheme"=>"Fields of Science and Technology (FOS)"}])
       expect(subject.agency).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
       expect(subject.datacite).to end_with("</resource>")
@@ -182,6 +186,10 @@ describe Bolognese::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"},
+       {"schemeUri"=>"http://www.oecd.org/science/inno/38235147.pdf",
+        "subject"=>"FOS: Computer and information sciences",
+        "subjectScheme"=>"Fields of Science and Technology (FOS)"}])
       expect(subject.agency).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
       expect(subject.datacite).to end_with("</resource>")

data/spec/writers/schema_org_writer_spec.rb

@@ -50,6 +50,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["@id"]).to eq("https://doi.org/10.5061/dryad.8515")
       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["keywords"]).to eq("Phylogeny, Malaria, Parasites, Taxonomy, Mitochondrial genome, Africa, Plasmodium")
     end
 
     it "Schema.org JSON IsSupplementTo" do
@@ -81,6 +82,7 @@ describe Bolognese::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")
     end
 
     it "Funding" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.5.17
+  version: 1.6.3
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -722,6 +722,8 @@ files:
 - resources/kernel-4/include/datacite-titleType-v4.xsd
 - resources/kernel-4/include/xml.xsd
 - resources/kernel-4/metadata.xsd
+- resources/oecd/for-mappings.json
+- resources/oecd/fos-mappings.json
 - resources/schema_org/jsonldcontext.json
 - resources/xml.xsd
 - spec/array_spec.rb
@@ -772,6 +774,7 @@ files:
 - spec/fixtures/datacite_software.json
 - spec/fixtures/datacite_software_missing_comma.json
 - spec/fixtures/datacite_software_overlapping_keys.json
+- spec/fixtures/datacite_software_version.json
 - spec/fixtures/edam_package.json
 - spec/fixtures/funding_reference.xml
 - spec/fixtures/gtex.xml
@@ -873,6 +876,12 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/find_from_format_from_file/ris.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/find_from_format_from_file/schema_org.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/find_from_format_from_string/crosscite.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/fos/hsh_to_fos_for_match.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/fos/hsh_to_fos_match.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/fos/hsh_to_fos_no_match.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/fos/name_to_fos_for_match.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/fos/name_to_fos_match.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/fos/name_to_fos_no_match.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/from_schema_org/with_id.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/from_schema_org_creators/with_affiliation.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/from_schema_org_creators/without_affiliation.yml
@@ -934,15 +943,18 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/dissertation.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/doi_with_sign.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/empty_subject.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/even_more_subject_scheme_FOR.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/funding_references.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/funding_schema_version_3.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/is_identical_to.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/keywords_with_attributes.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/leading_and_trailing_whitespace.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/more_subject_scheme_FOR.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/multiple_author_names_in_one_creatorsName.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/multiple_licenses.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/series-information.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/subject_scheme.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/subject_scheme_FOR.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/xs_string_attributes.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_date/publication_date.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_date_from_date_parts/date.yml
@@ -993,9 +1005,12 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_alternate_identifiers/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_contributors/none.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_creators/insert.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_dates/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_descriptions/insert.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_formats/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_identifier/doi.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_language/insert.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_person/creator_given_and_family_name.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_person/creator_only_name.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_publication_year/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_publisher/insert.yml
@@ -1003,6 +1018,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_related_identifiers/related_identifier.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_resource_type/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_rights_list/insert.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_sizes/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_subjects/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_titles/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_version/insert.yml
@@ -1103,6 +1119,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/multiple_abstracts.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/organization_author.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/software.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/software_w/version.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/with_first_page.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/with_only_first_page.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/with_pages.yml