bolognese 2.2.0 → 2.3.2

data/spec/readers/schema_org_reader_spec.rb

@@ -340,5 +340,32 @@ describe Bolognese::Metadata, vcr: true do
         "funderIdentifierType"=>"Crossref Funder ID",
         "funderName"=>"European Commission"}])
     end
+
+    it "Schema 4.6 attributes" do
+      input = fixture_path + 'schema_org_4.6_attributes.json'
+      subject = Bolognese::Metadata.new(input: input)
+
+      expect(subject.related_identifiers).to eq(
+        [
+          {"relatedIdentifier"=>"10.1234/translated-version", "relatedIdentifierType"=>"DOI", "relationType"=>"HasTranslation"},
+          {"relatedIdentifier"=>"10.1234/other-version", "relatedIdentifierType"=>"DOI", "relationType"=>"IsTranslationOf"},
+        ]
+      )
+      expect(subject.dates).to eq(
+        [
+          {"date"=>"2023-01-01", "dateType"=>"Issued"},
+          {"date"=>"2023-01-01", "dateType"=>"Created"},
+          {"date"=>"2023-01-01", "dateType"=>"Updated"},
+          {"date"=>"2020-01-01", "dateType"=>"Coverage"}
+        ]
+      )
+      expect(subject.contributors).to eq(
+        [
+          {"name"=>"Doe, Jane", "givenName"=>"Jane", "familyName"=>"Doe", "nameType"=>"Personal", "affiliation"=>[{"name"=>"ExampleAffiliation", "affiliationIdentifier"=>"https://ror.org/04wxnsj81", "affiliationIdentifierScheme"=>"ROR"}], "nameIdentifiers"=>[{"nameIdentifier"=>"https://orcid.org/0000-0003-1419-2405", "schemeUri"=>"https://orcid.org", "nameIdentifierScheme"=>"ORCID"}]},
+          {"name"=>"Smith, John", "givenName"=>"John", "familyName"=>"Smith", "nameType"=>"Personal", "affiliation"=>[{"name"=>"ExampleAffiliation", "affiliationIdentifier"=>"https://ror.org/04wxnsj81", "affiliationIdentifierScheme"=>"ROR"}]},
+          {"name"=>"Ross, Cody", "givenName"=>"Cody", "familyName"=>"Ross", "nameType"=>"Personal", "affiliation"=>[{"name"=>"ExampleAffiliation", "affiliationIdentifier"=>"https://ror.org/04wxnsj81", "affiliationIdentifierScheme"=>"ROR"}], "nameIdentifiers"=>[{"nameIdentifier"=>"https://orcid.org/0000-0003-1419-2405", "schemeUri"=>"https://orcid.org", "nameIdentifierScheme"=>"ORCID"}], "contributorType"=>"Translator"},
+        ]
+      )
+    end
   end
 end

data/spec/writers/citeproc_writer_spec.rb

@@ -286,5 +286,14 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["DOI"]).to eq("10.34747/g6yb-3412")
       expect(json["issued"]).to eq("date-parts"=>[[2019]])
     end
+
+    it "from Schema 4.6 with Translator contributor" do
+      input = fixture_path + 'datacite-example-full-v4.6.xml'
+      subject = Bolognese::Metadata.new(input: input)
+      json = JSON.parse(subject.citeproc)
+      expect(json["translator"]).to eq([
+        {"family"=>"Doe", "given"=>"Jane"},
+      ])
+    end
   end
 end

data/spec/writers/datacite_writer_spec.rb

@@ -286,6 +286,77 @@ describe Bolognese::Metadata, vcr: true do
       )
     end
 
