bolognese 0.9.18 → 0.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1463edb9e56dc1c3519c19a325f248d9e8d134d0
-  data.tar.gz: 44484bf41d55c1539b38f39bf6111bacead7e447
+  metadata.gz: 8e774c4a8a3e9c8e2d6632ed0e6356bb9c54d611
+  data.tar.gz: 8230a49968ca28458cc71a55f57d90864db48b17
 SHA512:
-  metadata.gz: a981e4ba58d96e9e2e67ae7ce15fd18a951ba3364d06723271d55634e2ccbda9a31bb882c96a9ad1f6ba4489b2537de8f7610f8d2c3dfaa48d7624c98d9fc537
-  data.tar.gz: fbb30ce05de64f05402a8e62b4a8d5617e26f0b7331a53ad3cd1a848fc46293b46d0c2bb35ac072f70fd5196ac1d3b5ccbd45e3a7bf216a78448ec5ad1add403
+  metadata.gz: 55998c995185346c175798ee00517892aa0ac0bf5ed0059d751b38210421e501fd3b3dc7b51a20e2c43ae5803c04ff806e33b48acab134bc0966b28604937231
+  data.tar.gz: af2db0282a846b976d26f9c18e7e1e5561d28fcaa2949b0c43751c3ec3818058797fa34403de5411d24bfe93eead5d3d72bbb321bf45659e937b8a0f889be33a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.9.18)
+    bolognese (0.9.19)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)

data/lib/bolognese/readers/datacite_reader.rb

@@ -118,6 +118,28 @@ module Bolognese
         end.uniq
       end
 
+      def datacite_funder_contributor(meta)
+        Array.wrap(meta.dig("contributors", "contributor")).reduce([]) do |sum, f|
+          if f["contributorType"] == "Funder"
+            # handle special case of OpenAIRE metadata
+            id = f.dig("nameIdentifier", "__content__").to_s.start_with?("info:eu-repo/grantAgreement/EC") ? "https://doi.org/10.13039/501100000780" : nil
+
+            funder = { "type" => "Organization",
+                       "id" => id,
+                       "name" => f["contributorName"] }.compact
+            if f.dig("nameIdentifier", "nameIdentifierScheme") == "info"
+              sum << { "type" => "Award",
+                       "identifier" => f.dig("nameIdentifier", "__content__").split("/").last,
+                       "funder" => funder }
+            else
+              sum << funder
+            end
+          else
+            sum
+          end
+        end
+      end
+
       def datacite_related_identifier(meta, relation_type: nil)
         arr = Array.wrap(meta.dig("relatedIdentifiers", "relatedIdentifier")).select { |r| %w(DOI URL).include?(r["relatedIdentifierType"]) }
         arr = arr.select { |r| relation_type.split(" ").include?(r["relationType"]) } if relation_type.present?
@@ -176,24 +198,6 @@ module Bolognese
       def datacite_is_reviewed_by(meta)
         datacite_related_identifier(meta, relation_type: "IsReviewedBy").presence
       end
-
-      def datacite_funder_contributor(meta)
-        Array.wrap(meta.dig("contributors", "contributor")).reduce([]) do |sum, f|
-          if f["contributorType"] == "Funder"
-            funder = { "type" => "Organization",
-                       "name" => f["contributorName"] }.compact
-            if f.dig("nameIdentifier", "nameIdentifierScheme") == "info"
-              sum << { "type" => "Award",
-                       "identifier" => f.dig("nameIdentifier", "__content__").split("/").last,
-                       "funder" => funder }
-            else
-              sum << funder
-            end
-          else
-            sum
-          end
-        end
-      end
     end
   end
 end

data/lib/bolognese/utils.rb

@@ -383,19 +383,28 @@ module Bolognese
     end
 
     def to_schema_org(element)
-      Array.wrap(element).map do |a|
-        a["@type"] = a["type"]
-        a["@id"] = a["id"]
-        a["name"] = a["title"] if a["title"].present?
-        a.except("type", "id", "title").compact
-      end.unwrap
+      mapping = { "type" => "@type", "id" => "@id", "title" => "name" }
+
+      map_hash_keys(element: element, mapping: mapping)
     end
 
     def from_schema_org(element)
+      mapping = { "@type" => "type", "@id" => "id" }
+
+      map_hash_keys(element: element, mapping: mapping)
+    end
+
+    def map_hash_keys(element: nil, mapping: nil)
       Array.wrap(element).map do |a|
-        a["type"] = a["@type"]
-        a["id"] = a["@id"]
-        a.except("@type", "@id").compact
+        a.map {|k, v| [mapping.fetch(k, k), v] }.reduce({}) do |hsh, (k, v)|
+          if v.is_a?(Hash)
+            hsh[k] = to_schema_org(v)
+            hsh
+          else
+            hsh[k] = v
+            hsh
+          end
+        end
       end.unwrap
     end
 

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.18"
+  VERSION = "0.9.19"
 end

data/lib/bolognese/writers/crosscite_writer.rb

@@ -38,7 +38,7 @@ module Bolognese
           "issue" => issue,
           "pagination" => pagination,
           "spatial_coverage" => spatial_coverage,
-          "funding_reference" => funding,
+          "funding" => funding,
           "schema_version" => schema_version,
           "provider" => provider
         }.compact

data/spec/readers/datacite_reader_spec.rb

@@ -124,7 +124,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.description["text"]).to start_with("The dataset contains a sample of metadata describing papers")
       expect(subject.date_published).to eq("2013-04-03")
       expect(subject.publisher).to eq("OpenAIRE Orphan Record Repository")
-      expect(subject.funding).to eq("type"=>"Award", "identifier"=>"246686", "funder"=>{"type"=>"Organization", "name"=>"European Commission"})
+      expect(subject.funding).to eq("type"=>"Award", "identifier"=>"246686", "funder"=>{"type"=>"Organization", "id"=>"https://doi.org/10.13039/501100000780", "name"=>"European Commission"})
       expect(subject.provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end

data/spec/writers/schema_org_writer_spec.rb

@@ -81,7 +81,7 @@ describe Bolognese::Metadata, vcr: true do
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.5438/6423")
       expect(json["funding"]).to eq("@type" => "Award",
-                                    "funder" => {"type"=>"Organization", "id"=>"https://doi.org/10.13039/501100000780", "name"=>"European Commission"},
+                                    "funder" => {"@type"=>"Organization", "@id"=>"https://doi.org/10.13039/501100000780", "name"=>"European Commission"},
                                     "identifier" => "654039",
                                     "name" => "THOR – Technical and Human Infrastructure for Open Research",
                                     "url" => "http://cordis.europa.eu/project/rcn/194927_en.html")
@@ -93,7 +93,7 @@ describe Bolognese::Metadata, vcr: true do
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.5281/zenodo.1239")
       expect(json["funding"]).to eq("@type" => "Award",
-                                    "funder" => {"type"=>"Organization", "name"=>"European Commission"},
+                                    "funder" => {"@type"=>"Organization", "@id"=>"https://doi.org/10.13039/501100000780", "name"=>"European Commission"},
                                     "identifier" => "246686")
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.19
 platform: ruby
 authors:
 - Martin Fenner