commonmeta-ruby 3.4.2 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e7e0078d9ee8268350debef90ecae5249f626498dc89630a1671a2edd16e4fc
-  data.tar.gz: a9265add9afeb7a302503da01875574d0ff999e2f93928ed324fabd5e0faaacc
+  metadata.gz: c5c580fb509592f279c823dff8e3706420d08af27e2fbf34eae997ab27138b35
+  data.tar.gz: 44ac2df8b90492d35c45d125f4b9d4c5800827a17acde4c50453af49e5b04160
 SHA512:
-  metadata.gz: c248850455ab14549458e9fbaa46309d03a0cfdd9836ecdaf2681eba606c5036480a66c4458c3b5fd140632fd1e8b4b7b1bcce79bfbf997cb694ba8dc974d66a
-  data.tar.gz: 5ae480537efd8c91dbeb013ff071189b340bc13e6a34b784c1a1d9af699dd2b0a123029758c1018ac40d921bd0444829d7b40938d89acf85ebd189228cb9226b
+  metadata.gz: ece0ebc5a0e2028704029c9eb97318721d532b2f9eb580c9dbf5419784e10a34176925517790c0bd6819e7f9d5dfd807f8f97afb9ec5722f4255c0c4065724e1
+  data.tar.gz: a12d1a02e8ce66d1f3c6ed4ca7672b9dbf54413f1e3c336fed6a7fa6f3f53a73e2bdf937f8d4d32faf2c4e40fd41357b043813adde42c5387bb528d1fb6c86fa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    commonmeta-ruby (3.4.2)
+    commonmeta-ruby (3.4.4)
       activesupport (>= 4.2.5, < 8.0)
       addressable (~> 2.8.1, < 2.8.2)
       base32-url (>= 0.7.0, < 1)

data/lib/commonmeta/crossref_utils.rb

@@ -62,6 +62,7 @@ module Commonmeta
           insert_crossref_abstract(xml)
           insert_crossref_issn(xml)
           insert_item_number(xml)
+          insert_funding_references(xml)
           insert_crossref_access_indicators(xml)
           insert_crossref_relations(xml)
           insert_doi_data(xml)
@@ -81,6 +82,7 @@ module Commonmeta
         insert_institution(xml)
         insert_item_number(xml)
         insert_crossref_abstract(xml)
+        insert_funding_references(xml)
         insert_crossref_access_indicators(xml)
         insert_crossref_relations(xml)
         insert_doi_data(xml)
@@ -99,7 +101,7 @@ module Commonmeta
         Array.wrap(creators).each_with_index do |creator, index|
           if creator["type"] == "Organization" && creator["name"].present?
             xml.organization(creator["name"], "contributor_role" => "author",
-                             "sequence" => index.zero? ? "first" : "additional")
+                                              "sequence" => index.zero? ? "first" : "additional")
           elsif creator["givenName"].present? || creator["familyName"].present?
             xml.person_name("contributor_role" => "author",
                             "sequence" => index.zero? ? "first" : "additional") do
@@ -128,7 +130,7 @@ module Commonmeta
         xml.affiliations do
           xml.institution do
             xml.institution_name(creator.dig("affiliation", 0, "name")) if creator.dig("affiliation", 0, "name").present?
-            xml.institution_id(creator.dig("affiliation", 0, "id"), 'type' => "ror") if creator.dig("affiliation", 0, "id").present?
+            xml.institution_id(creator.dig("affiliation", 0, "id"), "type" => "ror") if creator.dig("affiliation", 0, "id").present?
           end
         end
       end
@@ -138,7 +140,7 @@ module Commonmeta
       xml.affiliations do
         xml.institution do
           xml.institution_name(creator.dig("affiliation", 0, "name")) if creator.dig("affiliation", 0, "name").present?
-          xml.institution_id(creator.dig("affiliation", 0, "id"), 'type' => "ror") if creator.dig("affiliation", 0, "id").present?
+          xml.institution_id(creator.dig("affiliation", 0, "id"), "type" => "ror") if creator.dig("affiliation", 0, "id").present?
         end
       end
     end
@@ -209,7 +211,7 @@ module Commonmeta
             identifier_type = validate_doi(related_identifier["id"]) ? "doi" : "uri"
             id = identifier_type == "doi" ? doi_from_url(related_identifier["id"]) : related_identifier["id"]
             attributes = {
-              "relation-type" => related_identifier["type"].camelize(:lower),
+              "relationship-type" => related_identifier["type"].camelize(:lower),
               "identifier-type" => identifier_type,
             }.compact
 
@@ -218,7 +220,7 @@ module Commonmeta
         end
       end
     end
-  
+
     # def insert_dates(xml)
     #   return xml unless Array.wrap(dates).present?
 
@@ -230,20 +232,21 @@ module Commonmeta
     #   end
     # end
 
-    # def insert_funding_references(xml)
-    #   return xml unless Array.wrap(funding_references).present?
-
-    #   xml.fundingReferences do
-    #     Array.wrap(funding_references).each do |funding_reference|
-    #       xml.fundingReference do
-    #         xml.funderName(funding_reference["funderName"])
-    #         xml.funderIdentifier(funding_reference["funderIdentifier"], { "funderIdentifierType" => funding_reference["funderIdentifierType"] }.compact) if funding_reference["funderIdentifier"].present?
-    #         xml.awardNumber(funding_reference["awardNumber"], { "awardURI" => funding_reference["awardUri"] }.compact) if funding_reference["awardNumber"].present? || funding_reference["awardUri"].present?
-    #         xml.awardTitle(funding_reference["awardTitle"]) if funding_reference["awardTitle"].present?
-    #       end
-    #     end
-    #   end
-    # end
+    def insert_funding_references(xml)
+      return xml if funding_references.blank?
+
+      xml.program("xmlns" => "http://www.crossref.org/fundref.xsd",
+                  "name" => "fundref") do
+        funding_references.each do |funding_reference|
+          xml.assertion("name" => "fundgroup") do
+            xml.assertion(funding_reference["funderName"], "name" => "funder_name") do
+              xml.assertion(funding_reference["funderIdentifier"], "name" => "funder_identifier")
+            end
+            xml.assertion(funding_reference["awardNumber"], "name" => "award_number")
+          end
+        end
+      end
+    end
 
     def insert_crossref_subjects(xml)
       return xml unless subjects.present?

data/lib/commonmeta/readers/json_feed_reader.rb

@@ -62,6 +62,7 @@ module Commonmeta
           sum
         end
         references = get_references(meta)
+        funding_references = get_funding_references(meta)
         related_identifiers = get_related_identifiers(meta)
         alternate_identifiers = [{ "alternateIdentifier" => meta["id"], "alternateIdentifierType" => "UUID" }]
 
@@ -78,6 +79,7 @@ module Commonmeta
           "license" => license,
           "subjects" => subjects.presence,
           "references" => references.presence,
+          "funding_references" => funding_references.presence,
           "related_identifiers" => related_identifiers.presence,
           "alternate_identifiers" => alternate_identifiers,
           "state" => state }.compact.merge(read_options)
@@ -89,10 +91,10 @@ module Commonmeta
           begin
             if reference["doi"] && validate_doi(reference["doi"])
               response = HTTP.follow
-                        .headers(:accept => "application/vnd.citationstyles.csl+json")
-                        .get(reference["doi"])
+                .headers(:accept => "application/vnd.citationstyles.csl+json")
+                .get(reference["doi"])
               csl = JSON.parse(response.body.to_s)
-              sum << reference.merge("title" => csl['title'], "publicationYear" => csl.dig("issued", "date-parts", 0, 0).to_s) if [200, 301, 302].include? response.status
+              sum << reference.merge("title" => csl["title"], "publicationYear" => csl.dig("issued", "date-parts", 0, 0).to_s) if [200, 301, 302].include? response.status
             elsif reference["url"] && validate_url(reference["url"]) == "URL"
               sum << reference if [200, 301, 302].include? HTTP.head(reference["url"]).status
             end
@@ -106,10 +108,11 @@ module Commonmeta
       end
 
       def get_related_identifiers(meta)
-        # check that relationships resolve
+        # check that relationships resolve and has a supported type
+        supported_types = %w[IsIdenticalTo isPreprintOf isTranslationOf]
         Array.wrap(meta["relationships"]).reduce([]) do |sum, relationship|
           begin
-            if [200, 301, 302].include? HTTP.head(relationship["url"]).status
+            if supported_types.include?(relationship["type"]) && [200, 301, 302].include?(HTTP.head(relationship["url"]).status)
               sum << { "id" => relationship["url"], "type" => relationship["type"] }
             end
           rescue => error
@@ -121,6 +124,32 @@ module Commonmeta
         end
       end
 
+      def get_funding_references(meta)
+        # check that relationships resolve and have type "HasAward"
+        Array.wrap(meta["relationships"]).reduce([]) do |sum, relationship|
+          begin
+            # funder is European Commission
+            if validate_prefix(relationship["url"]) == "10.3030" || URI.parse(relationship["url"]).host == "cordis.europa.eu"
+              relationship["funderIdentifier"] = "http://doi.org/10.13039/501100000780"
+              relationship["funderName"] = "European Commission"
+              relationship["awardNumber"] = relationship["url"].split("/").last
+            end
+            if relationship["type"] == "HasAward" && relationship["funderName"]
+              sum << {
+                "funderIdentifier" => relationship["funderIdentifier"],
+                "funderName" => relationship["funderName"],
+                "awardNumber" => relationship["awardNumber"],
+              }
+            end
+          rescue => error
+            # puts "Error: #{error.message}"
+            # puts "Error: #{reference}"
+          end
+
+          sum
+        end
+      end
+
       def get_json_feed_unregistered
         # get JSON Feed items not registered as DOIs
 

data/lib/commonmeta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Commonmeta
-  VERSION = '3.4.2'
+  VERSION = '3.4.4'
 end