bolognese 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc718876c65857d9b07af2752b4ce8ed8bda05b5e3f7dae983530a414262b9e6
-  data.tar.gz: 997f406aa28447acf4507aad0c2ffb0f4e4e42da4028dbe2210d027b438dea09
+  metadata.gz: b97f37a5ebcbedcb33b6937353b9afe721084c52591033d04657c8ef1e3fa4b7
+  data.tar.gz: 119f596d499c6465304b91eb2ea4733a6d83be967d564bf0bc895e69312133d0
 SHA512:
-  metadata.gz: e5692d0fa4a116b0c3f32ae2be26f916f282860a69daed4564fa7b8e91823d8648eddf958fc1fdd9c9c86ab2fcf81f108b334da57b8b9c6ce7fd79b94c009262
-  data.tar.gz: d1a74bd310e4ad4a7e8f34c218685cf3d76183d063feffab36c926e4d449e46a0792b2d279d4aeb6540ad74c441cabda0d242053eb96a01f5c6598112a1848e2
+  metadata.gz: 77194ea5ab5fac3555fad930a642081f4cb146dc804baed87b35be72f9c91cf88a72e44a1b2a8ab760f15ce5d49843dd65f2c41b24aa3ce840a940093705d715
+  data.tar.gz: 504322b19079059e7946043c087408237e48e1266f76cc4cb9bbfaf980d47d0f628dda1e1b35d20d79a27b07e18fb220b5a22234ee572b82020a31d98f52c196

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (2.0.3)
+    bolognese (2.1.0)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -235,4 +235,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   2.4.20
+   2.4.22

data/lib/bolognese/readers/schema_org_reader.rb

@@ -74,8 +74,11 @@ module Bolognese
           creators = get_authors(from_schema_org_creators(Array.wrap(authors)))
         end
         contributors = get_authors(from_schema_org_contributors(Array.wrap(meta.fetch("editor", nil))))
-        publisher_name = parse_attributes(meta.fetch("publisher", nil), content: "name", first: true)
-        publisher = { "name" => publisher_name } if publisher_name.present?
+
+        publisher = {
+          "name" => parse_attributes(meta.fetch("publisher", nil), content: "name", first: true),
+          "publisherIdentifier" => parse_attributes(meta.fetch("publisher", nil), content: "@id", first: true),
+        }.compact if meta.fetch("publisher", nil).present?
 
         ct = (schema_org == "Dataset") ? "includedInDataCatalog" : "Periodical"
         container = if meta.fetch(ct, nil).present?

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "2.0.3"
+  VERSION = "2.1.0"
 end

data/lib/bolognese/writers/jats_writer.rb

@@ -86,7 +86,10 @@ module Bolognese
       end
 
       def insert_publisher_name(xml)
-        xml.send("publisher-name", publisher["name"])
+        attributes = {
+          "xml:lang" => publisher["lang"]
+        }.compact
+        xml.send("publisher-name", attributes, publisher["name"])
       end
 
       def insert_publication_date(xml)

data/lib/bolognese/writers/schema_org_writer.rb

@@ -37,7 +37,7 @@ module Bolognese
           "schemaVersion" => schema_version,
           "periodical" => types.present? ? ((types["schemaOrg"] != "Dataset") && container.present? ? to_schema_org(container) : nil) : nil,
           "includedInDataCatalog" => types.present? ? ((types["schemaOrg"] == "Dataset") && container.present? ? to_schema_org_container(container, type: "Dataset") : nil) : nil,
-          "publisher" => publisher.present? ? { "@type" => "Organization", "name" => publisher["name"] } : nil,
+          "publisher" => publisher.present? ? { "@type" => "Organization", "@id" => publisher["publisherIdentifier"], "name" => publisher["name"] }.compact : nil,
           "funder" => to_schema_org_funder(funding_references),
           "provider" => agency.present? ? { "@type" => "Organization", "name" => agency } : nil
         }.compact.presence

data/spec/fixtures/datacite-xml-lang.xml

@@ -15,7 +15,7 @@
         <title xml:lang="en">DOI Test 2 title content</title>
         <title xml:lang="en">AAPP</title>
     </titles>
-    <publisher>OSI SAF</publisher>
+    <publisher xml:lang="en">OSI SAF</publisher>
     <publicationYear>2004</publicationYear>
     <resourceType resourceTypeGeneral="Collection">Climate Data Record</resourceType>
     <dates>

data/spec/fixtures/schema_org.json

@@ -14,6 +14,7 @@
     }],
     "publisher": {
         "@type": "Organization",
+        "@id": "https://ror.org/04wxnsj81",
         "name": "DataCite"
     },
     "dateCreated": "2016-12-20",

data/spec/readers/schema_org_reader_spec.rb

@@ -169,7 +169,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2016")
       expect(subject.related_identifiers.length).to eq(3)
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5438/55e5-t5c0", "relatedIdentifierType"=>"DOI", "relationType"=>"References")
-      expect(subject.publisher).to eq({"name"=>"DataCite"})
+      expect(subject.publisher).to eq({"name"=>"DataCite", "publisherIdentifier"=>"https://ror.org/04wxnsj81"})
     end
 
     it "GTEx dataset" do

data/spec/writers/jats_writer_spec.rb

@@ -179,6 +179,13 @@ describe Bolognese::Metadata, vcr: true do
       expect(jats.dig("day")).to be_nil
       expect(jats.dig("pub_id")).to eq("pub_id_type"=>"doi", "__content__"=>"10.34747/g6yb-3412")
     end
+
+    it "with publisher with language" do
+      input = fixture_path + 'datacite-xml-lang.xml'
+      subject = Bolognese::Metadata.new(input: input)
+      jats = Maremma.from_xml(subject.jats).fetch("element_citation", {})
+      expect(jats.dig("publisher_name")).to eq({"xml:lang"=>"en", "__content__"=>"OSI SAF"})
+    end
   end
 
   context "change metadata as datacite xml" do

data/spec/writers/schema_org_writer_spec.rb

@@ -365,5 +365,18 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["@type"]).to eq("CreativeWork")
       expect(json["datePublished"]).to eq("2019")
     end
+
+    it "from Schema 4.5 with publisher attributes" do
+      input = fixture_path + 'datacite-example-full-v4.5.xml'
+      subject = Bolognese::Metadata.new(input: input)
+      json = JSON.parse(subject.schema_org)
+      expect(json["publisher"]).to eq(
+         {
+          "@type" => "Organization",
+          "@id" => "https://ror.org/04z8jg394",
+          "name" => "Example Publisher"
+         }
+      )
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma