RubyGems - bolognese - Versions diffs - 0.9.17 → 0.9.18 - Mend

bolognese 0.9.17 → 0.9.18

Files changed (17) hide show

checksums.yaml +4 -4
data/CITATION +17 -0
data/Gemfile.lock +5 -5
data/lib/bolognese/datacite_utils.rb +2 -2
data/lib/bolognese/metadata.rb +5 -5
data/lib/bolognese/readers/crossref_reader.rb +32 -4
data/lib/bolognese/readers/datacite_reader.rb +23 -5
data/lib/bolognese/version.rb +1 -1
data/lib/bolognese/writers/crosscite_writer.rb +1 -1
data/lib/bolognese/writers/datacite_json_writer.rb +1 -1
data/lib/bolognese/writers/schema_org_writer.rb +1 -1
data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Funding.yml +38 -0
data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Funding_OpenAIRE.yml +40 -0
data/spec/readers/crossref_reader_spec.rb +10 -7
data/spec/readers/datacite_reader_spec.rb +6 -2
data/spec/writers/schema_org_writer_spec.rb +32 -0
metadata +5 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4bf575907432b4cceb0c59f18c11f46f8d8a048
-  data.tar.gz: 2688d21093927a3153ab67b8d492e18900b2d524
+  metadata.gz: 1463edb9e56dc1c3519c19a325f248d9e8d134d0
+  data.tar.gz: 44484bf41d55c1539b38f39bf6111bacead7e447
 SHA512:
-  metadata.gz: 5e8af10f8bd60543bff089d952d4325b78986d5d6240d5555b6fd820331074da0f575fc451b1aeab07658ad1f07ea649ac4a7cd704f8a2b063d50a0072c646f8
-  data.tar.gz: 552874744bd870c5a108593862bc9778bf80bd7c24673f2d62014685a5d01a135b41ca42fdf23025a749dae63bbc59ce523440f846bde7e0788cb4e3ef11f426
+  metadata.gz: a981e4ba58d96e9e2e67ae7ce15fd18a951ba3364d06723271d55634e2ccbda9a31bb882c96a9ad1f6ba4489b2537de8f7610f8d2c3dfaa48d7624c98d9fc537
+  data.tar.gz: fbb30ce05de64f05402a8e62b4a8d5617e26f0b7331a53ad3cd1a848fc46293b46d0c2bb35ac072f70fd5196ac1d3b5ccbd45e3a7bf216a78448ec5ad1add403

data/CITATION ADDED Viewed

@@ -0,0 +1,17 @@
+To cite bolognese in publications, please use:
+Fenner, M. (2017). Bolognese: a Ruby library for conversion of DOI Metadata.
+DataCite. https://doi.org/10.5438/n138-z3mk
+A BibTeX entry for bolognese is
+@misc{https://doi.org/10.5438/n138-z3mk,
+  doi = {10.5438/n138-z3mk},
+  url = {https://github.com/datacite/bolognese},
+  author = {Fenner, Martin},
+  keywords = {doi, metadata, crossref, datacite, schema.org, bibtex, codemeta},
+  title = {Bolognese: a Ruby library for conversion of DOI Metadata},
+  publisher = {DataCite},
+  note = {Ruby gem and command-line utility for conversion of DOI metadata from and to different metadata formats, including schema.org.},
+  year = {2017}
+}

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.9.17)
+    bolognese (0.9.18)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)
@@ -84,11 +84,11 @@ GEM
       nokogiri (~> 1.6, >= 1.6.8)
       oj (~> 2.18, >= 2.18.1)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     namae (0.10.2)
-    nokogiri (1.7.1)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     oj (2.18.5)
     postrank-uri (1.0.22)
@@ -96,7 +96,7 @@ GEM
       nokogiri (>= 1.6.1, < 1.8)
       public_suffix (>= 2.0.0, < 2.1)
     public_suffix (2.0.5)
-    rack (2.0.1)
+    rack (2.0.2)
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (12.0.0)
@@ -105,7 +105,7 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (2.2.0)
       rdf (~> 2.0)
-    rdf-rdfa (2.2.0)
+    rdf-rdfa (2.2.1)
       haml (~> 4.0)
       htmlentities (~> 4.3)
       rdf (~> 2.2)

data/lib/bolognese/datacite_utils.rb CHANGED Viewed

@@ -130,10 +130,10 @@ module Bolognese
     end
     def insert_funding_references(xml)
-      return xml unless Array.wrap(funder).present?
+      return xml unless Array.wrap(funding).present?
       xml.fundingReferences do
