bolognese 1.6.6 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 405a39bf0274cc91c5356f94b050f5e0bad7598d47601a3fac9a99aed3900eff
-  data.tar.gz: e32e05bbf8fdd50af362081e7dee9de0c6e64b21c12d4fadd676909808423955
+  metadata.gz: 14bb7a2089ea4fda869141d7c461fe60fdb2021f7eeee1f5951cfcbe703301ca
+  data.tar.gz: cc45d98bb6e32587e98ac5406b16194a28b5cd217339be9c5b544e8ad2ddf09d
 SHA512:
-  metadata.gz: 1fc29ec5b40985218e1305d7e70eac714f8250d9f6c3b308b194785c6d3c8426facaf2b11c9332a5a1deb72fa6eb3084b60aaf58527fcb638b081ce08d55c322
-  data.tar.gz: 6a82235d1c16f6bf987c9a9ebd61337100ae7b8bc4c64d343d0de4f0037d399081f71a8bee68754937d482d0c5d7bf4f91f06a0afe55178818fe0a85e404c4f1
+  metadata.gz: 98b724dc7bb0804288c99ed7aac834685c61d35ca9072381c57f4df3a67099af84b4fe0c691b54f1c05793a6f0798f52a39f333b7e4bc59a8aadc2d28a0730f3
+  data.tar.gz: 2eda80fd5fa33b6eb5642ed9a481ef8d72e645d6b64289b579fbc39794ee5f2c0930df0750a6a8e8fad3545b77a53197e5b87a7300e79c051c5a01c6ac283fc8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.6.6)
+    bolognese (1.6.11)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -11,7 +11,7 @@ PATH
       concurrent-ruby (~> 1.1, >= 1.1.5)
       csl-styles (~> 1.0, >= 1.0.1.8)
       edtf (~> 3.0, >= 3.0.4)
-      faraday (~> 1.0, >= 1.0.1)
+      faraday (= 0.17.0)
       gender_detector (~> 0.1.2)
       iso8601 (~> 0.9.1)
       json-ld (~> 3.1, >= 3.1.4)
@@ -56,7 +56,7 @@ GEM
       namae (~> 1.0)
     csl-styles (1.0.1.10)
       csl (~> 1.0)
-    diff-lcs (1.4.1)
+    diff-lcs (1.4.4)
     docile (1.3.2)
     ebnf (1.2.0)
       rdf (~> 3.1)
@@ -64,12 +64,12 @@ GEM
     edtf (3.0.5)
       activesupport (>= 3.0, < 7.0)
     excon (0.71.1)
-    faraday (1.0.1)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday-encoding (0.0.5)
       faraday
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
     haml (5.1.2)
@@ -98,14 +98,14 @@ GEM
     loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    maremma (4.8)
+    maremma (4.7)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.71.0)
-      faraday (~> 1.0, >= 1.0.1)
+      faraday (= 0.17.0)
       faraday-encoding (~> 0.0.4)
-      faraday_middleware (~> 1.0)
+      faraday_middleware (~> 0.13.1)
       nokogiri (~> 1.10.4)
       oj (>= 2.8.3)
       oj_mimic_json (~> 1.0, >= 1.0.1)
@@ -128,7 +128,7 @@ GEM
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
     rake (12.3.3)
-    rdf (3.1.3)
+    rdf (3.1.4)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (3.1.0)
@@ -187,7 +187,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby

data/bolognese.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.license       = 'MIT'
   s.required_ruby_version = '~> 2.3'
 
-  # Declary dependencies here, rather than in the Gemfile
+  # Declare dependencies here, rather than in the Gemfile
   s.add_dependency 'maremma', '>= 4.3', '< 5'
-  s.add_dependency 'faraday', '~> 1.0', '>= 1.0.1'
+  s.add_dependency 'faraday', "0.17.0"
   s.add_dependency 'nokogiri', '~> 1.10.4'
   s.add_dependency 'loofah', '~> 2.0', '>= 2.0.3'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'

data/lib/bolognese/utils.rb

@@ -1105,7 +1105,7 @@ module Bolognese
         {
           "rights" => license["name"],
           "rightsUri" => license["seeAlso"].first,
-          "rightsIdentifier" => license["licenseId"],
+          "rightsIdentifier" => license["licenseId"].downcase,
           "rightsIdentifierScheme" => "SPDX",
           "schemeUri" => "https://spdx.org/licenses/" }.compact
       else
@@ -1115,21 +1115,21 @@ module Bolognese
 
     def hsh_to_spdx(hsh)
       spdx = JSON.load(File.read(File.expand_path('../../../resources/spdx/licenses.json', __FILE__))).fetch("licenses")
-      license = spdx.find { |l| l["licenseId"] == hsh["rightsIdentifier"] || l["seeAlso"].first == normalize_cc_url(hsh["rightsURI"]) || l["name"] == hsh["rights"] || l["seeAlso"].first == normalize_cc_url(hsh["rights"]) }
+      license = spdx.find { |l| l["licenseId"].casecmp?(hsh["rightsIdentifier"]) || l["seeAlso"].first == normalize_cc_url(hsh["rightsURI"]) || l["name"] == hsh["rights"] || l["seeAlso"].first == normalize_cc_url(hsh["rights"]) }
 
       if license
         {
           "rights" => license["name"],
           "rightsUri" => license["seeAlso"].first,
-          "rightsIdentifier" => license["licenseId"],
+          "rightsIdentifier" => license["licenseId"].downcase,
           "rightsIdentifierScheme" => "SPDX",
           "schemeUri" => "https://spdx.org/licenses/",
           "lang" => hsh["lang"] }.compact
       else
         {
-          "rights" => hsh["__content__"],
-          "rightsUri" => hsh["rightsURI"],
-          "rightsIdentifier" => hsh["rightsIdentifier"],
+          "rights" => hsh["__content__"] || hsh["rights"],
+          "rightsUri" => hsh["rightsURI"] || hsh["rightsUri"],
+          "rightsIdentifier" => hsh["rightsIdentifier"].present? ? hsh["rightsIdentifier"].downcase : nil,
           "rightsIdentifierScheme" => hsh["rightsIdentifierScheme"],
           "schemeUri" => hsh["schemeUri"],
           "lang" => hsh["lang"] }.compact
@@ -1177,11 +1177,11 @@ module Bolognese
     def hsh_to_fos(hsh)
       # first find subject in Fields of Science (OECD)
       fos = JSON.load(File.read(File.expand_path('../../../resources/oecd/fos-mappings.json', __FILE__))).fetch("fosFields")
-      subject = fos.find { |l| l["fosLabel"] == hsh["__content__"] || "FOS: " + l["fosLabel"] == hsh["__content__"] }
+      subject = fos.find { |l| l["fosLabel"] == hsh["__content__"] || "FOS: " + l["fosLabel"] == hsh["__content__"] || l["fosLabel"] == hsh["subject"]}
 
       if subject
         return [{ 
-          "subject" => sanitize(hsh["__content__"]), 
+          "subject" => sanitize(hsh["__content__"] || hsh["subject"]), 
           "subjectScheme" => hsh["subjectScheme"],
           "schemeUri" => hsh["schemeURI"], 
           "valueUri" => hsh["valueURI"], 
@@ -1200,19 +1200,19 @@ module Bolognese
 
       # try to extract forId
       if hsh["subjectScheme"] == "FOR"
-        for_id = hsh["__content__"].split(" ").first
+        for_id = hsh["__content__"].to_s.split(" ").first || hsh["subject"].to_s.split(" ").first
         for_id = for_id.rjust(6, "0")        
         
         subject = for_fields.find { |l| l["forId"] == for_id } ||
                   for_disciplines.find { |l| l["forId"] == for_id[0..3] }
       else
-        subject = for_fields.find { |l| l["forLabel"] == hsh["__content__"] } ||
-                  for_disciplines.find { |l| l["forLabel"] == hsh["__content__"] }
+        subject = for_fields.find { |l| l["forLabel"] == hsh["__content__"] || l["forLabel"] == hsh["subject"] } ||
+                  for_disciplines.find { |l| l["forLabel"] == hsh["__content__"] || l["forLabel"] == hsh["subject"] }
       end
 
       if subject
         [{ 
-          "subject" => sanitize(hsh["__content__"]), 
+          "subject" => sanitize(hsh["__content__"] || hsh["subject"]), 
           "subjectScheme" => hsh["subjectScheme"],
           "schemeUri" => hsh["schemeURI"], 
           "valueUri" => hsh["valueURI"], 
@@ -1224,7 +1224,7 @@ module Bolognese
         }]
       else
         [{ 
-          "subject" => sanitize(hsh["__content__"]), 
+          "subject" => sanitize(hsh["__content__"] || hsh["subject"]), 
           "subjectScheme" => hsh["subjectScheme"],
           "schemeUri" => hsh["schemeURI"], 
           "valueUri" => hsh["valueURI"], 

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.6.6"
+  VERSION = "1.6.11"
 end

data/spec/datacite_utils_spec.rb

@@ -160,7 +160,7 @@ describe Bolognese::Metadata, vcr: true do
       xml = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') { |xml| subject.insert_rights_list(xml) }.to_xml
       response = Maremma.from_xml(xml)
       expect(response.dig("rightsList", "rights")).to eq("__content__" => "Creative Commons Zero v1.0 Universal",
-        "rightsIdentifier" => "CC0-1.0",
+        "rightsIdentifier" => "cc0-1.0",
         "rightsIdentifierScheme" => "SPDX",
         "rightsURI" => "https://creativecommons.org/publicdomain/zero/1.0/legalcode",
         "schemeURI" => "https://spdx.org/licenses/")

data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/hsh_to_spdx_id_lowercase.yml

@@ -0,0 +1,44 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.crossref.org/works/10.1101/097196/transform/application/vnd.crossref.unixsd+xml
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Mozilla/5.0 (compatible; Maremma/4.7; mailto:info@datacite.org)
+      Accept:
+      - text/xml
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Link:
+      - !binary |-
+        PGh0dHA6Ly9keC5kb2kub3JnLzEwLjExMDEvMDk3MTk2PjsgcmVsPSJjYW5vbmljYWwiLCA8aHR0cHM6Ly9zeW5kaWNhdGlvbi5oaWdod2lyZS5vcmcvY29udGVudC9kb2kvMTAuMTEwMS8wOTcxOTY+OyB2ZXJzaW9uPSJ2b3IiOyByZWw9Iml0ZW0iLCA8aHR0cDovL29yY2lkLm9yZy8wMDAwLTAwMDMtMTQxOS0yNDA1PjsgdGl0bGU9Ik1hcnRpbiBGZW5uZXIiOyByZWw9ImF1dGhvciIsIDxodHRwOi8vb3JjaWQub3JnLzAwMDAtMDAwMy0xMzA0LTE5Mzk+OyB0aXRsZT0iTWVyY8OoIENyb3NhcyI7IHJlbD0iYXV0aG9yIiwgPGh0dHA6Ly9vcmNpZC5vcmcvMDAwMC0wMDAxLTUyMTItNzA1Mj47IHRpdGxlPSJKZWZmcmV5IEdyZXRoZSI7IHJlbD0iYXV0aG9yIiwgPGh0dHA6Ly9vcmNpZC5vcmcvMDAwMC0wMDAyLTkzNzctMDc5Nz47IHRpdGxlPSJEYXZpZCBLZW5uZWR5IjsgcmVsPSJhdXRob3IiLCA8aHR0cDovL29yY2lkLm9yZy8wMDAwLTAwMDEtODQ3OS0wMjYyPjsgdGl0bGU9Ikhlbm5pbmcgSGVybWpha29iIjsgcmVsPSJhdXRob3IiLCA8aHR0cDovL29yY2lkLm9yZy8wMDAwLTAwMDEtOTg1My01NjY4PjsgdGl0bGU9IlBoaWxpcHBlIFJvY2NhLVNlcnJhIjsgcmVsPSJhdXRob3IiLCA8aHR0cDovL29yY2lkLm9yZy8wMDAwLTAwMDItMjE4OC0yNTcwPjsgdGl0bGU9Ikd1c3Rhdm8gRHVyYW5kIjsgcmVsPSJhdXRob3IiLCA8aHR0cDovL29yY2lkLm9yZy8wMDAwLTAwMDItMTczMS01MzQ2PjsgdGl0bGU9IlJvYmluIEJlcmpvbiI7IHJlbD0iYXV0aG9yIiwgPGh0dHA6Ly9vcmNpZC5vcmcvMDAwMC0wMDAxLTgyNDktNzM4OD47IHRpdGxlPSJTZWJhc3RpYW4gS2FyY2hlciI7IHJlbD0iYXV0aG9yIiwgPGh0dHA6Ly9vcmNpZC5vcmcvMDAwMC0wMDAyLTg0MDYtMzg3MT47IHRpdGxlPSJNYXJ5YW5uIE1hcnRvbmUiOyByZWw9ImF1dGhvciIsIDxodHRwOi8vb3JjaWQub3JnLzAwMDAtMDAwMy00MDYwLTczNjA+OyB0aXRsZT0iVGltb3RoeSBDbGFyayI7IHJlbD0iYXV0aG9yIg==
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Headers:
+      - X-Requested-With
+      Content-Length:
+      - '16202'
+      Server:
+      - http-kit
+      Date:
+      - Wed, 01 Jul 2020 02:59:51 GMT
+      X-Rate-Limit-Limit:
+      - '50'
+      X-Rate-Limit-Interval:
+      - 1s
+      Connection:
+      - close
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        <?xml version="1.0" encoding="UTF-8"?>
<crossref_result xmlns="http://www.crossref.org/qrschema/3.0" version="3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.crossref.org/qrschema/3.0 http://www.crossref.org/schemas/crossref_query_output3.0.xsd">
  <query_result>
    <head>
      <doi_batch_id>none</doi_batch_id>
    </head>
    <body>
      <query status="resolved">
        <doi type="posted_content">10.1101/097196</doi>
        <crm-item name="publisher-name" type="string">Cold Spring Harbor Laboratory</crm-item>
        <crm-item name="prefix-name" type="string">Cold Spring Harbor Laboratory</crm-item>
        <crm-item name="member-id" type="number">246</crm-item>
        <crm-item name="citation-id" type="number">87108484</crm-item>
        <crm-item name="book-id" type="number">2221814</crm-item>
        <crm-item name="deposit-timestamp" type="number">2019071613381284000</crm-item>
        <crm-item name="owner-prefix" type="string">10.1101</crm-item>
        <crm-item name="last-update" type="date">2020-01-18T02:53:57Z</crm-item>
        <crm-item name="created" type="date">2016-12-29T06:10:15Z</crm-item>
        <crm-item name="citedby-count" type="number">12</crm-item>
        <doi_record>
          <crossref xmlns="http://www.crossref.org/xschema/1.1" xsi:schemaLocation="http://www.crossref.org/xschema/1.1 http://doi.crossref.org/schemas/unixref1.1.xsd">
            <posted_content type="preprint" language="en" metadata_distribution_opts="any">
              <group_title>Scientific Communication and Education</group_title>
              <contributors>
                <person_name contributor_role="author" sequence="first">
                  <given_name>Martin</given_name>
                  <surname>Fenner</surname>
                  <ORCID>http://orcid.org/0000-0003-1419-2405</ORCID>
                </person_name>
                <person_name contributor_role="author" sequence="additional">
                  <given_name>Mercè</given_name>
                  <surname>Crosas</surname>
                  <ORCID>http://orcid.org/0000-0003-1304-1939</ORCID>
                </person_name>
                <person_name contributor_role="author" sequence="additional">
                  <given_name>Jeffrey</given_name>
                  <surname>Grethe</surname>
                  <ORCID>http://orcid.org/0000-0001-5212-7052</ORCID>
                </person_name>
                <person_name contributor_role="author" sequence="additional">
                  <given_name>David</given_name>
                  <surname>Kennedy</surname>
                  <ORCID>http://orcid.org/0000-0002-9377-0797</ORCID>
                </person_name>
                <person_name contributor_role="author" sequence="additional">
                  <given_name>Henning</given_name>
                  <surname>Hermjakob</surname>
                  <ORCID>http://orcid.org/0000-0001-8479-0262</ORCID>
                </person_name>
                <person_name contributor_role="author" sequence="additional">
                  <given_name>Philippe</given_name>
                  <surname>Rocca-Serra</surname>
                  <ORCID>http://orcid.org/0000-0001-9853-5668</ORCID>
                </person_name>
                <person_name contributor_role="author" sequence="additional">
                  <given_name>Gustavo</given_name>
                  <surname>Durand</surname>
                  <ORCID>http://orcid.org/0000-0002-2188-2570</ORCID>
                </person_name>
                <person_name contributor_role="author" sequence="additional">
                  <given_name>Robin</given_name>
                  <surname>Berjon</surname>
                  <ORCID>http://orcid.org/0000-0002-1731-5346</ORCID>
                </person_name>
                <person_name contributor_role="author" sequence="additional">
                  <given_name>Sebastian</given_name>
                  <surname>Karcher</surname>
                  <ORCID>http://orcid.org/0000-0001-8249-7388</ORCID>
                </person_name>
                <person_name contributor_role="author" sequence="additional">
                  <given_name>Maryann</given_name>
                  <surname>Martone</surname>
                  <ORCID>http://orcid.org/0000-0002-8406-3871</ORCID>
                </person_name>
                <person_name contributor_role="author" sequence="additional">
                  <given_name>Timothy</given_name>
                  <surname>Clark</surname>
                  <ORCID>http://orcid.org/0000-0003-4060-7360</ORCID>
                </person_name>
              </contributors>
              <titles>
                <title>A Data Citation Roadmap for Scholarly Data Repositories</title>
              </titles>
              <posted_date>
                <month>12</month>
                <day>28</day>
                <year>2016</year>
              </posted_date>
              <acceptance_date>
                <month>10</month>
                <day>09</day>
                <year>2017</year>
              </acceptance_date>
              <institution>
                <institution_name>bioRxiv</institution_name>
              </institution>
              <item_number item_number_type="pisa">biorxiv;097196v2</item_number>
              <jats:abstract xmlns:jats="http://www.ncbi.nlm.nih.gov/JATS1">
                <jats:title>Abstract</jats:title>
                <jats:p>
                  This article presents a practical roadmap for scholarly data repositories to implement data citation in accordance with the Joint Declaration of Data Citation Principles, a synopsis and harmonization of the recommendations of major science policy bodies. The roadmap was developed by the Repositories Expert Group, as part of the Data Citation Implementation Pilot (DCIP) project, an initiative of FORCE11.org and the NIH BioCADDIE (
                  <jats:ext-link xmlns:xlink="http://www.w3.org/1999/xlink" ext-link-type="uri" xlink:href="https://biocaddie.org">https://biocaddie.org</jats:ext-link>
                  ) program. The roadmap makes 11 specific recommendations, grouped into three phases of implementation: a) required steps needed to support the Joint Declaration of Data Citation Principles, b) recommended steps that facilitate article/data publication workflows, and c) optional steps that further improve data citation support provided by data repositories.
                </jats:p>
              </jats:abstract>
              <program xmlns="http://www.crossref.org/relations.xsd">
                <related_item>
                  <intra_work_relation relationship-type="isPreprintOf" identifier-type="doi">10.1038/s41597-019-0031-8</intra_work_relation>
                </related_item>
              </program>
              <doi_data>
                <doi>10.1101/097196</doi>
                <timestamp>2019071613381284000</timestamp>
                <resource>http://biorxiv.org/lookup/doi/10.1101/097196</resource>
                <collection property="crawler-based">
                  <item crawler="iParadigms">
                    <resource>https://syndication.highwire.org/content/doi/10.1101/097196</resource>
                  </item>
                </collection>
              </doi_data>
              <citation_list>
                <citation key="2019071613381284000_097196v2.1">
                  <journal_title>Bulletin of the American \ldots</journal_title>
                  <volume>41</volume>
                  <issue>3</issue>
                  <first_page>43</first_page>
                  <cYear>2015</cYear>
                  <article_title>An introduction to the joint principles for data citation</article_title>
                </citation>
                <citation key="2019071613381284000_097196v2.2">
                  <unstructured_citation>Altman, M. , &amp; Crosas, M. (2013). The Evolution of Data Citation: From Principles to Implementation. IASSIST Quarterly. Retrieved from http://scholar.harvard.edu/mercecrosas/publications/evolution-data-citation-principles-implementation</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.3">
                  <unstructured_citation>BioSchemas. (2016). Retrieved December 22, 2016, from http://bioschemas.org/</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.4">
                  <doi provider="crossref">10.2481/dsj.OSOM13-043</doi>
                  <unstructured_citation>CODATA-ICSTI Task Group on Data Citation Standards and Practice. (2013). Out of Cite, Out of Mind: The Current State of Practice, Policy, and Technology for the Citation of Data. Data Science Journal, 12(0). https://doi.org/10.2481/dsj.OSOM13-043</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.5">
                  <unstructured_citation>Data Citation Synthesis Group. (2014). Data Citation Synthesis Group. (2014). Joint Declaration of Data Citation Principles. Force11. https://doi.org/10.25490/a97f-egyk</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.6">
                  <unstructured_citation>Data Citations: A Primer. (2016). Retrieved December 22, 2016, from http://force11.github.io/data-citation-primer/</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.7">
                  <unstructured_citation>DataCite Metadata Working. (2016). DataCite Metadata Schema for the Publication and Citation of Research Data v4.0. DataCite. Retrieved from http://search.datacite.org/works/10.5438/0013</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.8">
                  <unstructured_citation>DataCite Search. (2016). Retrieved December 22, 2016, from https://search.datacite.org/</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.9">
                  <unstructured_citation>DataMed | bioCADDIE DDI. (2016). Retrieved December 22, 2016, from https://datamed.org/</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.10">
                  <unstructured_citation>Dataset - schema.org. (2016). Retrieved December 12, 2016, from https://schema.org/Dataset</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.11">
                  <unstructured_citation>Dublin Core Metadata Element Set, Version 1.1. (2012). Retrieved December 22, 2016, from http://dublincore.org/documents/2012/06/14/dces/</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.12">
                  <unstructured_citation>ELIXIR Data for life. (2016). Retrieved December 22, 2016, from https://www.elixir-europe.org/</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.13">
                  <unstructured_citation>Hammond, T. , Hannay, T. , &amp; Lund, B. (2004). RDF Site Summary 1.0 Modules: PRISM.</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.14">
                  <unstructured_citation>Publishing Requirements for Industry Standard Metadata (PRISM). Retrieved from http://purl.org/rss/1.0/modules/prism/</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.15">
                  <doi provider="crossref">10.3389/fninf.2016.00034</doi>
                  <unstructured_citation>Honor, L. B. , Haselgrove, C. , Frazier, J. A. , &amp; Kennedy, D. N. (2016). Data Citation in Neuroimaging: Proposed Best Practices for Data Identification and Attribution. Frontiers in Neuroinformatics, 10. https://doi.org/10.3389/fninf.2016.00034</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.16">
                  <unstructured_citation>King, Gary , &amp; Altman, Micah . (2007). A Proposed Standard for the Scholarly Citation of Quantitative Data. https://doi.org/10.1045/march2007-altman</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.17">
                  <doi>10.15252/msb.20156658</doi>
                </citation>
                <citation key="2019071613381284000_097196v2.18">
                  <unstructured_citation>Prefix Commons. (2016). Retrieved December 22, 2016, from https://github.com/prefixcommons/prefixes</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.19">
                  <unstructured_citation>RFC 3986 - Uniform Resource Identifier (URI): Generic Syntax. (2005). Retrieved December 22, 2016, from http://www.rfc-base.org/rfc-3986.html</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.20">
                  <doi provider="crossref">10.1038/sdata.2017.59</doi>
                  <unstructured_citation>Sansone, A. , Gonzalez-Beltran, A. , &amp; Rocca-Serra, P. (2016). DATS, the data tag suite to enable discoverability of datasets. Scientific Data 4, Article number: 170059 (2017) https://doi.org/10.1038/sdata.2017.59</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.21">
                  <journal_title>PeerJ Computer Science</journal_title>
                  <volume>2</volume>
                  <first_page>e86</first_page>
                  <cYear>2016</cYear>
                  <doi provider="crossref">10.7717/peerj-cs.86</doi>
                  <article_title>Software citation principles</article_title>
                </citation>
                <citation key="2019071613381284000_097196v2.22">
                  <journal_title>PeerJ Computer Science</journal_title>
                  <volume>1</volume>
                  <first_page>e1</first_page>
                  <cYear>2015</cYear>
                  <doi provider="crossref">10.7717/peerj-cs.1</doi>
                  <article_title>Achieving human and machine accessibility of cited data in scholarly publications</article_title>
                </citation>
                <citation key="2019071613381284000_097196v2.23">
                  <doi>10.1126/science.aah6168</doi>
                </citation>
                <citation key="2019071613381284000_097196v2.24">
                  <unstructured_citation>Treloar, A. (2011). Den Haag Persistent Object Identifier – Linked Open Data Manifesto. Zenodo. https://doi.org/10.5281/zenodo.55666</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.25">
                  <unstructured_citation>Uhlir, P. E. (Ed.). (2012). For Attribution: Developing Data Attribution and Citation Practices and Standards: Summary of an International Workshop. Retrieved from https://www.nap.edu/catalog/13564/for-attribution-developing-data-attribution-and-citation-practices-and-standards</unstructured_citation>
                </citation>
                <citation key="2019071613381284000_097196v2.26">
                  <doi provider="crossref">10.1045/november2015-vandesompel</doi>
                  <unstructured_citation>Van de Sompel, H. , &amp; Nelson, M. L. (2015). Reminiscing About 15 Years of Interoperability Efforts. D-Lib Magazine, 21(11/12). https://doi.org/10.1045/november2015-vandesompel</unstructured_citation>
                </citation>
              </citation_list>
            </posted_content>
          </crossref>
        </doi_record>
      </query>
    </body>
  </query_result>
</crossref_result>
+    http_version:
+  recorded_at: Wed, 01 Jul 2020 02:59:51 GMT
+recorded_with: VCR 3.0.3

data/spec/readers/bibtex_reader_spec.rb

@@ -36,7 +36,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.titles).to eq([{"title"=>"Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"}])
       expect(subject.descriptions.first["description"]).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 3.0 Unported",
-        "rightsIdentifier"=>"CC-BY-3.0",
+        "rightsIdentifier"=>"cc-by-3.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by/3.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])

data/spec/readers/codemeta_reader_spec.rb

@@ -37,7 +37,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("DataCite")
       expect(subject.rights_list).to eq([{"rights"=>"MIT License",
-        "rightsIdentifier"=>"MIT",
+        "rightsIdentifier"=>"mit",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://opensource.org/licenses/MIT",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -78,7 +78,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2016")
       expect(subject.publisher).to eq("https://cran.r-project.org")
       expect(subject.rights_list).to eq([{"rights"=>"Apache License 2.0",
-        "rightsIdentifier"=>"Apache-2.0",
+        "rightsIdentifier"=>"apache-2.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"http://www.apache.org/licenses/LICENSE-2.0",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -107,7 +107,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("DataCite")
       expect(subject.rights_list).to eq([{"rights"=>"MIT License",
-        "rightsIdentifier"=>"MIT",
+        "rightsIdentifier"=>"mit",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://opensource.org/licenses/MIT",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -129,7 +129,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2018")
       expect(subject.publisher).to eq("DataCite")
       expect(subject.rights_list).to eq([{"rights"=>"MIT License",
-        "rightsIdentifier"=>"MIT",
+        "rightsIdentifier"=>"mit",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://opensource.org/licenses/MIT",
         "schemeUri"=>"https://spdx.org/licenses/"}])

data/spec/readers/crossref_reader_spec.rb

@@ -24,7 +24,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creators.length).to eq(5)
       expect(subject.creators.first).to eq("nameType"=>"Personal", "name"=>"Sankar, Martial", "givenName"=>"Martial", "familyName"=>"Sankar", "affiliation" => [{"name"=>"Department of Plant Molecular Biology, University of Lausanne, Lausanne, Switzerland"}])
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 3.0 Unported",
-        "rightsIdentifier"=>"CC-BY-3.0",
+        "rightsIdentifier"=>"cc-by-3.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by/3.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -61,7 +61,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.contributors).to eq("contributorType"=>"Editor", "familyName"=>"Janbon", "givenName"=>"Guilhem", "name"=>"Janbon, Guilhem", "nameType"=>"Personal")
       expect(subject.titles).to eq([{"title"=>"Triose Phosphate Isomerase Deficiency Is Caused by Altered Dimerization–Not Catalytic Inactivity–of the Mutant Enzymes"}])
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International",
-        "rightsIdentifier"=>"CC-BY-4.0",
+        "rightsIdentifier"=>"cc-by-4.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -86,7 +86,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creators.first).to eq("familyName"=>"Fortes", "givenName"=>"Ana Margarida", "name"=>"Fortes, Ana Margarida", "nameType"=>"Personal")
       expect(subject.titles).to eq([{"title"=>"Transcriptional Modulation of Polyamine Metabolism in Fruit Species Under Abiotic and Biotic Stress"}])
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International",
-        "rightsIdentifier"=>"CC-BY-4.0",
+        "rightsIdentifier"=>"cc-by-4.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -205,7 +205,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creators.length).to eq(7)
       expect(subject.creators[2]).to eq("nameType"=>"Personal", "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0003-2043-4925", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "name"=>"Hernandez, Beatriz", "givenName"=>"Beatriz", "familyName"=>"Hernandez", "affiliation" => [{"name"=>"War Related Illness and Injury Study Center (WRIISC) and Mental Illness Research Education and Clinical Center (MIRECC), Department of Veterans Affairs, Palo Alto, CA 94304, USA"}, {"name"=>"Department of Psychiatry and Behavioral Sciences, Stanford University School of Medicine, Stanford, CA 94304, USA"}])
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 3.0 Unported",
-        "rightsIdentifier"=>"CC-BY-3.0",
+        "rightsIdentifier"=>"cc-by-3.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by/3.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])

data/spec/readers/datacite_reader_spec.rb

@@ -32,7 +32,7 @@ describe Bolognese::Metadata, vcr: true do
             "Ollomo B, Durand P, Prugnolle F, Douzery EJP, Arnathau C, Nkoghe D, Leroy E, Renaud F (2009) A new malaria agent in African hominids. PLoS Pathogens 5(5): e1000446.",
          "identifierType"=>"citation"}])
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Zero v1.0 Universal",
-        "rightsIdentifier"=>"CC0-1.0",
+        "rightsIdentifier"=>"cc0-1.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -125,7 +125,7 @@ describe Bolognese::Metadata, vcr: true do
           {"identifier"=>
            "https://schema.datacite.org/meta/kernel-4.2/example/datacite-example-full-v4.2.xml",
            "identifierType"=>"URL"}])
-      expect(subject.rights_list).to eq([{"lang"=>"en-US", "rights"=>"Creative Commons Zero v1.0 Universal", "rightsIdentifier"=>"CC0-1.0", "rightsIdentifierScheme"=>"SPDX", "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode", "schemeUri"=>"https://spdx.org/licenses/"}])
+      expect(subject.rights_list).to eq([{"lang"=>"en-US", "rights"=>"Creative Commons Zero v1.0 Universal", "rightsIdentifier"=>"cc0-1.0", "rightsIdentifierScheme"=>"SPDX", "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode", "schemeUri"=>"https://spdx.org/licenses/"}])
       expect(subject.publication_year).to eq("2014")
       expect(subject.contributors).to eq([{"name"=>"Starr, Joan", "givenName"=>"Joan", "familyName"=>"Starr", "nameIdentifiers"=>[{"nameIdentifier"=>"https://orcid.org/0000-0002-7285-027X", "schemeUri"=>"https://orcid.org", "nameIdentifierScheme"=>"ORCID"}], "affiliation"=>
         [{"affiliationIdentifier"=>"https://ror.org/03yrm5c26",
@@ -199,7 +199,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.descriptions.first["description"]).to start_with("This tools are used to analyse the data produced by the Crosssover Experiment")
       expect(subject.rights_list).to eq([{"rights"=>
         "Creative Commons Attribution Non Commercial Share Alike 4.0 International",
-        "rightsIdentifier"=>"CC-BY-NC-SA-4.0",
+        "rightsIdentifier"=>"cc-by-nc-sa-4.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"},
@@ -229,7 +229,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.titles).to eq([{"title"=>"RAIN v1"}])
       expect(subject.descriptions.first["description"]).to start_with("<b>RAIN: RNA–protein Association and Interaction Networks")
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International",
-        "rightsIdentifier"=>"CC-BY-4.0",
+        "rightsIdentifier"=>"cc-by-4.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -264,7 +264,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.titles).to eq([{"title"=>"Drosophila melanogaster African Wings"}])
       expect(subject.descriptions.first["description"]).to start_with("These are raw wing images from <i>Drosophila melanogaster</i>")
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International",
-        "rightsIdentifier"=>"CC-BY-4.0",
+        "rightsIdentifier"=>"cc-by-4.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -704,7 +704,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
       expect(subject.rights_list).to eq([{"lang"=>"eng",
         "rights"=>"Creative Commons Attribution No Derivatives 2.0 Generic",
-        "rightsIdentifier"=>"CC-BY-ND-2.0",
+        "rightsIdentifier"=>"cc-by-nd-2.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -733,7 +733,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution No Derivatives 2.0 Generic",
-        "rightsIdentifier"=>"CC-BY-ND-2.0",
+        "rightsIdentifier"=>"cc-by-nd-2.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -762,7 +762,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.related_identifiers.length).to eq(4)
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"19478877", "relatedIdentifierType"=>"PMID", "relationType"=>"IsReferencedBy")
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Zero v1.0 Universal",
-        "rightsIdentifier"=>"CC0-1.0",
+        "rightsIdentifier"=>"cc0-1.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -791,7 +791,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.related_identifiers.length).to eq(1)
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution No Derivatives 2.0 Generic",
-        "rightsIdentifier"=>"CC-BY-ND-2.0",
+        "rightsIdentifier"=>"cc-by-nd-2.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -848,7 +848,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
       expect(subject.rights_list).to eq([{"lang"=>"eng",
         "rights"=>"Creative Commons Attribution No Derivatives 2.0 Generic",
-        "rightsIdentifier"=>"CC-BY-ND-2.0",
+        "rightsIdentifier"=>"cc-by-nd-2.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])

data/spec/utils_spec.rb

@@ -512,25 +512,25 @@ describe Bolognese::Metadata, vcr: true do
     it "name_to_spdx exists" do
       name = "Creative Commons Attribution 4.0 International"
       response = subject.name_to_spdx(name)
-      expect(response).to eq({"rights"=>"Creative Commons Attribution 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode", "rightsIdentifier"=>"CC-BY-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/"})
+      expect(response).to eq({"rights"=>"Creative Commons Attribution 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode", "rightsIdentifier"=>"cc-by-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/"})
     end
 
     it "name_to_spdx id" do
       name = "CC-BY-4.0"
       response = subject.name_to_spdx(name)
-      expect(response).to eq({"rights"=>"Creative Commons Attribution 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode", "rightsIdentifier"=>"CC-BY-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/"})
+      expect(response).to eq({"rights"=>"Creative Commons Attribution 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode", "rightsIdentifier"=>"cc-by-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/"})
     end
 
     it "hsh_to_spdx id" do
-      hsh = { "rightsIdentifier" => "CC-BY-4.0" }
+      hsh = { "rightsIdentifier" => "cc-by-4.0" }
       response = subject.hsh_to_spdx(hsh)
-      expect(response).to eq({"rights"=>"Creative Commons Attribution 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode", "rightsIdentifier"=>"CC-BY-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/"})
+      expect(response).to eq({"rights"=>"Creative Commons Attribution 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode", "rightsIdentifier"=>"cc-by-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/"})
     end
 
     it "hsh_to_spdx url" do
       hsh = { "rightsURI" => "http://creativecommons.org/licenses/by-nc/4.0/legalcode" }
       response = subject.hsh_to_spdx(hsh)
-      expect(response).to eq("rights"=>"Creative Commons Attribution Non Commercial 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by-nc/4.0/legalcode", "rightsIdentifier"=>"CC-BY-NC-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/")
+      expect(response).to eq("rights"=>"Creative Commons Attribution Non Commercial 4.0 International", "rightsUri"=>"https://creativecommons.org/licenses/by-nc/4.0/legalcode", "rightsIdentifier"=>"cc-by-nc-4.0", "rightsIdentifierScheme"=>"SPDX", "schemeUri"=>"https://spdx.org/licenses/")
     end
 
     it "hsh_to_spdx not found" do

data/spec/writers/crosscite_writer_spec.rb

@@ -15,7 +15,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(crosscite.fetch("related_identifiers").first).to eq("relatedIdentifier"=>"2050-084X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
       expect(crosscite.fetch("related_identifiers").last).to eq("relatedIdentifier"=>"10.1038/ncb2764", "relatedIdentifierType"=>"DOI", "relationType"=>"References")
       expect(crosscite.fetch("rights_list")).to eq([{"rights"=>"Creative Commons Attribution 3.0 Unported",
-        "rightsIdentifier"=>"CC-BY-3.0",
+        "rightsIdentifier"=>"cc-by-3.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by/3.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])

data/spec/writers/datacite_json_writer_spec.rb

@@ -14,7 +14,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.fetch("relatedIdentifiers").length).to eq(27)
       expect(datacite.fetch("relatedIdentifiers").first).to eq("relatedIdentifier"=>"2050-084X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
       expect(datacite.fetch("rightsList")).to eq([{"rights"=>"Creative Commons Attribution 3.0 Unported",
-        "rightsIdentifier"=>"CC-BY-3.0",
+        "rightsIdentifier"=>"cc-by-3.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by/3.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])

data/spec/writers/datacite_writer_spec.rb

@@ -14,7 +14,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").length).to eq(27)
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "__content__"=>"2050-084X", "resourceTypeGeneral"=>"Collection")
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier")[1]).to eq("relatedIdentifierType"=>"DOI", "relationType"=>"References", "__content__"=>"10.1038/nature02100")
-      expect(datacite.dig("rightsList", "rights")).to eq("rightsURI"=>"https://creativecommons.org/licenses/by/3.0/legalcode", "rightsIdentifier"=>"CC-BY-3.0", "rightsIdentifierScheme"=>"SPDX", "schemeURI"=>"https://spdx.org/licenses/", "__content__"=>"Creative Commons Attribution 3.0 Unported")
+      expect(datacite.dig("rightsList", "rights")).to eq("rightsURI"=>"https://creativecommons.org/licenses/by/3.0/legalcode", "rightsIdentifier"=>"cc-by-3.0", "rightsIdentifierScheme"=>"SPDX", "schemeURI"=>"https://spdx.org/licenses/", "__content__"=>"Creative Commons Attribution 3.0 Unported")
       expect(datacite.dig("fundingReferences", "fundingReference").count).to eq(4)
       expect(datacite.dig("fundingReferences", "fundingReference").last).to eq("funderName"=>"University of Lausanne", "funderIdentifier" => {"funderIdentifierType"=>"Crossref Funder ID", "__content__"=>"https://doi.org/10.13039/501100006390"})
     end
@@ -161,7 +161,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creators.first).to eq("nameType"=>"Personal", "familyName" => "Paglione", "givenName" => "Laura", "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0003-3188-6273", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "name" => "Paglione, Laura", "affiliation" => [])
       expect(subject.titles).to eq([{"title"=>"Recommendation of: ORCID Works Metadata Working Group"}])
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Zero v1.0 Universal",
-        "rightsIdentifier"=>"CC0-1.0",
+        "rightsIdentifier"=>"cc0-1.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -187,7 +187,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creators.first).to eq("nameType" => "Personal", "familyName" => "Paglione", "givenName" => "Laura", "name" => "Paglione, Laura", "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0003-3188-6273", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}],"affiliation" => [])
       expect(subject.titles).to eq([{"title"=>"Recommendation of: ORCID Works Metadata Working Group"}])
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Zero v1.0 Universal",
-        "rightsIdentifier"=>"CC0-1.0",
+        "rightsIdentifier"=>"cc0-1.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -216,7 +216,7 @@ describe Bolognese::Metadata, vcr: true do
          "Ollomo B, Durand P, Prugnolle F, Douzery EJP, Arnathau C, Nkoghe D, Leroy E, Renaud F (2009) A new malaria agent in African hominids. PLoS Pathogens 5(5): e1000446.",
          "identifierType"=>"citation"}])
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Zero v1.0 Universal",
-        "rightsIdentifier"=>"CC0-1.0",
+        "rightsIdentifier"=>"cc0-1.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -243,7 +243,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.titles).to eq([{"title"=>"Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek meteorological data, soil moisture and temperature, snow depth and air temperature"}])
       expect(subject.identifiers).to eq([{"identifier"=>"https://doi.org/10.6071/z7wc73", "identifierType"=>"DOI"}])
       expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International",
-        "rightsIdentifier"=>"CC-BY-4.0",
+        "rightsIdentifier"=>"cc-by-4.0",
         "rightsIdentifierScheme"=>"SPDX",
         "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode",
         "schemeUri"=>"https://spdx.org/licenses/"}])
@@ -306,7 +306,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").length).to eq(27)
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("__content__"=>"2050-084X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier")[1]).to eq("relatedIdentifierType"=>"DOI", "relationType"=>"References", "__content__"=>"10.1038/nature02100")
-      expect(datacite.dig("rightsList", "rights")).to eq("rightsURI"=>"https://creativecommons.org/licenses/by/3.0/legalcode", "rightsIdentifier"=>"CC-BY-3.0", "rightsIdentifierScheme"=>"SPDX", "schemeURI"=>"https://spdx.org/licenses/", "__content__"=>"Creative Commons Attribution 3.0 Unported")
+      expect(datacite.dig("rightsList", "rights")).to eq("rightsURI"=>"https://creativecommons.org/licenses/by/3.0/legalcode", "rightsIdentifier"=>"cc-by-3.0", "rightsIdentifierScheme"=>"SPDX", "schemeURI"=>"https://spdx.org/licenses/", "__content__"=>"Creative Commons Attribution 3.0 Unported")
       expect(datacite.dig("fundingReferences", "fundingReference").count).to eq(4)
       expect(datacite.dig("fundingReferences", "fundingReference").last).to eq("funderName"=>"University of Lausanne", "funderIdentifier" => {"funderIdentifierType"=>"Crossref Funder ID", "__content__"=>"https://doi.org/10.13039/501100006390"})
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.11
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -34,22 +34,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -1089,6 +1083,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/sanitize/should_only_keep_specific_tags.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/sanitize/should_remove_a_tags.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/hsh_to_spdx_id.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/hsh_to_spdx_id_lowercase.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/hsh_to_spdx_not_found.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/hsh_to_spdx_url.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/name_to_spdx_exists.yml