bolognese 2.3.0 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1deafd2515ccde3db2712a353b9554540d10988f4f1d617e910e5aff22473bfe
-  data.tar.gz: 566fec5d398deae0a3709d002823e853586721109d728716256e33d8ceed8e62
+  metadata.gz: 1a86efd4d59883de399bfae917077f97c5f5e33bd698bc70fc4a3daa40736acc
+  data.tar.gz: da3ac310e177b6ad9733ff56cb9893cfe107c0beb930167b7b8f392dfb2332f4
 SHA512:
-  metadata.gz: fbcd1fe74bc9c6e106e0920c9638dd990a48c01c1f0ab159a58b100ace0c27a93d62680f5c382b74e8d7dd20ba22e2a02f7ab510408dd75ea7c1ac00352a2a15
-  data.tar.gz: 0f479622eb0ed17d3a3c8a8748171b146d3bb110f2f782eb3de61d38b8c8dd82ed8ff146ceeb32ceddad12ba471a9d195c8a19851381d000e1af87057b217c54
+  metadata.gz: ee269b568dd16e08da5c10f00155a3e0b55e9725c1d6aa114c6c3a5020dfe05c2df89388a9bc394a6274e86ca81567f4f756dd31bcaf5faa12dff2a7df275308
+  data.tar.gz: 26245d3b2e4553616ba0708047b542f4092240e4cc251ae578de502010ba69a3d6700a5df48f59cd427b7f0eaf498a15cc043cd78ad799572bd589dfcbad6784

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (2.3.0)
+    bolognese (2.3.3)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)

data/lib/bolognese/datacite_utils.rb

@@ -128,7 +128,7 @@ module Bolognese
     def insert_resource_type(xml)
       return xml unless types.is_a?(Hash) && (types["schemaOrg"].present? || types["resourceTypeGeneral"])
 