-        Array.wrap(funder).each do |funding_reference|
+        Array.wrap(funding).each do |funding_reference|
           xml.fundingReference do
             insert_funding_reference(xml, funding_reference)
           end

data/lib/bolognese/metadata.rb CHANGED Viewed

@@ -60,7 +60,7 @@ module Bolognese
     attr_reader :id, :from, :raw, :metadata, :doc, :provider, :schema_version, :license, :citation,
       :additional_type, :alternate_name, :url, :version, :keywords, :editor,
       :page_start, :page_end, :date_modified, :language, :spatial_coverage,
-      :content_size, :funder, :journal, :bibtex_type, :date_created, :has_part,
+      :content_size, :funding, :journal, :bibtex_type, :date_created, :has_part,
       :publisher, :contributor, :same_as, :is_previous_version_of, :is_new_version_of,
       :should_passthru, :errors, :datacite_errors, :date_accepted, :date_available,
       :date_copyrighted, :date_collected, :date_submitted, :date_valid,
@@ -168,10 +168,6 @@ module Bolognese
       metadata.fetch("editor", nil)
     end
-    def funder
-      metadata.fetch("funder", nil)
-    end
     def publisher
       metadata.fetch("publisher", nil)
     end
@@ -252,6 +248,10 @@ module Bolognese
       metadata.fetch("schema_version", nil)
     end
+    def funding
+      metadata.fetch("funding", nil)
+    end
     def is_identical_to
       metadata.fetch("is_identical_to", nil)
     end

data/lib/bolognese/readers/crossref_reader.rb CHANGED Viewed

@@ -111,7 +111,7 @@ module Bolognese
           "alternate_name" => crossref_alternate_name(bibliographic_metadata),
           "author" => crossref_people(bibliographic_metadata, "author"),
           "editor" => crossref_people(bibliographic_metadata, "editor"),
-          "funder" => crossref_funder(program_metadata),
+          "funding" => crossref_funding_reference(program_metadata),
           "publisher" => nil,
           "provider" => "Crossref",
           "is_part_of" => crossref_is_part_of(journal_metadata),
@@ -168,15 +168,43 @@ module Bolognese
         end.unwrap
       end
-      def crossref_funder(program_metadata)
+      def crossref_funding_reference(program_metadata)
         fundref = Array.wrap(program_metadata).find { |a| a["name"] == "fundref" } || {}
         Array.wrap(fundref.fetch("assertion", [])).select { |a| a["name"] == "fundgroup" }.map do |f|
           f = Array.wrap(f.fetch("assertion", nil)).first
-          { "id" => normalize_id(f.dig("assertion", "__content__")),
-            "name" => f.dig("__content__").strip }.compact
+          funder = { "type" => "Organization",
+                     "id" => normalize_id(f.dig("assertion", "__content__")),
+                     "name" => f.dig("__content__").strip }.compact
+           if f["awardNumber"].present? || f["awardTitle"].present?
+             { "type" => "Award",
+               "name" => f.fetch("awardTitle", nil),
+               "identifier" => f.dig("awardNumber", "__content__"),
+               "url" => f.dig("awardNumber", "awardURI"),
+               "funder" => funder }
+           else
+             funder
+           end
         end.unwrap
       end
+      # def datacite_funding_reference(meta)
+      #   Array.wrap(meta.dig("fundingReferences", "fundingReference")).map do |f|
+      #     funder_id = parse_attributes(f["funderIdentifier"])
+      #     funder = { "type" => "Organization",
+      #                "id" => normalize_id(funder_id),
+      #                "name" => f["funderName"] }.compact
+      #     if f["awardNumber"].present? || f["awardTitle"].present?
+      #       { "type" => "Award",
+      #         "name" => f.fetch("awardTitle", nil),
+      #         "identifier" => f.dig("awardNumber", "__content__"),
+      #         "url" => f.dig("awardNumber", "awardURI"),
+      #         "funder" => funder }
+      #     else
+      #       funder
+      #     end
+      #   end.uniq
+      # end
       def crossref_date_published(bibliographic_metadata)
         pub_date = Array.wrap(bibliographic_metadata.fetch("publication_date", nil)).presence ||
           Array.wrap(bibliographic_metadata.fetch("acceptance_date", nil))

data/lib/bolognese/readers/datacite_reader.rb CHANGED Viewed

@@ -47,7 +47,7 @@ module Bolognese
           end
         end.compact.join(", ").presence
         dates = Array.wrap(meta.dig("dates", "date"))
