commonmeta-ruby 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93e083aa2d14384d27bb74272e5a6113c448dfa9780a9f6154880fadae4bb5c0
-  data.tar.gz: c2fd02493d91d2f3de12d3f2958516bba9078abbe939a9bf039def5512d3225a
+  metadata.gz: 8045d5f8042da41baf35bc82800bc689db433c16fc6f3607c980aac18d409022
+  data.tar.gz: 578ae0ae2c0a8addf955e859d821312c1ca0951e8d9e4b542a6cf55c53055e8e
 SHA512:
-  metadata.gz: b4d771f0376e5c51392e12db3e75bc3a4ab52e6e904e6cda9257c252517e49e41619b3b756480c262f0755e503e0307e72dd0d98bc66f3eecc779e6c939211db
-  data.tar.gz: 42342eb59b5dd49f214e33ae689f7249d45e6f60d7c65b3fb920b56b96ee870e86600fc0673533e92a534dc9c6c0d623f2449ff24c2a3befb4516c5e13973320
+  metadata.gz: e39aba0b9e648e4b3880f5883955fe3af49710062e259ccc278a4e170f964a16271a9cf22cbbaa9fdcbb39183aafee71c4aa88284f93667288d619029ae49fcb
+  data.tar.gz: b3399a055354e06a990089880c228113cf6db476d4717954ffc053ed42fdbc16669a97327d420b2ecf6b014e79c7191aef0082de75b649170c76a30df58bb490

data/Gemfile.lock

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

data/lib/commonmeta/readers/json_feed_reader.rb

@@ -129,8 +129,19 @@ module Commonmeta
       end
 
       def get_funding_references(meta)
-        # check that relationships resolve and have type "HasAward"
-        Array.wrap(meta["relationships"]).reduce([]) do |sum, relationship|
+        # check that relationships resolve and have type "HasAward" or funding is provided by blog metadata
+        if funding = meta.dig("blog", "funding")
+          fundref = { 
+            "funderIdentifier" => funding["funder_id"],
+            "funderIdentifierType" => "Crossref Funder ID",
+            "funderName" => funding["funder_name"], 
+            "awardNumber" => funding["award_number"]
+          }
+
+        else
+          fundref = nil
+        end
+        Array.wrap(fundref) + 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"

data/lib/commonmeta/version.rb

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

data/spec/readers/json_feed_reader_spec.rb

@@ -95,7 +95,7 @@ describe Commonmeta::Metadata, vcr: true do
       expect(subject.date).to eq("published" => "2013-06-25", "updated" => "2023-09-07")
       expect(subject.descriptions.first["description"]).to start_with("This paper in markdown format was written by Ethan White et al.")
       expect(subject.publisher).to eq("name" => "Front Matter")