+    it "Schema 4.6" do
+      input = fixture_path + 'datacite-example-full-v4.6.xml'
+      doi = "10.82433/B09Z-4K37"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite", regenerate: true)
+      expect(subject.valid?).to be true
+
+      datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
+      expect(datacite.fetch("xsi:schemaLocation", "").split(" ").first).to eq("http://datacite.org/schema/kernel-4")
+      expect(datacite.dig("contributors", "contributor").count).to eq(2)
+      expect(datacite.dig("contributors", "contributor")).to include(
+        {
+          "contributorType"=>"Translator",
+          "contributorName"=>{
+            "nameType"=>"Personal",
+            "__content__"=>"Doe, Jane"
+          },
+          "givenName"=>"Jane",
+          "familyName"=>"Doe",
+          "nameIdentifier"=>{
+            "nameIdentifierScheme"=>"ORCID",
+            "schemeURI"=>"https://orcid.org",
+            "__content__"=>"https://orcid.org/0000-0003-1419-2405"
+          },
+          "affiliation"=>{
+            "affiliationIdentifier"=>"https://ror.org/04wxnsj81",
+            "affiliationIdentifierScheme"=>"ROR",
+            "schemeURI"=>"https://ror.org",
+            "__content__"=>"ExampleAffiliation"
+          }
+        }
+      )
+      expect(datacite.dig("dates", "date").count).to eq(5)
+      expect(datacite.dig("dates", "date")).to include(
+        {
+          "dateType"=>"Coverage",
+          "__content__"=>"2020-01-01"
+        }
+      )
+      expect(datacite.dig("resourceType")).to eq(
+        {
+          "__content__"=>"Research Project",
+          "resourceTypeGeneral"=>"Project"
+        }
+      )
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").count).to eq(4)
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier")).to eq(
+        [
+          {
+            "relatedIdentifierType"=>"RRID",
+            "relationType"=>"References",
+            "__content__"=>"RRID:AB_90755"
+          },
+          {
+            "relatedIdentifierType"=>"CSTR",
+            "relationType"=>"References",
+            "__content__"=>"CSTR:AB_12345"
+          },
+          {
+            "relatedIdentifierType"=>"DOI",
+            "relationType"=>"HasTranslation",
+            "__content__"=>"10.1234/translated-version"
+          },
+          {
+            "relatedIdentifierType"=>"DOI",
+            "relationType"=>"IsTranslationOf",
+            "__content__"=>"10.1234/other-version"
+          }
+        ]
+      )
+    end
+
     it "Geolocations" do
       input = fixture_path + 'datacite-example-full-v4.5.xml'
       doi = "10.82433/B09Z-4K37"

data/spec/writers/jats_writer_spec.rb

@@ -87,7 +87,7 @@ describe Bolognese::Metadata, vcr: true do
       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("person_group", "name")).to eq("surname"=>"Fenner", "given_names"=>"Martin")
+      expect(jats.dig("person_group", 0, "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("month")).to eq("12")
       expect(jats.dig("day")).to eq("20")

data/spec/writers/schema_org_writer_spec.rb

@@ -378,5 +378,41 @@ describe Bolognese::Metadata, vcr: true do
          }
       )
     end
+
+    it "from Schema 4.6 with Translator contributor, workTranslation, translationOfWork, and temporalCoverage" do
+      input = fixture_path + 'datacite-example-full-v4.6.xml'
+      subject = Bolognese::Metadata.new(input: input)
+      json = JSON.parse(subject.schema_org)
+
+      expect(json["@type"]).to eq(
+        "Project"
+      )
+      expect(json["translator"]).to eq(
+        {
+          "name" => "Jane Doe",
+          "givenName" => "Jane",
+          "familyName" => "Doe",
+          "affiliation" => {
+            "@type" => "Organization",
+            "@id" => "https://ror.org/04wxnsj81",
+            "name" => "ExampleAffiliation"
+          },
+          "contributorType" => "Translator",
+          "@type" => "Person",
+          "@id" => "https://orcid.org/0000-0003-1419-2405"
+        }
+      )
+      expect(json["workTranslation"]).to eq(
+        "@id" => "https://doi.org/10.1234/translated-version",
+        "@type" => "CreativeWork"
+      )
+      expect(json["translationOfWork"]).to eq(
+        "@id" => "https://doi.org/10.1234/other-version",
+        "@type" => "CreativeWork"
+      )
+      expect(json["temporalCoverage"]).to eq(
+        "2020-01-01"
+      )      
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -754,6 +754,18 @@ files:
 - resources/kernel-4.5/include/datacite-titleType-v4.xsd
 - resources/kernel-4.5/include/xml.xsd
 - resources/kernel-4.5/metadata.xsd