-        funder = begin
+        funding = begin
           f = datacite_funder_contributor(meta) + datacite_funding_reference(meta)
           f.length > 1 ? f : f.first
         end
@@ -66,9 +66,9 @@ module Bolognese
           "alternate_name" => alternate_name,
           "author" => get_authors(meta.dig("creators", "creator")),
           "editor" => get_authors(Array.wrap(meta.dig("contributors", "contributor")).select { |r| r["contributorType"] == "Editor" }),
-          "funder" => funder,
           "publisher" => meta.fetch("publisher", nil),
           "provider" => "DataCite",
+          "funding" => funding,
           "is_identical_to" => datacite_is_identical_to(meta),
           "is_part_of" => datacite_is_part_of(meta),
           "has_part" => datacite_has_part(meta),
@@ -103,8 +103,18 @@ module Bolognese
       def datacite_funding_reference(meta)
         Array.wrap(meta.dig("fundingReferences", "fundingReference")).map do |f|
           funder_id = parse_attributes(f["funderIdentifier"])
-          { "identifier" => normalize_id(funder_id),
-            "name" => f["funderName"] }.compact
+          funder = { "type" => "Organization",
+                     "id" => normalize_id(funder_id),
+                     "name" => f["funderName"] }.compact
+          if f["awardNumber"].present? || f["awardTitle"].present?
+            { "type" => "Award",
+              "name" => f.fetch("awardTitle", nil),
+              "identifier" => f.dig("awardNumber", "__content__"),
+              "url" => f.dig("awardNumber", "awardURI"),
+              "funder" => funder }
+          else
+            funder
+          end
         end.uniq
       end
@@ -170,7 +180,15 @@ module Bolognese
       def datacite_funder_contributor(meta)
         Array.wrap(meta.dig("contributors", "contributor")).reduce([]) do |sum, f|
           if f["contributorType"] == "Funder"
-            sum << { "name" => f["contributorName"] }
+            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

data/lib/bolognese/version.rb CHANGED Viewed

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

data/lib/bolognese/writers/crosscite_writer.rb CHANGED Viewed

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

data/lib/bolognese/writers/datacite_json_writer.rb CHANGED Viewed

@@ -34,7 +34,7 @@ module Bolognese
           "rights" => license,
           "description" => description,
           "geo-location" => spatial_coverage,
-          "funding-reference" => funder,
+          "funding-reference" => funding,
           "schemaVersion" => schema_version,
           "provider" => provider
         }.compact

data/lib/bolognese/writers/schema_org_writer.rb CHANGED Viewed

@@ -32,7 +32,7 @@ module Bolognese
           "@reverse" => reverse.presence,
           "schemaVersion" => schema_version,
           "publisher" => publisher.present? ? { "@type" => "Organization", "name" => publisher } : nil,
-          "funder" => funder,
+          "funding" => to_schema_org(funding),
           "provider" => provider.present? ? { "@type" => "Organization", "name" => provider } : nil
         }.compact.presence
       end

data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Funding.yml ADDED Viewed

