bolognese 1.1.16 → 1.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29b48acd62ecd4c04faae025f18f6152f4d09a4e34892756033c502da9acc763
-  data.tar.gz: a85b153008edf234aa8203015fc3f5727d030416f8aee03a91cd43b75bb4eb9d
+  metadata.gz: 22c768dbeab4e5aa663b407e7e61cdff91294828de453edf4338fed31eed438b
+  data.tar.gz: 752a2d696388d767eb3c11219a789198168c8904010c71a9d0f474fc3cbf32d9
 SHA512:
-  metadata.gz: 53846f9d88a2bafac6b5c8c6066e3ac26872dc5a653ad33795daafb38484a96eea01fd75aafaa5f513f8602adb9ad86bb94038ef2038da4546525cb954c3059b
-  data.tar.gz: 57f66e003a4c2b069a3533ced8417a96346c5d271f638f3a9f9ff577600207be05b329a2267070b5fc80599e6cc362364bafd781b406d119f36ffe8e25101a01
+  metadata.gz: ee1fcf2e10e781c5a40a639870eb03be59fdf54de6708bafd463cc48a7ed24679429c5d54a4f30ffca772b240c01b06c1bbcc7fce78af95ae7edf4022319d7f6
+  data.tar.gz: a4fdb03f3a48bb946959cf6194cd2e749cea3a84580de0b5b0f10b9e0173970e68c20fdf5facae6fbc344283764b44ddf8990cce88e0293454f8bc4b8a5ade46

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.1.16)
+    bolognese (1.1.17)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)
@@ -76,7 +76,7 @@ GEM
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashdiff (0.4.0)
+    hashdiff (1.0.0.beta1)
     htmlentities (4.3.4)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
@@ -150,15 +150,15 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.1)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
@@ -179,10 +179,10 @@ GEM
       thread_safe (~> 0.1)
     unicode_utils (1.4.0)
     vcr (3.0.3)