+- resources/kernel-4.6/include/datacite-contributorType-v4.xsd
+- resources/kernel-4.6/include/datacite-dateType-v4.xsd
+- resources/kernel-4.6/include/datacite-descriptionType-v4.xsd
+- resources/kernel-4.6/include/datacite-funderIdentifierType-v4.xsd
+- resources/kernel-4.6/include/datacite-nameType-v4.xsd
+- resources/kernel-4.6/include/datacite-numberType-v4.xsd
+- resources/kernel-4.6/include/datacite-relatedIdentifierType-v4.xsd
+- resources/kernel-4.6/include/datacite-relationType-v4.xsd
+- resources/kernel-4.6/include/datacite-resourceType-v4.xsd
+- resources/kernel-4.6/include/datacite-titleType-v4.xsd
+- resources/kernel-4.6/include/xml.xsd
+- resources/kernel-4.6/metadata.xsd
 - resources/kernel-4/include/datacite-contributorType-v4.xsd
 - resources/kernel-4/include/datacite-dateType-v4.xsd
 - resources/kernel-4/include/datacite-descriptionType-v4.xsd
@@ -790,6 +802,7 @@ files:
 - spec/fixtures/crossref.bib
 - spec/fixtures/crossref.ris
 - spec/fixtures/crossref.xml
+- spec/fixtures/crossref_schema_4.6_values.xml
 - spec/fixtures/datacite-empty-sizes.xml
 - spec/fixtures/datacite-example-ROR-nameIdentifiers.xml
 - spec/fixtures/datacite-example-affiliation.xml
@@ -802,6 +815,7 @@ files:
 - spec/fixtures/datacite-example-escaped-text.xml
 - spec/fixtures/datacite-example-full-v4.4.xml
 - spec/fixtures/datacite-example-full-v4.5.xml
+- spec/fixtures/datacite-example-full-v4.6.xml
 - spec/fixtures/datacite-example-geolocation-2.xml
 - spec/fixtures/datacite-example-geolocation.xml
 - spec/fixtures/datacite-example-nameIdentifier-with-schemeURI.xml
@@ -845,6 +859,7 @@ files:
 - spec/fixtures/ris_bug.ris
 - spec/fixtures/schema_4.0.xml
 - spec/fixtures/schema_org.json
+- spec/fixtures/schema_org_4.6_attributes.json
 - spec/fixtures/schema_org_geolocation.json
 - spec/fixtures/schema_org_geoshape.json
 - spec/fixtures/schema_org_gtex.json
@@ -1064,8 +1079,10 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/handle_input/DOI_RA_not_Crossref_or_DataCite.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/handle_input/unknown_DOI_prefix.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_contributors/none.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_contributors_Translator/supports_Translator_contributorType.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_dates_with_Coverage/inserts_date_with_dateType_Coverage.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_descriptions/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_identifier/doi.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_language/insert.yml
@@ -1074,8 +1091,13 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_publisher/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_related_identifiers/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_related_identifiers/related_identifier.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_related_identifiers_CSTR/supports_CSTR_relatedIdentifierType.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_related_identifiers_HasTranslation/supports_HasTranslation_relationType.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_related_identifiers_RRID/supports_RRID_relatedIdentifierType.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_related_items/insert.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_resource_type/insert.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_resource_type_with_Award/supports_Award_as_resourceTypeGeneral.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/insert_resource_type_with_Project/supports_Project_as_resourceTypeGeneral.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