@@ -0,0 +1,38 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://search.datacite.org/api?fl=doi,xml,media,minted,updated&q=doi:10.5438/6423&wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Maremma - https://github.com/datacite/maremma
+      Accept:
+      - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Access-Control-Allow-Methods:
+      - GET, POST, OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Content-Type:
+      - application/json;charset=UTF-8
+      Date:
+      - Fri, 12 May 2017 10:02:42 GMT
+      Server:
+      - openresty/1.11.2.2
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":1},"response":{"numFound":1,"start":0,"docs":[{"xml":"<resource xmlns="http://datacite.org/schema/kernel-4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4/metadata.xsd">
  <identifier identifierType="DOI">10.5438/6423</identifier>
  <creators>
    <creator>
      <creatorName>Farquhar, Adam</creatorName>
      <givenName>Adam</givenName>
      <familyName>Farquhar</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0001-5331-6592</nameIdentifier>
      <affiliation>British Library</affiliation>
    </creator>
    <creator>
      <creatorName>Aryani, Amir</creatorName>
      <givenName>Amir</givenName>
      <familyName>Aryani</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0002-4259-9774</nameIdentifier>
      <affiliation>ANDS</affiliation>
    </creator>
    <creator>
      <creatorName>Brown, Josh</creatorName>
      <givenName>Josh</givenName>
      <familyName>Brown</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0002-8689-4935</nameIdentifier>
      <affiliation>ORCID EU</affiliation>
    </creator>
    <creator>
      <creatorName>Burton, Adrian</creatorName>
      <givenName>Adrian</givenName>
      <familyName>Burton</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0002-8099-7538</nameIdentifier>
      <affiliation>ANDS</affiliation>
    </creator>
    <creator>
      <creatorName>Cruise, Patricia</creatorName>
      <givenName>Patricia</givenName>
      <familyName>Cruise</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0002-9300-5278</nameIdentifier>
      <affiliation>DataCite</affiliation>
    </creator>
    <creator>
      <creatorName>Dallmeier-Thiessen, Sünje</creatorName>
      <givenName>Sünje</givenName>
      <familyName>Dallmeier-Thiessen</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0002-6137-2348</nameIdentifier>
      <affiliation>CERN</affiliation>
    </creator>
    <creator>
      <creatorName>Dappert, Angela</creatorName>
      <givenName>Angela</givenName>
      <familyName>Dappert</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0003-2614-6676</nameIdentifier>
      <affiliation>British Library</affiliation>
    </creator>
    <creator>
      <creatorName>Dasler, Robin</creatorName>
      <givenName>Robn</givenName>
      <familyName>Dasler</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0002-4695-7874</nameIdentifier>
      <affiliation>CERN</affiliation>
    </creator>
    <creator>
      <creatorName>Demeranville, Tom</creatorName>
      <givenName>Tom</givenName>
      <familyName>Demeranville</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0003-0902-4386</nameIdentifier>
      <affiliation>ORCID EU</affiliation>
    </creator>
    <creator>
      <creatorName>Diepenbroek, Michael</creatorName>
      <givenName>Michael</givenName>
      <familyName>Diepenbroek</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0003-3096-6829</nameIdentifier>
      <affiliation>Pangaea</affiliation>
    </creator>
    <creator>
      <creatorName>Duine, Maaike</creatorName>
      <givenName>Maike</givenName>
      <familyName>Duine</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0003-3412-7192</nameIdentifier>
      <affiliation>ORCID EU</affiliation>
    </creator>
    <creator>
      <creatorName>Fenner, Martin</creatorName>
      <givenName>Martin</givenName>
      <familyName>Fenner</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0003-1419-2405</nameIdentifier>
      <affiliation>DataCite</affiliation>
    </creator>
    <creator>
      <creatorName>Garza, Kristian</creatorName>
      <givenName>Kristian</givenName>
      <familyName>Garza</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0003-3484-6875</nameIdentifier>
      <affiliation>DataCite</affiliation>
    </creator>
    <creator>
      <creatorName>Groth, Paul</creatorName>
      <givenName>Paul</givenName>
      <familyName>Groth</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0003-0183-6910</nameIdentifier>
      <affiliation>Elsevier</affiliation>
    </creator>
    <creator>
      <creatorName>Haak, Laurel</creatorName>
      <givenName>Laurel</givenName>
      <familyName>Haak</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0001-5109-3700</nameIdentifier>
      <affiliation>ORCID EU</affiliation>
    </creator>
    <creator>
      <creatorName>Kiermer, Veronique</creatorName>
      <givenName>Veronique</givenName>
      <familyName>Kiermer</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0001-8771-7239</nameIdentifier>
      <affiliation>Public Library of Science</affiliation>
    </creator>
    <creator>
      <creatorName>Kotarski, Rachael</creatorName>
      <givenName>Rachael</givenName>
      <familyName>Kotarski</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0001-6843-7960</nameIdentifier>
      <affiliation>British Library</affiliation>
    </creator>
    <creator>
      <creatorName>MacCallum, Catriona</creatorName>
      <givenName>Catriona</givenName>
      <familyName>MacCallum</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0001-9623-2225</nameIdentifier>
      <affiliation>Public Library of Science</affiliation>
    </creator>
    <creator>
      <creatorName>McEntyre, Johanna</creatorName>
      <givenName>Johanna</givenName>
      <familyName>McEntyre</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0002-1611-6935</nameIdentifier>
      <affiliation>European Bioinformatics Institute</affiliation>
    </creator>
    <creator>
      <creatorName>Mele, Salvatore</creatorName>
      <givenName>Salvatore</givenName>
      <familyName>Mele</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0003-0762-2235</nameIdentifier>
      <affiliation>CERN</affiliation>
    </creator>
    <creator>
      <creatorName>Mello, Guilherme</creatorName>
      <givenName>Guilherme</givenName>
      <familyName>Mello</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0002-9829-091X</nameIdentifier>
      <affiliation>European Bioinformatics Institute</affiliation>
    </creator>
    <creator>
      <creatorName>Rueda, Laura</creatorName>
      <givenName>Laura</givenName>
      <familyName>Rueda</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0001-5952-7630</nameIdentifier>
      <affiliation>DataCite</affiliation>
    </creator>
    <creator>
      <creatorName>Stocker, Markus</creatorName>
      <givenName>Markus</givenName>
      <familyName>Stocker</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0001-5492-3212</nameIdentifier>
      <affiliation>Pangaea</affiliation>
    </creator>
    <creator>
      <creatorName>Vision, Todd</creatorName>
      <givenName>Todd</givenName>
      <familyName>Vision</familyName>
      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org">0000-0002-6133-2581</nameIdentifier>
      <affiliation>Dryad</affiliation>
    </creator>
  </creators>
  <contributors>
    <contributor contributorType="ProjectLeader">
      <contributorName>The British Library</contributorName>
      <nameIdentifier nameIdentifierScheme="GRID" schemeURI="https://grid.ac/institutes">grid.36212.34</nameIdentifier>
    </contributor>
    <contributor contributorType="ProjectMember">
      <contributorName>Monash University</contributorName>
      <nameIdentifier nameIdentifierScheme="GRID" schemeURI="https://grid.ac/institutes">grid.1002.3</nameIdentifier>
    </contributor>
    <contributor contributorType="ProjectMember">
      <contributorName>European Organization for Nuclear Research</contributorName>
      <nameIdentifier nameIdentifierScheme="GRID" schemeURI="https://grid.ac/institutes">grid.9132.9</nameIdentifier>
    </contributor>
    <contributor contributorType="ProjectMember">
      <contributorName>DataCite</contributorName>
      <nameIdentifier nameIdentifierScheme="GRID" schemeURI="https://grid.ac/institutes">grid.475826.a</nameIdentifier>
    </contributor>
    <contributor contributorType="ProjectMember">
      <contributorName>The University of North Carolina at Chapel Hill</contributorName>
      <nameIdentifier nameIdentifierScheme="GRID" schemeURI="https://grid.ac/institutes">grid.10698.36</nameIdentifier>
    </contributor>
    <contributor contributorType="ProjectMember">
      <contributorName>European Molecular Biology Laboratory</contributorName>
      <nameIdentifier nameIdentifierScheme="GRID" schemeURI="https://grid.ac/institutes">grid.4709.a</nameIdentifier>
    </contributor>
    <contributor contributorType="ProjectMember">
      <contributorName>Elsevier</contributorName>
      <nameIdentifier nameIdentifierScheme="GRID" schemeURI="https://grid.ac/institutes">grid.462207.5</nameIdentifier>
    </contributor>
    <contributor contributorType="ProjectMember">
      <contributorName>ORCID EU</contributorName>
    </contributor>
    <contributor contributorType="ProjectMember">
      <contributorName>Universität Bremen</contributorName>
      <nameIdentifier nameIdentifierScheme="GRID" schemeURI="https://grid.ac/institutes">grid.7704.4</nameIdentifier>
    </contributor>
    <contributor contributorType="ProjectMember">
      <contributorName>Public Library of Science</contributorName>
      <nameIdentifier nameIdentifierScheme="GRID" schemeURI="https://grid.ac/institutes">grid.431302.7</nameIdentifier>
    </contributor>
  </contributors>
  <titles>
    <title>Technical and Human Infrastructure for Open Research (THOR)</title>
  </titles>
  <publisher>DataCite</publisher>
  <publicationYear>2015</publicationYear>
  <resourceType resourceTypeGeneral="Collection">Project</resourceType>
  <relatedIdentifiers>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/ZENODO.30799</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/ZENODO.30800</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/ZENODO.31787</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/ZENODO.31932</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/ZENODO.31933</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/ZENODO.46761</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/ZENODO.48228</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/ZENODO.48705</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/ZENODO.58971</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/ZENODO.61176</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/zenodo.154592</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/zenodo.168043</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/zenodo.168181</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/zenodo.168184</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/zenodo.168187</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/zenodo.168188</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/zenodo.168190</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/zenodo.168202</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/zenodo.168213</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5281/zenodo.168214</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5438/BC11-CQW1</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5438/CJT2-T6DZ</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5438/W029-Y6W~</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.5438/S8GF-0CK9</relatedIdentifier>
    <relatedIdentifier relationType="HasPart" relatedIdentifierType="DOI">10.6084/M9.FIGSHARE.4236428</relatedIdentifier>
  </relatedIdentifiers>
  <rightsList>
    <rights rightsURI="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0</rights>
  </rightsList>
  <descriptions>
    <description descriptionType="Abstract">
&lt;p&gt;Five years ago, a global infrastructure to uniquely attribute to researchers their scientific artefacts (articles, data, software&#8230;) appeared technically and socially infeasible. Since then, DataCite has minted over 3.5m unique identifiers for data. ORCID has deployed an open solution for identification of contributors with over 850,000 registrants in less than 2 years.    THOR will leverage these emerging global infrastructures to support the H2020 goal to make every researcher digital and increase creativity and efficiency of research, while bridging the R&amp;D divide between developed and less-developed regions. We will establish interoperability between existing resources, linking digital identifiers across platforms and propagating attribution information.   We will integrate PID services across the research lifecycle and data publishing workflows in four advanced research communities, and then roll-out core services and service building blocks for the wider community. These open resources will foster an open and sustainable e-infrastructure across stakeholders to avoid duplications, give economies of scale, richness of services and the ability to respond rapidly to opportunities for innovation.   THOR is not just relevant to the EINFRA-7-1024 Call, but will become a pervasive element of the EINFRA family of e-Infrastructure resources over the next 3 years. It will allow data-management and curation services to exploit knowledge of data location and attribution; provide robust and persistent mechanism for linking literature and data; enable search and resolving services and generate incentives for Open Science; deliver provenance and attribution mechanisms to underpin data exchange; and provide minting and resolving services for data citation workflows.   Its impact will enable third-party services, no-profit and commercial, to leverage the scholarly record.&lt;/p&gt;
    </description>
  </descriptions>
  <fundingReferences>
    <fundingReference>
      <funderName>European Commission</funderName>
      <funderIdentifier funderIdentifierType="Crossref Funder ID">http://dx.doi.org/10.13039/501100000780</funderIdentifier>
      <awardNumber awardURI="http://cordis.europa.eu/project/rcn/194927_en.html">654039</awardNumber>
      <awardTitle>THOR – Technical and Human Infrastructure for Open Research</awardTitle>
    </fundingReference>
  </fundingReferences>
</resource>
","minted":"2016-09-24T20:26:53Z","updated":"2017-02-06T14:24:31Z","doi":"10.5438/6423"}]}}
+'
+    http_version:
+  recorded_at: Fri, 12 May 2017 10:02:42 GMT
+recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Funding_OpenAIRE.yml ADDED Viewed

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://search.datacite.org/api?fl=doi,xml,media,minted,updated&q=doi:10.5281/zenodo.1239&wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Maremma - https://github.com/datacite/maremma
+      Accept:
+      - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Access-Control-Allow-Methods:
+      - GET, POST, OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Content-Type:
+      - application/json;charset=UTF-8
+      Date:
+      - Fri, 12 May 2017 10:05:17 GMT
+      Server:
+      - openresty/1.11.2.2
+      Content-Length:
+      - '3143'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":0},"response":{"numFound":1,"start":0,"docs":[{"xml":"PHJlc291cmNlIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyIgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC0zL21ldGFkYXRhLnhzZCI+CiAgPGlkZW50aWZpZXIgaWRlbnRpZmllclR5cGU9IkRPSSI+MTAuNTI4MS9aRU5PRE8uMTIzOTwvaWRlbnRpZmllcj4KICA8Y3JlYXRvcnM+CiAgICA8Y3JlYXRvcj4KICAgICAgPGNyZWF0b3JOYW1lPkphaG4sIE5hamtvPC9jcmVhdG9yTmFtZT4KICAgIDwvY3JlYXRvcj4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWU+RmVubmVyLCBNYXJ0aW48L2NyZWF0b3JOYW1lPgogICAgPC9jcmVhdG9yPgogICAgPGNyZWF0b3I+CiAgICAgIDxjcmVhdG9yTmFtZT5EaW1pdHJvcG91bG9zLCBIYXJyeTwvY3JlYXRvck5hbWU+CiAgICA8L2NyZWF0b3I+CiAgICA8Y3JlYXRvcj4KICAgICAgPGNyZWF0b3JOYW1lPlNjaGlycndhZ2VuLCBKb2NoZW48L2NyZWF0b3JOYW1lPgogICAgPC9jcmVhdG9yPgogIDwvY3JlYXRvcnM+CiAgPHRpdGxlcz4KICAgIDx0aXRsZT5QdWJsaWNhdGlvbiBGUDcgRnVuZGluZyBBY2tub3dsZWRnbWVudCAtIFBMT1MgT3BlbkFJUkU8L3RpdGxlPgogIDwvdGl0bGVzPgogIDxwdWJsaXNoZXI+T3BlbkFJUkUgT3JwaGFuIFJlY29yZCBSZXBvc2l0b3J5PC9wdWJsaXNoZXI+CiAgPHB1YmxpY2F0aW9uWWVhcj4yMDEzPC9wdWJsaWNhdGlvblllYXI+CiAgPHN1YmplY3RzPgogICAgPHN1YmplY3Q+QXJ0aWNsZS1MZXZlbCBNZXRyaWNzPC9zdWJqZWN0PgogICAgPHN1YmplY3Q+RGF0YSBtaW5pbmc8L3N1YmplY3Q+CiAgICA8c3ViamVjdD5TdGF0aXN0aWNhbCBDb21wdXRpbmcgTGFuZ3VhZ2UgUjwvc3ViamVjdD4KICAgIDxzdWJqZWN0PmZ1bmRlZCByZXNlYXJjaCBwdWJsaWNhdGlvbnM8L3N1YmplY3Q+CiAgPC9zdWJqZWN0cz4KICA8Y29udHJpYnV0b3JzPgogICAgPGNvbnRyaWJ1dG9yIGNvbnRyaWJ1dG9yVHlwZT0iRnVuZGVyIj4KICAgICAgPGNvbnRyaWJ1dG9yTmFtZT5FdXJvcGVhbiBDb21taXNzaW9uPC9jb250cmlidXRvck5hbWU+CiAgICAgIDxuYW1lSWRlbnRpZmllciBuYW1lSWRlbnRpZmllclNjaGVtZT0iaW5mbyI+aW5mbzpldS1yZXBvL2dyYW50QWdyZWVtZW50L0VDL0ZQNy8yNDY2ODY8L25hbWVJZGVudGlmaWVyPgogICAgPC9jb250cmlidXRvcj4KICA8L2NvbnRyaWJ1dG9ycz4KICA8ZGF0ZXM+CiAgICA8ZGF0ZSBkYXRlVHlwZT0iSXNzdWVkIj4yMDEzLTA0LTAzPC9kYXRlPgogICAgPGRhdGUgZGF0ZVR5cGU9Iklzc3VlZCI+MjAxMzwvZGF0ZT4KICA8L2RhdGVzPgogIDxsYW5ndWFnZT5lbmc8L2xhbmd1YWdlPgogIDxyZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlR2VuZXJhbD0iRGF0YXNldCIvPgogIDxhbHRlcm5hdGVJZGVudGlmaWVycz4KICAgIDxhbHRlcm5hdGVJZGVudGlmaWVyIGFsdGVybmF0ZUlkZW50aWZpZXJUeXBlPSJVUkwiPmh0dHA6Ly96ZW5vZG8ub3JnL3JlY29yZC8xMjM5PC9hbHRlcm5hdGVJZGVudGlmaWVyPgogIDwvYWx0ZXJuYXRlSWRlbnRpZmllcnM+CiAgPHJpZ2h0c0xpc3Q+CiAgICA8cmlnaHRzIHJpZ2h0c1VSST0iaW5mbzpldS1yZXBvL3NlbWFudGljcy9vcGVuQWNjZXNzIj5PcGVuIEFjY2VzczwvcmlnaHRzPgogICAgPHJpZ2h0cyByaWdodHNVUkk9Imh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL3B1YmxpY2RvbWFpbi96ZXJvLzEuMC8iPkNyZWF0aXZlIENvbW1vbnMgWmVybyAxLjAgVW5pdmVyc2FsPC9yaWdodHM+CiAgPC9yaWdodHNMaXN0PgogIDxkZXNjcmlwdGlvbnM+CiAgICA8ZGVzY3JpcHRpb24gZGVzY3JpcHRpb25UeXBlPSJBYnN0cmFjdCI+VGhlIGRhdGFzZXQgY29udGFpbnMgYSBzYW1wbGUgb2YgbWV0YWRhdGEgZGVzY3JpYmluZyBwYXBlcnMgcHVibGlzaGVkIGluIFBMT1MgYW5kIHRoZWlyIGlkZW50aWZpZWQgZ3JhbnQgYWdyZWVtZW50IG51bWJlciBvZiBGUDcgcHJvamVjdHMuIEEgc2Vjb25kIGZpbGUgc2hvd3MgdGhlIGZyZXF1ZW5jeSBvZiBGUDcgZ3JhbnRzLiBUaGUgc2FtcGxlIHdhcyBjcmVhdGVkIGluIEp1bHkgMjAxMi48L2Rlc2NyaXB0aW9uPgogIDwvZGVzY3JpcHRpb25zPgo8L3Jlc291cmNlPgoNCg0K","minted":"2013-04-03T09:52:22Z","updated":"2014-04-15T08:13:50Z","doi":"10.5281/ZENODO.1239"}]}}
+'
+    http_version:
+  recorded_at: Fri, 12 May 2017 10:05:17 GMT
+recorded_with: VCR 3.0.3

data/spec/readers/crossref_reader_spec.rb CHANGED Viewed

@@ -29,13 +29,16 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"eLife", "issn"=>"2050-084X")
       expect(subject.references.count).to eq(25)
       expect(subject.references[19]).to eq("id"=>"https://doi.org/10.5061/dryad.b835k", "type"=>"CreativeWork")