-    webmock (3.5.1)
+    webmock (3.6.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -191,6 +191,7 @@ DEPENDENCIES
   bolognese!
   bundler (~> 1.0)
   codeclimate-test-reporter (~> 1.0, >= 1.0.8)
+  hashdiff (>= 1.0.0.beta1, < 2.0.0)
   rack-test (~> 0)
   rake (~> 12.0)
   rspec (~> 3.4)

data/bolognese.gemspec

@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'webmock', '~> 3.0', '>= 3.0.1'
   s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0', '>= 1.0.8'
   s.add_development_dependency 'simplecov', '~> 0.1'
+  s.add_development_dependency 'hashdiff', ['>= 1.0.0.beta1', '< 2.0.0']
 
   s.require_paths = ["lib"]
   s.files       = `git ls-files`.split($/)

data/lib/bolognese/readers/crossref_reader.rb

@@ -118,7 +118,7 @@ module Bolognese
         { "id" => id,
           "types" => types,
           "doi" => doi_from_url(doi),
-          "url" => bibliographic_metadata.dig("doi_data", "resource"),
+          "url" => parse_attributes(bibliographic_metadata.dig("doi_data", "resource"), first: true),
           "titles" => [{ "title" => parse_attributes(bibliographic_metadata.dig("titles", "title")) }],
           "identifiers" => identifiers,
           "creators" => crossref_people(bibliographic_metadata, "author"),

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.1.16"
+  VERSION = "1.1.17"
 end

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

@@ -0,0 +1,81 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://doi.org/ra/10.1038
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Mozilla/5.0 (compatible; Maremma/4.2.1; +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:
+      Date:
+      - Mon, 24 Jun 2019 06:30:54 GMT
+      Content-Type:
+      - application/json;charset=UTF-8
+      Content-Length:
+      - '54'
+      Connection:
+      - keep-alive
+      Set-Cookie:
+      - __cfduid=dfe4365de50bcf876a61ea63dd7d76a7a1561357854; expires=Tue, 23-Jun-20
+        06:30:54 GMT; path=/; domain=.doi.org; HttpOnly
+      Expect-Ct:
+      - max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 4ebca7df2e46c2c2-FRA
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        [
+          {
+            "DOI": "10.1038",
+            "RA": "Crossref"
+          }
+        ]
+    http_version: 
+  recorded_at: Mon, 24 Jun 2019 06:30:54 GMT
+- request:
+    method: get
+    uri: http://www.crossref.org/openurl/?format=unixref&id=doi:10.1038/hdy.2013.26&noredirect=true&pid=tech@datacite.org
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Mozilla/5.0 (compatible; Maremma/4.2.1; +https://github.com/datacite/maremma)
+      Accept:
+      - text/xml
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - Apache-Coyote/1.1
+      Crossref-Deployment-Name:
+      - qs5-1
+      Content-Type:
+      - text/xml;charset=UTF-8
+      Content-Language:
+      - en-US
+      Date:
+      - Mon, 24 Jun 2019 06:30:54 GMT
+      Connection:
+      - close
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        <?xml version="1.0" encoding="UTF-8"?>
<doi_records>
  <doi_record owner="10.1038" timestamp="2019-04-16 12:25:36">
    <crossref>
      <journal>
        <journal_metadata language="en">
          <full_title>Heredity</full_title>
          <abbrev_title>Heredity</abbrev_title>
          <issn media_type="print">0018-067X</issn>
          <issn media_type="electronic">1365-2540</issn>
        </journal_metadata>
        <journal_issue>
          <publication_date media_type="print">
            <month>8</month>
            <year>2013</year>
          </publication_date>
          <journal_volume>
            <volume>111</volume>
          </journal_volume>
          <issue>2</issue>
        </journal_issue>
        <journal_article publication_type="full_text">
          <titles>
            <title>Albinism in phylogenetically and geographically distinct populations of Astyanax cavefish arises through the same loss-of-function Oca2 allele</title>
          </titles>
          <contributors>
            <person_name contributor_role="author" sequence="first">
              <given_name>J B</given_name>
              <surname>Gross</surname>
            </person_name>
            <person_name contributor_role="author" sequence="additional">
              <given_name>H</given_name>
              <surname>Wilkens</surname>
            </person_name>
          </contributors>
          <publication_date media_type="online">
            <month>4</month>
            <day>10</day>
            <year>2013</year>
          </publication_date>
          <publication_date media_type="print">
            <month>8</month>
            <year>2013</year>
          </publication_date>
          <pages>
            <first_page>122</first_page>
            <last_page>130</last_page>
          </pages>
          <publisher_item>
            <identifier id_type="pii">BFhdy201326</identifier>
          </publisher_item>
          <program name="AccessIndicators">
            <license_ref applies_to="tdm">http://www.springer.com/tdm</license_ref>
          </program>
          <doi_data>
            <doi>10.1038/hdy.2013.26</doi>
            <timestamp>20190416180321490</timestamp>
            <resource content_version="vor">http://www.nature.com/articles/hdy201326</resource>
            <collection property="crawler-based">
              <item crawler="iParadigms">
                <resource mime_type="application/pdf">http://www.nature.com/articles/hdy201326.pdf</resource>
              </item>
            </collection>
            <collection property="text-mining">
              <item>
                <resource mime_type="application/pdf">http://www.nature.com/articles/hdy201326.pdf</resource>
              </item>
              <item>
                <resource mime_type="text/html">http://www.nature.com/articles/hdy201326</resource>
              </item>
            </collection>
          </doi_data>
          <citation_list>
            <citation key="BFhdy201326_CR1">
              <journal_title>An Esc Nac Cien Biol México</journal_title>
              <author>J Alvarez</author>
              <volume>4</volume>
              <first_page>263</first_page>
              <cYear>1946</cYear>
              <unstructured_citation>Alvarez J . (1946). Revisión del género Anoptichthys con descipción de una especie nueva (Pisces, Characidae). An Esc Nac Cien Biol México 4: 263–282.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR2">
              <journal_title>Curr Biol</journal_title>
              <author>R Borowsky</author>
              <volume>18</volume>
              <first_page>R23</first_page>
              <cYear>2008</cYear>
              <doi>10.1016/j.cub.2007.11.023</doi>
              <unstructured_citation>Borowsky R . (2008). Restoring sight in blind cavefish. Curr Biol 18: R23–R24.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR3">
              <journal_title>J Hered</journal_title>
              <author>R Borowsky</author>
              <volume>93</volume>
              <first_page>19</first_page>
              <cYear>2002</cYear>
              <doi>10.1093/jhered/93.1.19</doi>
              <unstructured_citation>Borowsky R, Wilkens H . (2002). Mapping a cave fish genome: Polygenic systems and regressive evolution. J Hered 93: 19–21.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR4">
              <journal_title>BMC Evol Biol</journal_title>
              <author>M Bradic</author>
              <volume>12</volume>
              <first_page>9</first_page>
              <cYear>2012</cYear>
              <doi>10.1186/1471-2148-12-9</doi>
              <unstructured_citation>Bradic M, Beerli P, García-de León FJ, Esquivel-Bobadilla S, Borowsky R . (2012). Gene flow and population structure in the Mexican blind cavefish complex (Astyanax mexicanus). BMC Evol Biol 12: 9.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR5">
              <journal_title>J Mammal</journal_title>
              <author>DH Brown</author>
              <volume>37</volume>
              <first_page>311</first_page>
              <cYear>1956</cYear>
              <doi>10.2307/1376730</doi>
              <unstructured_citation>Brown DH, Norris KS . (1956). Observations of captive and wild cetaceans. J Mammal 37: 311–326.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR6">
              <journal_title>Zoo Biol</journal_title>
              <author>S Clark</author>
              <volume>21</volume>
              <first_page>519</first_page>
              <cYear>2002</cYear>
              <doi>10.1002/zoo.10068</doi>
              <unstructured_citation>Clark S . (2002). First report of albinism in the white-spotted bamboo shark, Chiloscyllium plagiosum (Orectolobiformes: Hemiscyllidae), with a review of reported color aberrations in elasmobranchs. Zoo Biol 21: 519–524.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR7">
              <journal_title>Science</journal_title>
              <author>PF Colosimo</author>
              <volume>307</volume>
              <first_page>1928</first_page>
              <cYear>2005</cYear>
              <doi>10.1126/science.1107239</doi>
              <unstructured_citation>Colosimo PF, Hosemann KE, Balabhadra S, Villarreal G Jr, Dickson M, Grimwood J et al. (2005). Widespread parallel evolution in sticklebacks by repeated fixation of Ectodysplasin alleles. Science 307: 1928–1933.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR8">
              <author>DC Culver</author>
              <cYear>1995</cYear>
              <volume_title>Adaptation and Natural Selection in Caves: The Evolution of Gammarus minus</volume_title>
              <doi>10.4159/harvard.9780674419070</doi>
              <unstructured_citation>Culver DC, Kane TC, Fong DW . (1995) Adaptation and Natural Selection in Caves: The Evolution of Gammarus minus. Harvard University Press: Cambridge, MA, USA.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR9">
              <author>DC Culver</author>
              <first_page>381</first_page>
              <cYear>2000</cYear>
              <volume_title>Subterranean Ecosystems</volume_title>
              <unstructured_citation>Culver DC, Wilkens H . (2000). Critical review of the relevant theories of the evolution of subterranean animals. In: Wilkens H, Culver DC, Humphreys WF, (eds). Subterranean Ecosystems. Elsevier: Amsterdam, the Netherlands. pp 381–398.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR10">
              <journal_title>Mol Biol Evol</journal_title>
              <author>TE Dowling</author>
              <volume>19</volume>
              <first_page>446</first_page>
              <cYear>2002</cYear>
              <doi>10.1093/oxfordjournals.molbev.a004100</doi>
              <unstructured_citation>Dowling TE, Martasian DP, Jeffery WR . (2002). Evidence for multiple genetic forms with similar eyeless phenotypes in the blind cavefish, Astyanax mexicanus. Mol Biol Evol 19: 446–455.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR11">
              <journal_title>Ann Rev Ecol Syst</journal_title>
              <author>DW Fong</author>
              <volume>26</volume>
              <first_page>249</first_page>
              <cYear>1995</cYear>
              <doi>10.1146/annurev.es.26.110195.001341</doi>
              <unstructured_citation>Fong DW, Kane TC, Culver DC . (1995). Vestigialization and loss of nonfunctional characters. Ann Rev Ecol Syst 26: 249–268.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR12">
              <journal_title>Zoo Biol</journal_title>
              <author>R Frankham</author>
              <volume>5</volume>
              <first_page>127</first_page>
              <cYear>1986</cYear>
              <doi>10.1002/zoo.1430050207</doi>
              <unstructured_citation>Frankham R, Hemmer H, Ryder OA, Cothran EG, Soulé ME, Murray ND et al. (1986). Selection in captive populations. Zoo Biol 5: 127–138.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR13">
              <journal_title>BMC Evol Biol</journal_title>
              <author>JB Gross</author>
              <volume>12</volume>
              <first_page>105</first_page>
              <cYear>2012</cYear>
              <doi>10.1186/1471-2148-12-105</doi>
              <unstructured_citation>Gross JB . (2012). The complex origin of Astyanax cavefish. BMC Evol Biol 12: 105.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR14">
              <journal_title>PLoS Genet</journal_title>
              <author>JB Gross</author>
              <volume>5</volume>
              <first_page>e1000326</first_page>
              <cYear>2009</cYear>
              <doi>10.1371/journal.pgen.1000326</doi>
              <unstructured_citation>Gross JB, Borowsky R, Tabin CJ . (2009). A novel role for Mc1r in the parallel evolution of depigmentation in independent populations of the cavefish Astyanax mexicanus. PLoS Genet 5: e1000326.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR15">
              <journal_title>Mol Phylogenet Evol</journal_title>
              <author>B Hausdorf</author>
              <volume>60</volume>
              <first_page>89</first_page>
              <cYear>2011</cYear>
              <doi>10.1016/j.ympev.2011.03.009</doi>
              <unstructured_citation>Hausdorf B, Wilkens H, Strecker U . (2011). Population genetic patterns revealed by microsatellite data challenge the mitochondrial DNA based taxonomy of Astyanax in Mexico (Characidae, Teleostei). Mol Phylogenet Evol 60: 89–97.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR16">
              <journal_title>Occas Papers Mus Zool, Univ Michigan</journal_title>
              <author>CL Hubbs</author>
              <volume>342</volume>
              <first_page>1</first_page>
              <cYear>1936</cYear>
              <unstructured_citation>Hubbs CL, Innes WT . (1936). The first known blind fish of the family Characidae: A new genus from Mexico. Occas Papers Mus Zool, Univ Michigan 342: 1–7.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR17">
              <journal_title>Dev Biol</journal_title>
              <author>WR Jeffery</author>
              <volume>231</volume>
              <first_page>1</first_page>
              <cYear>2001</cYear>
              <doi>10.1006/dbio.2000.0121</doi>
              <unstructured_citation>Jeffery WR . (2001). Cavefish as a model system in evolutionary developmental biology. Dev Biol 231: 1–12.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR18">
              <journal_title>J Hered</journal_title>
              <author>WR Jeffery</author>
              <volume>96</volume>
              <first_page>185</first_page>
              <cYear>2005</cYear>
              <doi>10.1093/jhered/esi028</doi>
              <unstructured_citation>Jeffery WR . (2005). Adaptive evolution of eye degeneration in the Mexican blind cavefish. J Hered 96: 185–196.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR19">
              <journal_title>Annu Rev Genet</journal_title>
              <author>WR Jeffery</author>
              <volume>43</volume>
              <first_page>25</first_page>
              <cYear>2009</cYear>
              <doi>10.1146/annurev-genet-102108-134216</doi>
              <unstructured_citation>Jeffery WR . (2009). Regressive evolution in Astyanax cavefish. Annu Rev Genet 43: 25–47.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR20">
              <journal_title>Zoo Biol</journal_title>
              <author>L Laikre</author>
              <volume>18</volume>
              <first_page>81</first_page>
              <cYear>1999</cYear>
              <doi>10.1002/(SICI)1098-2361(1999)18:2&lt;81::AID-ZOO1&gt;3.0.CO;2-2</doi>
              <unstructured_citation>Laikre L . (1999). Hereditary defects and conservation genetic management of captive populations. Zoo Biol 18: 81–99.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR21">
              <journal_title>Genomics</journal_title>
              <author>ST Lee</author>
              <volume>26</volume>
              <first_page>354</first_page>
              <cYear>1995</cYear>
              <doi>10.1016/0888-7543(95)80220-G</doi>
              <unstructured_citation>Lee ST, Nicholls RD, Jong MT, Fukai K, Spritz RA . (1995). Organization and sequence of the human P gene and identification of a new family of transport proteins. Genomics 26: 354–363.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR22">
              <journal_title>Biol Conserv</journal_title>
              <author>ME McPhee</author>
              <volume>115</volume>
              <first_page>71</first_page>
              <cYear>2004</cYear>
              <doi>10.1016/S0006-3207(03)00095-8</doi>
              <unstructured_citation>McPhee ME . (2004). Generations in captivity increases behavioral variance: Considerations for captive breeding and reintroduction programs. Biol Conserv 115: 71–77.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR23">
              <author>RW Mitchell</author>
              <cYear>1977</cYear>
              <volume_title>Mexican Eyeless Characin Fishes, Genus Astyanax: Environment, Distribution, and Evolution</volume_title>
              <unstructured_citation>Mitchell RW, Russell WH, Elliott WR . (1977) Mexican Eyeless Characin Fishes, Genus Astyanax: Environment, Distribution, and Evolution. Texas Tech Press: Lubbock, TX, USA.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR24">
              <journal_title>BMC Evol Biol</journal_title>
              <author>CP Ornelas-García</author>
              <volume>8</volume>
              <first_page>340</first_page>
              <cYear>2008</cYear>
              <doi>10.1186/1471-2148-8-340</doi>
              <unstructured_citation>Ornelas-García CP, Domínguez-Domínguez O, Doadrio I . (2008). Evolutionary history of the fish genus Astyanax Baird &amp; Girard (1854) (Actinopterygii, Characidae) in Mesoamerica reveals multiple morphological homoplasies. BMC Evol Biol 8: 340.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR25">
              <journal_title>Trends Ecol Evol</journal_title>
              <author>F Pelletier</author>
              <volume>24</volume>
              <first_page>263</first_page>
              <cYear>2009</cYear>
              <doi>10.1016/j.tree.2008.11.013</doi>
              <unstructured_citation>Pelletier F, Réale D, Watters J, Boakes EH, Garant D . (2009). Value of captive populations for quantitative genetics research. Trends Ecol Evol 24: 263–270.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR26">
              <journal_title>J Zool Syst Evol Res</journal_title>
              <author>VN Peters</author>
              <volume>13</volume>
              <first_page>110</first_page>
              <cYear>1975</cYear>
              <doi>10.1111/j.1439-0469.1975.tb00504.x</doi>
              <unstructured_citation>Peters VN, Scholl A, Wilkens H . (1975). Der Micos-Fisch, Höhlenfisch in statu nascendi oder Bastard? Ein Beitrag zur Evolution der Höhlentiere. J Zool Syst Evol Res 13: 110–124.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR27">
              <journal_title>Acta Carsologica</journal_title>
              <author>ML Porter</author>
              <volume>36</volume>
              <first_page>173</first_page>
              <cYear>2007</cYear>
              <doi>10.3986/ac.v36i1.219</doi>
              <unstructured_citation>Porter ML, Dittmar K, Pérez-Losada M . (2007). How long does evolution of the troglomorphic form take? Estimating divergence times in Astyanax mexicanus. Acta Carsologica 36: 173–182.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR28">
              <journal_title>Curr Biol</journal_title>
              <author>M Protas</author>
              <volume>17</volume>
              <first_page>452</first_page>
              <cYear>2007</cYear>
              <doi>10.1016/j.cub.2007.01.051</doi>
              <unstructured_citation>Protas M, Conrad M, Gross JB, Tabin C, Borowsky R . (2007). Regressive evolution in the Mexican cave tetra, Astyanax mexicanus. Curr Biol 17: 452–454.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR29">
              <journal_title>Nat Genet</journal_title>
              <author>ME Protas</author>
              <volume>38</volume>
              <first_page>107</first_page>
              <cYear>2006</cYear>
              <doi>10.1038/ng1700</doi>
              <unstructured_citation>Protas ME, Hersey C, Kochanek D, Zhou Y, Wilkens H, Jeffery WR et al. (2006). Genetic analysis of cavefish reveals molecular convergence in the evolution of albinism. Nat Genet 38: 107–111.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR30">
              <journal_title>Experientia</journal_title>
              <author>P Şadoğlu</author>
              <volume>13</volume>
              <first_page>394</first_page>
              <cYear>1955</cYear>
              <doi>10.1007/BF02161111</doi>
              <unstructured_citation>Şadoğlu P . (1955). A Mendelian gene for albinism in natural cave fish. Experientia 13: 394–395.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR31">
              <journal_title>Verh Dtsch Zool Ges Graz</journal_title>
              <author>P Şadoğlu</author>
              <volume>1957</volume>
              <first_page>432</first_page>
              <cYear>1957</cYear>
              <unstructured_citation>Şadoğlu P . (1957). Mendelian inheritance in the hybrids between the Mexican blind cave fishes and their overground ancestor. Verh Dtsch Zool Ges Graz 1957: 432–439.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR32">
              <journal_title>J Hered</journal_title>
              <author>P Şadoğlu</author>
              <volume>60</volume>
              <first_page>10</first_page>
              <cYear>1969</cYear>
              <doi>10.1093/oxfordjournals.jhered.a107917</doi>
              <unstructured_citation>Şadoğlu P, McKee A . (1969). A second gene that affects eye and body color in Mexican blind cave fish. J Hered 60: 10–14.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR33">
              <journal_title>Zoologica</journal_title>
              <author>SR Schlagel</author>
              <volume>32</volume>
              <first_page>17</first_page>
              <cYear>1947</cYear>
              <unstructured_citation>Schlagel SR, Breder CM . (1947). A study of oxygen consumption of blind and eyed cave characins in light and in darkness. Zoologica 32: 17–28.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR34">
              <journal_title>Mol Ecol</journal_title>
              <author>U Strecker</author>
              <volume>12</volume>
              <first_page>699</first_page>
              <cYear>2003</cYear>
              <doi>10.1046/j.1365-294X.2003.01753.x</doi>
              <unstructured_citation>Strecker U, Bernatchez L, Wilkens H . (2003). Genetic divergence between cave and surface populations of Astyanax in Mexico (Characidae, Teleostei). Mol Ecol 12: 699–710.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR35">
              <journal_title>Mol Phylogenet Evol</journal_title>
              <author>U Strecker</author>
              <volume>33</volume>
              <first_page>469</first_page>
              <cYear>2004</cYear>
              <doi>10.1016/j.ympev.2004.07.001</doi>
              <unstructured_citation>Strecker U, Faundez VH, Wilkens H . (2004). Phylogeography of surface and cave Astyanax (Teleostei) from Central and North America based on cytochrome b sequence data. Mol Phylogenet Evol 33: 469–481.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR36">
              <journal_title>Mol Phylogenet Evol</journal_title>
              <author>U Strecker</author>
              <volume>62</volume>
              <first_page>62</first_page>
              <cYear>2012</cYear>
              <doi>10.1016/j.ympev.2011.09.005</doi>
              <unstructured_citation>Strecker U, Hausdorf B, Wilkens H . (2012). Parallel speciation in Astyanax cave fish (Teleostei) in Northern Mexico. Mol Phylogenet Evol 62: 62–70.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR37">
              <journal_title>Evolution</journal_title>
              <author>H Wilkens</author>
              <volume>25</volume>
              <first_page>530</first_page>
              <cYear>1971</cYear>
              <doi>10.2307/2407352</doi>
              <unstructured_citation>Wilkens H . (1971). Genetic interpretation of regressive evolutionary processes: Studies on hybrid eyes of two Astyanax populations (Characidae, Pisces). Evolution 25: 530–544.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR38">
              <author>H Wilkens</author>
              <first_page>271</first_page>
              <cYear>1988</cYear>
              <volume_title>Evolutionary Biology</volume_title>
              <doi>10.1007/978-1-4613-1043-3_8</doi>
              <unstructured_citation>Wilkens H . (1988). Evolution and genetics of epigean and cave Astyanax fasciatus (Characidae, Pisces). Support for the neutral mutation theory. In: Hecht MK, Wallace B, (eds). Evolutionary Biology Vol 23, Plenum Publishing Corporation: New York, NY, USA. pp 271–367.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR39">
              <journal_title>Heredity</journal_title>
              <author>H Wilkens</author>
              <volume>105</volume>
              <first_page>413</first_page>
              <cYear>2010</cYear>
              <doi>10.1038/hdy.2009.184</doi>
              <unstructured_citation>Wilkens H . (2010). Genes, modules and the evolution of cave fish. Heredity 105: 413–422.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR40">
              <journal_title>Ann Spéléol</journal_title>
              <author>H Wilkens</author>
              <volume>27</volume>
              <first_page>263</first_page>
              <cYear>1972</cYear>
              <unstructured_citation>Wilkens H, Burns RJ . (1972). A new Anoptichthys cave population. Ann Spéléol 27: 263–270.</unstructured_citation>
            </citation>
            <citation key="BFhdy201326_CR41">
              <journal_title>Biol J Linn Soc</journal_title>
              <author>H Wilkens</author>
              <volume>80</volume>
              <first_page>545</first_page>
              <cYear>2003</cYear>
              <doi>10.1111/j.1095-8312.2003.00230.x</doi>
              <unstructured_citation>Wilkens H, Strecker U . (2003). Convergent evolution of the cavefish Astyanax (Characidae: Teleostei): Genetic evidence from reduced eye-size and pigmentation. Biol J Linn Soc 80: 545–554.</unstructured_citation>
            </citation>
          </citation_list>
        </journal_article>
      </journal>
    </crossref>
  </doi_record>
</doi_records>
+    http_version: 
+  recorded_at: Mon, 24 Jun 2019 06:30:54 GMT
+recorded_with: VCR 3.0.3

data/spec/readers/crossref_reader_spec.rb

@@ -138,6 +138,24 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.agency).to eq("Crossref")
     end
 
+    it "vor with url" do
+      input = "https://doi.org/10.1038/hdy.2013.26"
+      subject = Bolognese::Metadata.new(input: input)
+      expect(subject.valid?).to be true
+      expect(subject.identifiers).to eq([{"identifier"=>"https://doi.org/10.1038/hdy.2013.26", "identifierType"=>"DOI"}])
+      expect(subject.url).to eq("http://www.nature.com/articles/hdy201326")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.creators.length).to eq(2)
+      expect(subject.creators.first).to eq("familyName"=>"Gross", "givenName"=>"J B", "name"=>"Gross, J B", "nameType"=>"Personal")
+      expect(subject.titles).to eq([{"title"=>"Albinism in phylogenetically and geographically distinct populations of Astyanax cavefish arises through the same loss-of-function Oca2 allele"}])
+      expect(subject.dates).to eq([{"date"=>"2013-04-10", "dateType"=>"Issued"}, {"date"=>"2019-04-16T16:25:36Z", "dateType"=>"Updated"}])
+      expect(subject.publication_year).to eq("2013")
+      expect(subject.related_identifiers.size).to eq(35)
+      expect(subject.related_identifiers.first).to eq("relatedIdentifier"=>"0018-067X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
+      expect(subject.container).to eq("firstPage"=>"122", "identifier"=>"0018-067X", "identifierType"=>"ISSN", "issue"=>"2", "lastPage"=>"130", "title"=>"Heredity", "type"=>"Journal", "volume"=>"111")
+      expect(subject.agency).to eq("Crossref")
+    end
+
     it "dataset" do
       input = "10.2210/pdb4hhb/pdb"
       subject = Bolognese::Metadata.new(input: input)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.1.17
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -516,6 +516,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: hashdiff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: Ruby gem and command-line utility for conversion of DOI metadata from
   and to different metadata formats, including schema.org.
 email: mfenner@datacite.org
@@ -806,6 +826,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/journal_article_with.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/not_found_error.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/posted_content.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/vor_with_url.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/BlogPosting.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/DOI_in_test_system.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/DOI_in_test_system_schema_3.yml
@@ -1077,7 +1098,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Ruby client library for conversion of DOI Metadata