-      expect(subject.related_identifiers).to eq([{"id"=>"https://doi.org/10.4033/iee.2013.6b.6.f", "type"=>"IsPreprintOf"}])
+      expect(subject.related_identifiers).to eq([{ "id" => "https://doi.org/10.4033/iee.2013.6b.6.f", "type" => "IsPreprintOf" }])
       expect(subject.subjects).to eq([{ "subject" => "Computer and information sciences" },
                                       { "schemeUri" => "http://www.oecd.org/science/inno/38235147.pdf",
                                         "subject" => "FOS: Computer and information sciences",
@@ -120,7 +120,7 @@ describe Commonmeta::Metadata, vcr: true do
       expect(subject.date).to eq("published" => "2019-07-01", "updated" => "2023-09-07")
       expect(subject.descriptions.first["description"]).to start_with("The connections between scholarly resources generated by persistent identifiers (PIDs)")
       expect(subject.publisher).to eq("name" => "Front Matter")
-      expect(subject.funding_references).to eq([{ "awardNumber" => "777523", "funderIdentifier"=>"http://doi.org/10.13039/501100000780", "funderName" => "European Commission" }])
+      expect(subject.funding_references).to eq([{ "awardNumber" => "777523", "funderIdentifier" => "http://doi.org/10.13039/501100000780", "funderName" => "European Commission" }])
       expect(subject.related_identifiers).to eq([{ "id" => "https://doi.org/10.5438/bv9z-dc66", "type" => "IsIdenticalTo" }])
       expect(subject.subjects).to eq([{ "subject" => "Computer and information sciences" },
                                       { "schemeUri" => "http://www.oecd.org/science/inno/38235147.pdf",
@@ -140,7 +140,7 @@ describe Commonmeta::Metadata, vcr: true do
       expect(subject.type).to eq("Article")
       expect(subject.contributors.length).to eq(1)
       expect(subject.contributors.first).to eq("familyName" => "Sathe", "givenName" => "Tejas S.",
-                                           "id" => "https://orcid.org/0000-0003-0449-4469", "type" => "Person", "contributorRoles" => ["Author"])
+                                               "id" => "https://orcid.org/0000-0003-0449-4469", "type" => "Person", "contributorRoles" => ["Author"])
       expect(subject.titles).to eq([{ "title" => "The Residency Visual Abstract" }])
       expect(subject.license).to eq("id" => "CC-BY-4.0",
                                     "url" => "https://creativecommons.org/licenses/by/4.0/legalcode")
@@ -165,7 +165,7 @@ describe Commonmeta::Metadata, vcr: true do
       expect(subject.type).to eq("Article")
       expect(subject.contributors.length).to eq(1)
       expect(subject.contributors.first).to eq("familyName" => "Sathe", "givenName" => "Tejas S.", "type" => "Person", "contributorRoles" => ["Author"],
-                                           "id" => "https://orcid.org/0000-0003-0449-4469")
+                                               "id" => "https://orcid.org/0000-0003-0449-4469")
       expect(subject.titles).to eq([{ "title" => "How to Build an Academic Powerhouse: Let's Study Who's Doing it" }])
       expect(subject.license).to eq("id" => "CC-BY-4.0",
                                     "url" => "https://creativecommons.org/licenses/by/4.0/legalcode")
@@ -238,10 +238,10 @@ describe Commonmeta::Metadata, vcr: true do
       expect(subject.type).to eq("Article")
       expect(subject.contributors.length).to eq(1)
       expect(subject.contributors.first).to eq("contributorRoles" => ["Author"],
-        "type" => "Person",
-        "familyName" => "Stocker",
-        "givenName" => "Markus",
-        "id" => "https://orcid.org/0000-0001-5492-3212")
+           "type" => "Person",
+           "familyName" => "Stocker",
+           "givenName" => "Markus",
+           "id" => "https://orcid.org/0000-0001-5492-3212")
       expect(subject.titles).to eq([{ "title" => "ORCID Integration Series: PANGAEA" }])
       expect(subject.license).to eq("id" => "CC-BY-4.0",
                                     "url" => "https://creativecommons.org/licenses/by/4.0/legalcode")
@@ -253,6 +253,7 @@ describe Commonmeta::Metadata, vcr: true do
                                         "subject" => "FOS: Computer and information sciences",
                                         "subjectScheme" => "Fields of Science and Technology (FOS)" }])
       expect(subject.language).to eq("en")
+      expect(subject.funding_references).to eq([{ "awardNumber" => "654039", "funderIdentifier" => "https://doi.org/10.13039/501100007601", "funderIdentifierType"=>"Crossref Funder ID", "funderName" => "European Union’s Horizon 2020 research and innovation programme" }])
       expect(subject.container).to eq("identifier" => "https://project-thor.eu", "identifierType" => "URL", "title" => "Project THOR", "type" => "Periodical")
     end
 
@@ -364,7 +365,7 @@ describe Commonmeta::Metadata, vcr: true do
       expect(subject.type).to eq("Article")
       expect(subject.contributors.length).to eq(1)
       expect(subject.contributors.first).to eq("familyName" => "Karcher", "givenName" => "Sebastian",
-                                           "id" => "https://orcid.org/0000-0001-8249-7388", "type" => "Person", "contributorRoles" => ["Author"])
+                                               "id" => "https://orcid.org/0000-0001-8249-7388", "type" => "Person", "contributorRoles" => ["Author"])
       expect(subject.titles).to eq([{ "title" => "Seeking Public Comment on CSL 1.0.2 Release" }])
       expect(subject.license).to eq("id" => "CC-BY-4.0",
                                     "url" => "https://creativecommons.org/licenses/by/4.0/legalcode")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commonmeta-ruby
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Martin Fenner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport