bolognese 1.8.12 → 1.9.2

data/spec/fixtures/datacite-example-dissertation-v4.4.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://datacite.org/schema/kernel-4" xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4.4/metadata.xsd">
+  <identifier identifierType="DOI">10.5072/100044</identifier>
+  <creators>
+    <creator>
+      <creatorName nameType="Personal">Luo, R</creatorName>
+    </creator>
+    <creator>
+      <creatorName nameType="Personal">Liu, B</creatorName>
+    </creator>
+    <creator>
+      <creatorName nameType="Personal">Xie, Y</creatorName>
+    </creator>
+    <creator>
+      <creatorName nameType="Personal">Li, Z</creatorName>
+    </creator>
+  </creators>
+  <titles>
+    <title xml:lang="en">
+      Software and supporting material for "SOAPdenovo2: An empirically improved memory-efficient short read de novo assembly"
+    </title>
+  </titles>
+  <publisher xml:lang="en">GigaScience Database</publisher>
+  <publicationYear>2012</publicationYear>
+  <subjects>
+    <subject xml:lang="en">DNA (Genetics)</subject>
+    <subject xml:lang="en">Computer Program</subject>
+  </subjects>
+  <dates>
+    <date dateType="Available">2012-12-13</date>
+  </dates>
+  <language>en</language>
+  <resourceType resourceTypeGeneral="Dissertation"></resourceType>
+  <relatedIdentifiers>
+    <relatedIdentifier relatedIdentifierType="DOI" relationType="IsReferencedBy">10.5072/2047-217X-1-1</relatedIdentifier>
+    <relatedIdentifier relatedIdentifierType="DOI" relationType="Compiles">10.5072/100038</relatedIdentifier>
+  </relatedIdentifiers>
+  <sizes>
+    <size>31 MB</size>
+  </sizes>
+  <rightsList>
+    <rights xml:lang="en-US" schemeURI="https://spdx.org/licenses/" rightsIdentifierScheme="SPDX" rightsIdentifier="CC0 1.0" rightsURI="http://creativecommons.org/publicdomain/zero/1.0/"/>
+  </rightsList>
+  <descriptions>
+    <description xml:lang="en" descriptionType="Abstract">
+      SOAPdenovo2 is the latest de novo genome assembly package from BGI's SOAP (short oligonucleotide analysis package) suite of tools (homepage here: http://soap.genomics.org.cn/). Compared to SOAPdenovo1, this new version has the advantage of a new
+      algorithm design that reduces memory consumption in graph construction, resolves more repeat regions in contig assembly, increases coverage and length in scaffold construction, improves gap closure, and is optimized for large genomes. Using new
+      sequencing data from the YH (Homo sapiens) diploid genome - the first sequenced Han Chinese individual, an updated assembly was produced (see dataset here: doi:10.5524/100038), with the N50 scores for the contig and scaffold being 3-fold and 50-fold
+      longer, respectively, than the first published version. The genome coverage increased from 81.16% to 93.91%, and memory consumption was ~2/3 times lower during the point of largest memory consumption. Benchmarking with Assemblathon1 and GAGE datasets
+      shows that SOAPdenovo2 greatly surpasses its predecessor SOAPdenovo1 and is competitive to other assemblers on both assembly length and accuracy. In order to facilitate readers to repeat and recreate these findings, configured packages with the
+      compressed pipelines containing all of the necessary shell scripts and tools are available from the BGI FTP server (ftp://public.genomics.org.cn/BGI/SOAPdenovo2). The latest version of SOAPdenovo2 is available from Sourceforge:
+      http://soapdenovo2.sourceforge.net/ These pipelines will also soon be made available from our data platform as Galaxy workflows: http://galaxy.cbiit.cuhk.edu.hk/
+    </description>
+  </descriptions>
+</resource>

data/spec/fixtures/datacite-example-full-v4.4.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://datacite.org/schema/kernel-4" xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4.4/metadata.xsd">
+  <identifier identifierType="DOI">10.5072/example-full</identifier>
+  <creators>
+    <creator>
+      <creatorName nameType="Personal">Miller, Elizabeth</creatorName>
+      <givenName>Elizabeth</givenName>
+      <familyName>Miller</familyName>
+      <nameIdentifier schemeURI="https://orcid.org/" nameIdentifierScheme="ORCID">0000-0001-5000-0007</nameIdentifier>
+      <affiliation>DataCite</affiliation>
+    </creator>
+  </creators>
+  <titles>
+    <title xml:lang="en-US">Full DataCite XML Example</title>
+    <title xml:lang="en-US" titleType="Subtitle">Demonstration of DataCite Properties.</title>
+  </titles>
+  <publisher xml:lang="en">DataCite</publisher>
+  <publicationYear>2014</publicationYear>
+  <subjects>
+    <subject xml:lang="en-US" schemeURI="http://dewey.info/" subjectScheme="dewey" classificationCode="000">computer science</subject>
+  </subjects>
+  <contributors>
+    <contributor contributorType="ProjectLeader">
+      <contributorName>Starr, Joan</contributorName>
+      <givenName>Joan</givenName>
+      <familyName>Starr</familyName>
+      <nameIdentifier schemeURI="https://orcid.org/" nameIdentifierScheme="ORCID">0000-0002-7285-027X</nameIdentifier>
+      <affiliation>California Digital Library</affiliation>
+    </contributor>
+  </contributors>
+  <dates>
+    <date dateType="Updated" dateInformation="Updated with 4.4 properties">2021-01-26</date>
+  </dates>
+  <language>en-US</language>
+  <resourceType resourceTypeGeneral="Software">XML</resourceType>
+  <alternateIdentifiers>
+    <alternateIdentifier alternateIdentifierType="URL">https://schema.datacite.org/meta/kernel-4.4/example/datacite-example-full-v4.4.xml</alternateIdentifier>
+  </alternateIdentifiers>
+  <relatedIdentifiers>
+    <relatedIdentifier relatedIdentifierType="URL" relationType="HasMetadata" relatedMetadataScheme="citeproc+json" schemeURI="https://github.com/citation-style-language/schema/raw/master/csl-data.json">https://data.datacite.org/application/citeproc+json/10.5072/example-full</relatedIdentifier>
+    <relatedIdentifier relatedIdentifierType="arXiv" relationType="IsReviewedBy" resourceTypeGeneral="Text">arXiv:0706.0001</relatedIdentifier>
+  </relatedIdentifiers>
+  <sizes>
+    <size>4 kB</size>
+  </sizes>
+  <formats>
+    <format>application/xml</format>
+  </formats>
+  <version>4.2</version>
+  <rightsList>
+    <rights xml:lang="en-US" schemeURI="https://spdx.org/licenses/" rightsIdentifierScheme="SPDX" rightsIdentifier="CC0 1.0" rightsURI="https://creativecommons.org/publicdomain/zero/1.0/"/>
+  </rightsList>
+  <descriptions>
+    <description xml:lang="en-US" descriptionType="Abstract">XML example of all DataCite Metadata Schema v4.4 properties.</description>
+  </descriptions>
+  <geoLocations>
+    <geoLocation>
+      <geoLocationPlace>Atlantic Ocean</geoLocationPlace>
+      <geoLocationPoint>
+        <pointLongitude>-67.302</pointLongitude>
+        <pointLatitude>31.233</pointLatitude>
+      </geoLocationPoint>
+      <geoLocationBox>
+        <westBoundLongitude>-71.032</westBoundLongitude>
+        <eastBoundLongitude>-68.211</eastBoundLongitude>
+        <southBoundLatitude>41.090</southBoundLatitude>
+        <northBoundLatitude>42.893</northBoundLatitude>
+      </geoLocationBox>
+      <geoLocationPolygon>
+        <polygonPoint>
+          <pointLatitude>41.991</pointLatitude>
+          <pointLongitude>-71.032</pointLongitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLatitude>42.893</pointLatitude>
+          <pointLongitude>-69.622</pointLongitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLatitude>41.991</pointLatitude>
+          <pointLongitude>-68.211</pointLongitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLatitude>41.090</pointLatitude>
+          <pointLongitude>-69.622</pointLongitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLatitude>41.991</pointLatitude>
+          <pointLongitude>-71.032</pointLongitude>
+        </polygonPoint>
+      </geoLocationPolygon>
+    </geoLocation>
+  </geoLocations>
+  <fundingReferences>
+    <fundingReference>
+      <funderName>National Science Foundation</funderName>
+      <funderIdentifier funderIdentifierType="Crossref Funder ID">https://doi.org/10.13039/100000001</funderIdentifier>
+      <awardNumber>CBET-106</awardNumber>
+      <awardTitle>Full DataCite XML Example</awardTitle>
+    </fundingReference>
+  </fundingReferences>
+  <relatedItems>
+    <relatedItem relationType="IsPublishedIn" relatedItemType="Journal">
+      <relatedItemIdentifier relatedItemIdentifierType="DOI">10.1016/j.physletb.2017.11.044</relatedItemIdentifier>
+      <titles>
+        <title>Physics letters / B</title>
+      </titles>
+      <publicationYear>2018</publicationYear>
+      <volume>776</volume>
+      <firstPage>249</firstPage>
+      <lastPage>264</lastPage>
+    </relatedItem>
+  </relatedItems>
+</resource>

data/spec/fixtures/datacite-example-relateditems.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://datacite.org/schema/kernel-4" xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4.4/metadata.xsd">
+  <identifier identifierType="DOI">10.5072/example-full</identifier>
+  <creators>
+    <creator>
+      <creatorName nameType="Personal">Hallett, Richard</creatorName>
+      <givenName>Richard</givenName>
+      <familyName>Hallett</familyName>
+    </creator>
+  </creators>
+  <titles>
+    <title xml:lang="en-US">Example for related items</title>
+  </titles>
+  <publisher xml:lang="en">DataCite</publisher>
+  <publicationYear>2021</publicationYear>
+  <dates>
+    <date dateType="Updated" dateInformation="Updated with 4.4 properties">2021-01-26</date>
+  </dates>
+  <language>en-US</language>
+  <resourceType resourceTypeGeneral="Software">XML</resourceType>
+  <version>1</version>
+  <descriptions>
+    <description xml:lang="en-US" descriptionType="Abstract">A test example for related items</description>
+  </descriptions>
+  <relatedItems>
+    <relatedItem relationType="IsPublishedIn" relatedItemType="Journal">
+      <relatedItemIdentifier
+        relatedItemIdentifierType="DOI"
+        relatedMetadataScheme="citeproc+json"
+        schemeURI="https://github.com/citation-style-language/schema/raw/master/csl-data.json"
+        schemeType="URL">10.5072/john-smiths-1234</relatedItemIdentifier>
+      <creators>
+          <creator>
+              <creatorName nameType="Personal">Smith, John</creatorName>
+              <givenName>John</givenName>
+              <familyName>Smith</familyName>
+          </creator>
+      </creators>
+      <titles>
+        <title>Understanding the fictional John Smith</title>
+        <title titleType="Subtitle">A detailed look</title>
+      </titles>
+      <publicationYear>1776</publicationYear>
+      <volume>776</volume>
+      <issue>1</volume>
+      <number numberType="Chapter">1</number>
+      <firstPage>50</firstPage>
+      <lastPage>60</lastPage>
+      <publisher>Example Inc</publisher>
+      <edition>1</edition>
+      <contributors>
+        <contributor contributorType="ProjectLeader">
+            <contributorName>Richard, Hallett</contributorName>
+            <givenName>Richard</givenName>
+            <familyName>Hallett</familyName>
+        </contributor>
+      </contributors>
+    </relatedItem>
+  </relatedItems>
+</resource>

data/spec/fixtures/datacite-example-xs-string.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<resource xmlns="http://datacite.org/schema/kernel-2.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://datacite.org/schema/kernel-2.2 http://schema.datacite.org/meta/kernel-2.2/metadata.xsd"><identifier identifierType="DOI">10.4225/13/511C71F8612C3</identifier>
+    <creators>
+        <creator>
+            <creatorName>Claire L O?Brien</creatorName>
+        </creator>
+        <creator>
+            <creatorName>Gwen E Allison</creatorName>
+        </creator>
+        <creator>
+            <creatorName>Florian Grimpen</creatorName>
+        </creator>
+        <creator>
+            <creatorName>Paul Pavli</creatorName>
+        </creator>
+    </creators>
+    <titles>
+        <title>Impact of Colonoscopy Bowel Preparation on Intestinal Microbiota</title>
+    </titles>
+    <publisher>The Australian National University Data Commons</publisher>
+    <publicationYear>2013</publicationYear>
+    <sizes>
+        <size xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">1.7 GB</size>
+    </sizes>
+    <formats>
+        <format xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">application/xml</format>
+    </formats>
+</resource>

data/spec/fixtures/datacite-geolocationpolygons-multiple.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://datacite.org/schema/kernel-4" xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4.4/metadata.xsd">
+<identifier identifierType="DOI">10.5072/multiplegeopolygons</identifier>
+    <creators>
+        <creator>
+            <creatorName>John Smithy</creatorName>
+        </creator>
+    </creators>
+    <titles>
+        <title>Multiple Geopolygon testing</title>
+    </titles>
+    <resourceType resourceTypeGeneral="Software">XML</resourceType>
+    <publisher>DataCite</publisher>
+    <publicationYear>2021</publicationYear>
+    <geoLocations>
+    <geoLocation>
+      <geoLocationPolygon>
+        <polygonPoint>
+          <pointLongitude>41</pointLongitude>
+          <pointLatitude>71</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>45</pointLongitude>
+          <pointLatitude>75</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>55</pointLongitude>
+          <pointLatitude>85</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>41</pointLongitude>
+          <pointLatitude>71</pointLatitude>
+        </polygonPoint>
+      </geoLocationPolygon>
+      <geoLocationPolygon>
+        <polygonPoint>
+          <pointLongitude>65</pointLongitude>
+          <pointLatitude>80</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>55</pointLongitude>
+          <pointLatitude>75</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>45</pointLongitude>
+          <pointLatitude>73</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>65</pointLongitude>
+          <pointLatitude>80</pointLatitude>
+        </polygonPoint>
+      </geoLocationPolygon>
+    </geoLocation>
+  </geoLocations>
+</resource>

data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/article_id_as_page_number.yml

@@ -0,0 +1,100 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://doi.org/ra/10.1103
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Mozilla/5.0 (compatible; Maremma/4.7.2; mailto:info@datacite.org)
+      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:
+      Date:
+      - Mon, 12 Oct 2020 21:29:38 GMT
+      Content-Type:
+      - application/json;charset=UTF-8
+      Connection:
+      - keep-alive
+      Set-Cookie:
+      - __cfduid=db4cdafcb2a4ecdd2039ecc54bc79d52a1602538178; expires=Wed, 11-Nov-20
+        21:29:38 GMT; path=/; domain=.doi.org; HttpOnly; SameSite=Lax; Secure
+      Cf-Cache-Status:
+      - DYNAMIC
+      Cf-Request-Id:
+      - 05c051217300001f21b40ee200000001
+      Expect-Ct:
+      - max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+      Report-To:
+      - '{"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report?lkg-colo=71&lkg-time=1602538179"}],"group":"cf-nel","max_age":604800}'
+      Nel:
+      - '{"report_to":"cf-nel","max_age":604800}'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 5e13eae258061f21-FRA
+      Alt-Svc:
+      - h3-27=":443"; ma=86400, h3-28=":443"; ma=86400, h3-29=":443"; ma=86400
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        [
+          {
+            "DOI": "10.1103",
+            "RA": "Crossref"
+          }
+        ]
+    http_version:
+  recorded_at: Mon, 12 Oct 2020 21:29:38 GMT
+- request:
+    method: get
+    uri: https://api.crossref.org/works/10.1103/physrevlett.120.117701/transform/application/vnd.crossref.unixsd+xml
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Mozilla/5.0 (compatible; Maremma/4.7.2; mailto:info@datacite.org)
+      Accept:
+      - text/xml
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Link:
+      - <http://dx.doi.org/10.1103/physrevlett.120.117701>; rel="canonical", <https://link.aps.org/article/10.1103/PhysRevLett.120.117701>;
+        version="vor"; rel="item", <http://harvest.aps.org/v2/journals/articles/10.1103/PhysRevLett.120.117701/fulltext>;
+        version="vor"; rel="item", <https://link.aps.org/licenses/aps-default-license>;
+        version="vor"; rel="license"
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Headers:
+      - X-Requested-With
+      Content-Length:
+      - '15204'
+      Server:
+      - http-kit
+      Date:
+      - Mon, 12 Oct 2020 21:29:39 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="journal_article">10.1103/PhysRevLett.120.117701</doi>
        <crm-item name="publisher-name" type="string">American Physical Society (APS)</crm-item>
        <crm-item name="prefix-name" type="string">American Physical Society</crm-item>
        <crm-item name="member-id" type="number">16</crm-item>
        <crm-item name="citation-id" type="number">97150135</crm-item>
        <crm-item name="journal-id" type="number">5204</crm-item>
        <crm-item name="deposit-timestamp" type="number">20180313151848</crm-item>
        <crm-item name="owner-prefix" type="string">10.1103</crm-item>
        <crm-item name="last-update" type="date">2018-03-13T11:19:02Z</crm-item>
        <crm-item name="created" type="date">2018-03-13T11:18:56Z</crm-item>
        <crm-item name="citedby-count" type="number">25</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">
            <journal>
              <journal_metadata language="en">
                <full_title>Physical Review Letters</full_title>
                <abbrev_title>Phys. Rev. Lett.</abbrev_title>
                <issn media_type="print">0031-9007</issn>
                <issn media_type="electronic">1079-7114</issn>
                <coden>PRLTAO</coden>
              </journal_metadata>
              <journal_issue>
                <publication_date media_type="print">
                  <month>3</month>
                  <year>2018</year>
                </publication_date>
                <journal_volume>
                  <volume>120</volume>
                </journal_volume>
                <issue>11</issue>
              </journal_issue>
              <journal_article publication_type="full_text">
                <titles>
                  <title>Prediction of a Large-Gap and Switchable Kane-Mele Quantum Spin Hall Insulator</title>
                </titles>
                <contributors>
                  <person_name sequence="first" contributor_role="author">
                    <given_name>Antimo</given_name>
                    <surname>Marrazzo</surname>
                  </person_name>
                  <person_name sequence="additional" contributor_role="author">
                    <given_name>Marco</given_name>
                    <surname>Gibertini</surname>
                  </person_name>
                  <person_name sequence="additional" contributor_role="author">
                    <given_name>Davide</given_name>
                    <surname>Campi</surname>
                  </person_name>
                  <person_name sequence="additional" contributor_role="author">
                    <given_name>Nicolas</given_name>
                    <surname>Mounet</surname>
                  </person_name>
                  <person_name sequence="additional" contributor_role="author">
                    <given_name>Nicola</given_name>
                    <surname>Marzari</surname>
                  </person_name>
                </contributors>
                <publication_date media_type="online">
                  <month>3</month>
                  <day>13</day>
                  <year>2018</year>
                </publication_date>
                <publisher_item>
                  <item_number item_number_type="article-number">117701</item_number>
                </publisher_item>
                <crossmark>
                  <crossmark_version>2.0</crossmark_version>
                  <crossmark_policy>10.1103/crossmark-policy</crossmark_policy>
                  <crossmark_domains>
                    <crossmark_domain>
                      <domain>journals.aps.org</domain>
                    </crossmark_domain>
                  </crossmark_domains>
                  <crossmark_domain_exclusive>true</crossmark_domain_exclusive>
                  <custom_metadata>
                    <fr:program xmlns:fr="http://www.crossref.org/fundref.xsd" name="fundref">
                      <fr:assertion name="fundgroup">
                        <fr:assertion name="funder_name">
                          Schweizerischer Nationalfonds zur Förderung der Wissenschaftlichen Forschung
                          <fr:assertion name="funder_identifier">http://dx.doi.org/10.13039/501100001711</fr:assertion>
                        </fr:assertion>
                      </fr:assertion>
                      <fr:assertion name="fundgroup">
                        <fr:assertion name="funder_name">
                          Horizon 2020 Framework Programme
                          <fr:assertion name="funder_identifier">http://dx.doi.org/10.13039/100010661</fr:assertion>
                        </fr:assertion>
                      </fr:assertion>
                    </fr:program>
                    <ai:program xmlns:ai="http://www.crossref.org/AccessIndicators.xsd" name="AccessIndicators">
                      <ai:license_ref applies_to="vor" start_date="2018-03-13">https://link.aps.org/licenses/aps-default-license</ai:license_ref>
                    </ai:program>
                  </custom_metadata>
                </crossmark>
                <doi_data>
                  <doi>10.1103/PhysRevLett.120.117701</doi>
                  <timestamp>20180313151848</timestamp>
                  <resource>https://link.aps.org/doi/10.1103/PhysRevLett.120.117701</resource>
                  <collection property="crawler-based">
                    <item crawler="iParadigms">
                      <resource>http://harvest.aps.org/v2/journals/articles/10.1103/PhysRevLett.120.117701/fulltext</resource>
                    </item>
                  </collection>
                  <collection property="syndication">
                    <item>
                      <resource content_version="vor">https://link.aps.org/article/10.1103/PhysRevLett.120.117701</resource>
                    </item>
                  </collection>
                </doi_data>
                <citation_list>
                  <citation key="PhysRevLett.120.117701Cc1R1">
                    <doi>10.1103/PhysRevLett.61.2015</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc2R1">
                    <doi>10.1103/PhysRevLett.95.226801</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc3R1">
                    <doi>10.1103/PhysRevLett.95.146802</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc4R1">
                    <volume_title>Topological Insulators and Topological Superconductors</volume_title>
                    <author>B. A. Bernevig</author>
                    <cYear>2013</cYear>
                    <doi provider="crossref">10.1515/9781400846733</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc5R1">
                    <doi>10.1126/science.1148047</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc6R1">
                    <doi>10.1126/science.1133734</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc7R1">
                    <doi>10.1038/nmat5012</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc8R1">
                    <doi>10.1126/science.aai8142</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc9R1">
                    <doi>10.1111/j.1365-3121.2007.00783.x</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc10R1">
                    <doi>10.3749/canmin.50.2.431</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc13R1">
                    <doi>10.1088/0953-8984/21/39/395502</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc14R1">
                    <doi>10.1088/1361-648X/aa8f79</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc15R1">
                    <doi>10.1103/PhysRevB.82.081101</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc16R1">
                    <doi>10.1103/PhysRevB.81.161104</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc17R1">
                    <doi>10.1103/PhysRevLett.103.063004</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc18R1">
                    <doi>10.1103/PhysRevB.87.041108</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc19R1">
                    <doi>10.1103/PhysRevLett.102.073005</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc20R1">
                    <doi>10.1103/PhysRevLett.77.3865</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc21R1">
                    <doi>10.1103/PhysRevB.88.085117</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc24R1">
                    <doi>10.1016/j.commatsci.2013.08.053</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc26R1">
                    <doi>10.1016/j.commatsci.2014.07.043</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc27R1">
                    <doi>10.1016/j.cpc.2015.05.011</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc28R1">
                    <doi>10.1016/j.cpc.2009.02.003</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc29R1">
                    <doi>10.1016/j.cpc.2014.05.003</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc30R1">
                    <doi>10.1016/j.commatsci.2015.09.013</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc31R1">
                    <doi>10.1103/PhysRevLett.108.235502</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc33R1">
                    <doi>10.1103/RevModPhys.84.1419</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc34R1">
                    <doi>10.1103/PhysRevB.84.195430</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc36R1">
                    <doi>10.1016/j.cpc.2017.09.033</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc37R1">
                    <doi>10.1103/PhysRevB.83.235401</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc38R1">
                    <doi>10.1103/PhysRevB.95.075146</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc39R1">
                    <doi>10.1103/PhysRevB.64.115202</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc40R1">
                    <doi>10.1038/nphys4091</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc41R1">
                    <doi>10.1038/nphys4174</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc42R1">
                    <doi>10.1126/science.aan6003</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc43R1">
                    <doi>10.1088/0305-4608/15/4/009</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc44R1">
                    <doi>10.1103/PhysRevLett.95.076804</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc45R1">
                    <doi>10.1103/PhysRevB.69.035108</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc46R1">
                    <doi>10.1103/RevModPhys.73.515</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc47R1">
                    <doi>10.1103/PhysRevB.96.075448</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc48R1">
                    <doi>10.1021/acs.nanolett.7b01090</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc49R1">
                    <doi>10.1103/PhysRevB.19.3593</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc50R1">
                    <doi>10.1103/PhysRevB.53.5047</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc54R1">
                    <doi>10.1103/PhysRevLett.117.226801</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc55R1">
                    <doi>10.1103/PhysRevLett.117.246401</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc56R1">
                    <doi>10.1038/ncomms8315</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc57R1">
                    <doi>10.1038/nature23905</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc59R1">
                    <doi>10.1002/wcms.1280</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc60R1">
                    <doi>10.1103/PhysRevB.68.045407</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc61R1">
                    <doi>10.1021/nl4007479</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc62R1">
                    <doi>10.1103/PhysRevB.91.125304</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc63R1">
                    <doi>10.1103/PhysRevB.89.205417</doi>
                  </citation>
                  <citation key="PhysRevLett.120.117701Cc64R1">
                    <doi>10.1063/1.4824893</doi>
                  </citation>
                </citation_list>
              </journal_article>
            </journal>
          </crossref>
        </doi_record>
      </query>
    </body>
  </query_result>
</crossref_result>
+    http_version:
+  recorded_at: Mon, 12 Oct 2020 21:29:39 GMT
+recorded_with: VCR 3.0.3

data/spec/metadata_spec.rb

@@ -153,7 +153,7 @@ describe Bolognese::Metadata, vcr: true do
     it "missing_comma" do
       json = IO.read(fixture_path + "datacite_software_missing_comma.json")
       response = subject.jsonlint(json)
-      expect(response).to eq(["expected comma, not a string (after doi) at line 4, column 11 [parse.c:373]"])
+      expect(response).to eq(["expected comma, not a string (after doi) at line 4, column 11 [parse.c:364]"])
     end
 
     it "overlapping_keys" do

data/spec/readers/bibtex_reader_spec.rb

@@ -29,7 +29,7 @@ describe Bolognese::Metadata, vcr: true do
     it "Crossref DOI" do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceTypeGeneral"=>"Text", "resourceType"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceTypeGeneral"=>"JournalArticle", "resourceType"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
       expect(subject.creators.length).to eq(5)
       expect(subject.creators.first).to eq("familyName"=>"Sankar", "givenName"=>"Martial", "name"=>"Sankar, Martial", "nameType"=>"Personal")
@@ -52,7 +52,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be false
       expect(subject.state).to eq("not_found")
       expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
-      expect(subject.types).to eq("bibtex"=>"phdthesis", "citeproc"=>"thesis", "resourceTypeGeneral"=>"Text", "resourceType"=>"Dissertation", "ris"=>"THES", "schemaOrg"=>"Thesis")
+      expect(subject.types).to eq("bibtex"=>"phdthesis", "citeproc"=>"thesis", "resourceTypeGeneral"=>"Dissertation", "resourceType"=>"Dissertation", "ris"=>"THES", "schemaOrg"=>"Thesis")
       expect(subject.creators).to eq([{"familyName"=>"Toparlar", "givenName"=>"Y.", "name"=>"Toparlar, Y.", "nameType"=>"Personal"}])
       expect(subject.titles).to eq([{"title"=>"A multiscale analysis of the urban heat island effect: from city averaged temperatures to the energy demand of individual buildings"}])
       expect(subject.descriptions.first["description"]).to start_with("Designing the climates of cities")