-      expect(subject.funder).to eq([{"name"=>"SystemsX"},
-                                    {"id"=>"https://doi.org/10.13039/501100003043",
-                                     "name"=>"EMBO"},
-                                    {"id"=>"https://doi.org/10.13039/501100001711",
-                                     "name"=>"Swiss National Science Foundation"},
-                                    {"id"=>"https://doi.org/10.13039/501100006390",
-                                     "name"=>"University of Lausanne"}])
+      expect(subject.funding).to eq([{"type"=>"Organization", "name"=>"SystemsX"},
+                                     {"type"=>"Organization",
+                                      "id"=>"https://doi.org/10.13039/501100003043",
+                                      "name"=>"EMBO"},
+                                     {"type"=>"Organization",
+                                      "id"=>"https://doi.org/10.13039/501100001711",
+                                      "name"=>"Swiss National Science Foundation"},
+                                     {"type"=>"Organization",
+                                      "id"=>"https://doi.org/10.13039/501100006390",
+                                      "name"=>"University of Lausanne"}])
       expect(subject.provider).to eq("Crossref")
     end

data/spec/readers/datacite_reader_spec.rb CHANGED Viewed

@@ -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.funder).to eq("name" => "European Commission")
+      expect(subject.funding).to eq("type"=>"Award", "identifier"=>"246686", "funder"=>{"type"=>"Organization", "name"=>"European Commission"})
       expect(subject.provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
@@ -181,7 +181,11 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.description["text"]).to start_with("Five years ago, a global infrastructure")
       expect(subject.date_published).to eq("2015")
       expect(subject.publisher).to eq("DataCite")