-      xml.resourceType(types["resourceType"] || types["schemaOrg"],
+      xml.resourceType(types["resourceType"],
         'resourceTypeGeneral' => types["resourceTypeGeneral"] || Metadata::SO_TO_DC_TRANSLATIONS[types["schemaOrg"]] || "Other")
     end
 

data/lib/bolognese/readers/crossref_reader.rb

@@ -373,8 +373,8 @@ module Bolognese
     
       def crossref_has_translation(program_metadata)
         refs = program_metadata.dig("related_item") if program_metadata.is_a?(Hash)
-        Array.wrap(refs).select { |a| a["intra_work_relation"]["relationship_type"] == "hasTranslation" }.map do |c|
-          if c["intra_work_relation"]["identifier_type"] == "doi"
+        Array.wrap(refs).select { |a| a.dig("intra_work_relation", "relationship_type") == "hasTranslation" }.map do |c|
+          if c.dig("intra_work_relation", "identifier_type") == "doi"
             { "relatedIdentifier" => parse_attributes(c["intra_work_relation"]).downcase,
               "relationType" => "HasTranslation",
               "relatedIdentifierType" => "DOI" }.compact
@@ -386,8 +386,8 @@ module Bolognese
 
       def crossref_is_translation_of(program_metadata)
         refs = program_metadata.dig("related_item") if program_metadata.is_a?(Hash)
-        Array.wrap(refs).select { |a| a["intra_work_relation"]["relationship_type"] == "isTranslationOf" }.map do |c|
-          if c["intra_work_relation"]["identifier_type"] == "doi"
+        Array.wrap(refs).select { |a| a.dig("intra_work_relation", "relationship_type") == "isTranslationOf" }.map do |c|
+          if c.dig("intra_work_relation", "identifier_type") == "doi"
             { "relatedIdentifier" => parse_attributes(c["intra_work_relation"]).downcase,
               "relationType" => "IsTranslationOf",
               "relatedIdentifierType" => "DOI" }.compact

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "2.3.0"
+  VERSION = "2.3.3"
 end

data/spec/datacite_utils_spec.rb

@@ -249,6 +249,48 @@ describe Bolognese::Metadata, vcr: true do
     end
   end
 
+  context "insert_resource_type when resourceType is available, but using schemaOrg (via SO_TO_DC_TRANSLATIONS) when resourceTypeGeneral is unavailable" do
+    it "supports schemaOrg value as resourceTypeGeneral" do
+      # Mock the `types` hash to include the necessary values
+      subject.instance_variable_set(:@types, {
+        "schemaOrg" => "BlogPosting",
+        "resourceType" => "This dataset contains all projects funded by the European Union under the fifth framework programme for research and technological development (FP5) from 1998 to 2002."
+      })
+
+      # Generate XML using the insert_resource_type method
+      xml = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') { |xml| subject.insert_resource_type(xml) }.to_xml
+
+      response = Maremma.from_xml(xml)
+
+      # Expect `Text` in resourceTypeGeneral (via SO_TP_DC_TRANSLATIONS) and `This dataset contains all projects funded...` as the content
+      expect(response["resourceType"]).to eq(
+        "resourceTypeGeneral" => "Text",
+        "__content__" => "This dataset contains all projects funded by the European Union under the fifth framework programme for research and technological development (FP5) from 1998 to 2002."
+      )
+    end
+  end
+
+  context "insert_resource_type when resourceType is available, 'OTHER' when schemaOrg has no valid translations, and 'resourceTypeGeneral is unavailable" do
+    it "supports Other as resourceTypeGeneral" do
+      # Mock the `types` hash to include the necessary values
+      subject.instance_variable_set(:@types, {
+        "schemaOrg" => "Invalid_SO_Value",
+        "resourceType" => "This dataset contains all projects funded by the European Union under the fifth framework programme for research and technological development (FP5) from 1998 to 2002."
+      })
+
+      # Generate XML using the insert_resource_type method
+      xml = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') { |xml| subject.insert_resource_type(xml) }.to_xml
+
+      response = Maremma.from_xml(xml)
+
+      # Expect `Text` in resourceTypeGeneral (via SO_TP_DC_TRANSLATIONS) and `This dataset contains all projects funded...` as the content
+      expect(response["resourceType"]).to eq(
+        "resourceTypeGeneral" => "Other",
+        "__content__" => "This dataset contains all projects funded by the European Union under the fifth framework programme for research and technological development (FP5) from 1998 to 2002."
+      )
+    end
+  end
+
   # Test case to insert Coverage DateType (new dateType in DataCite 4.6).
   context "insert_dates with Coverage" do
     it "inserts date with dateType Coverage" do

data/spec/fixtures/crossref.xml

@@ -64,16 +64,6 @@
                     <surname>Hardtke</surname>
                     <affiliation>Department of Plant Molecular Biology, University of Lausanne, Lausanne, Switzerland</affiliation>
                   </person_name>
-                  <person_name contributor_role="editor" sequence="additional">
-                    <given_name>Ashwini</given_name>
-                    <surname>Sukale</surname>
-                    <affiliation>DataCite</affiliation>
-                  </person_name>
-                  <person_name contributor_role="translator" sequence="additional">
-                    <given_name>Cody</given_name>
-                    <surname>Ross</surname>
-                    <affiliation>DataCite</affiliation>
-                  </person_name>
                 </contributors>
                 <jats:abstract xmlns:jats="http://www.ncbi.nlm.nih.gov/JATS1">
                   <jats:p>Among various advantages, their small size makes model organisms preferred subjects of investigation. Yet, even in model systems detailed analysis of numerous developmental processes at cellular level is severely hampered by their scale. For instance, secondary growth of Arabidopsis hypocotyls creates a radial pattern of highly specialized tissues that comprises several thousand cells starting from a few dozen. This dynamic process is difficult to follow because of its scale and because it can only be investigated invasively, precluding comprehensive understanding of the cell proliferation, differentiation, and patterning events involved. To overcome such limitation, we established an automated quantitative histology approach. We acquired hypocotyl cross-sections from tiled high-resolution images and extracted their information content using custom high-throughput image processing and segmentation. Coupled with automated cell type recognition through machine learning, we could establish a cellular resolution atlas that reveals vascular morphodynamics during secondary growth, for example equidistant phloem pole formation.</jats:p>
@@ -163,14 +153,6 @@
                     <rel:description>Data from: Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth</rel:description>
                     <rel:inter_work_relation identifier-type="doi" relationship-type="isSupplementedBy">10.5061/dryad.b835k</rel:inter_work_relation>
                   </rel:related_item>
-                  <rel:related_item>
-                    <rel:description>Portuguese translation of an article</rel:description>
-                    <rel:intra_work_relation relationship-type="isTranslationOf" identifier-type="doi">10.5555/original_language</rel:intra_work_relation>
-                  </rel:related_item>
-                  <rel:related_item>
-                    <rel:description>Spanish translation of an article</rel:description>
-                    <rel:intra_work_relation relationship-type="hasTranslation" identifier-type="doi">10.5555/other_language</rel:intra_work_relation>
-                  </rel:related_item>
                 </rel:program>
                 <archive_locations>
                   <archive name="CLOCKSS" />

data/spec/fixtures/crossref_schema_4.6_values.xml

@@ -62,8 +62,17 @@
                           <affiliation>Brown University</affiliation>
                           <ORCID authenticated="true">https://orcid.org/0000-0002-1825-0097</ORCID>
                       </person_name>
+                      <person_name contributor_role="editor" sequence="additional">
+                        <given_name>Ashwini</given_name>
+                        <surname>Sukale</surname>
+                        <affiliation>DataCite</affiliation>
+                      </person_name>
+                      <person_name contributor_role="translator" sequence="additional">
+                        <given_name>Cody</given_name>
+                        <surname>Ross</surname>
+                        <affiliation>DataCite</affiliation>
+                      </person_name>
                   </contributors>
-                  
                   <publication_date media_type="online">
                       <month>08</month>
                       <day>13</day>

data/spec/readers/crossref_reader_spec.rb

@@ -1100,7 +1100,7 @@ describe Bolognese::Metadata, vcr: true do
     end
 
     it "with Schema 4.6 Translator contributor" do
-      input = fixture_path + 'crossref.xml'
+      input = fixture_path + 'crossref_schema_4.6_values.xml'
       subject = Bolognese::Metadata.new(input: input)
 
       expect(subject.contributors).to eq([

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.3
 platform: ruby
 authors:
 - Martin Fenner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-14 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -1330,7 +1330,7 @@ homepage: https://github.com/datacite/bolognese
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1346,7 +1346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.26
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby client library for conversion of DOI Metadata
 test_files: []