-      expect(subject.funder).to eq("identifier"=>"https://doi.org/10.13039/501100000780", "name"=>"European Commission")
+      expect(subject.funding).to eq("type"=>"Award",
+                                    "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")
       expect(subject.provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end

data/spec/writers/schema_org_writer_spec.rb CHANGED Viewed

@@ -7,6 +7,16 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.7554/elife.01567")
+      expect(json["funding"]).to eq([{"name"=>"SystemsX", "@type"=>"Organization"},
+                                     {"name"=>"EMBO",
+                                      "@type"=>"Organization",
+                                      "@id"=>"https://doi.org/10.13039/501100003043"},
+                                     {"name"=>"Swiss National Science Foundation",
+                                      "@type"=>"Organization",
+                                      "@id"=>"https://doi.org/10.13039/501100001711"},
+                                     {"name"=>"University of Lausanne",
+                                      "@type"=>"Organization",
+                                      "@id"=>"https://doi.org/10.13039/501100006390"}])
     end
     it "maremma schema.org JSON" do
@@ -64,5 +74,27 @@ describe Bolognese::Metadata, vcr: true do
                                     {"name"=>"University Of California, Santa Barbara", "@type"=>"Organization"}])
       expect(json["version"]).to eq("2.0.0")
     end
+    it "Funding" do
+      input = "https://doi.org/10.5438/6423"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite")
+      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"},
+                                    "identifier" => "654039",
+                                    "name" => "THOR – Technical and Human Infrastructure for Open Research",
+                                    "url" => "http://cordis.europa.eu/project/rcn/194927_en.html")
+    end
+    it "Funding OpenAIRE" do
+      input = "https://doi.org/10.5281/ZENODO.1239"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite")
+      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"},
+                                    "identifier" => "246686")
+    end
   end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.18
 platform: ruby
 authors:
 - Martin Fenner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -431,6 +431,7 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".travis.yml"
+- CITATION
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
@@ -720,6 +721,8 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_ris/journal_article.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_ris/maremma.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_ris/with_pages.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Funding.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Funding_OpenAIRE.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Schema_org_JSON.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Schema_org_JSON_IsSupplementTo.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Schema_org_JSON_isReferencedBy.yml