bolognese 1.8.10 → 1.9

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

@@ -0,0 +1,98 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://doi.org/ra/10.1007
+    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:10:28 GMT
+      Content-Type:
+      - application/json;charset=UTF-8
+      Connection:
+      - keep-alive
+      Set-Cookie:
+      - __cfduid=d46720dbaaa6164af527771d3ccf0993e1602537028; expires=Wed, 11-Nov-20
+        21:10:28 GMT; path=/; domain=.doi.org; HttpOnly; SameSite=Lax; Secure
+      Cf-Cache-Status:
+      - DYNAMIC
+      Cf-Request-Id:
+      - 05c03f924a0000dfd3801da200000001
+      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=1602537028"}],"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:
+      - 5e13ceca1d6bdfd3-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.1007",
+            "RA": "Crossref"
+          }
+        ]
+    http_version:
+  recorded_at: Mon, 12 Oct 2020 21:10:28 GMT
+- request:
+    method: get
+    uri: https://api.crossref.org/works/10.1007/978-3-642-34922-5_19/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.1007/978-3-642-34922-5_19>; rel="canonical", <http://www.springerlink.com/index/pdf/10.1007/978-3-642-34922-5_19>;
+        version="vor"; rel="item"
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Headers:
+      - X-Requested-With
+      Content-Length:
+      - '20454'
+      Server:
+      - http-kit
+      Date:
+      - Mon, 12 Oct 2020 21:10:29 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="book_content">10.1007/978-3-642-34922-5_19</doi>
        <crm-item name="publisher-name" type="string">Springer Science and Business Media LLC</crm-item>
        <crm-item name="prefix-name" type="string">Springer-Verlag</crm-item>
        <crm-item name="member-id" type="number">297</crm-item>
        <crm-item name="citation-id" type="number">58361959</crm-item>
        <crm-item name="book-id" type="number">1163756</crm-item>
        <crm-item name="series-id" type="number">267880</crm-item>
        <crm-item name="deposit-timestamp" type="number">20121031161544</crm-item>
        <crm-item name="owner-prefix" type="string">10.1007</crm-item>
        <crm-item name="last-update" type="date">2019-07-05T00:09:58Z</crm-item>
        <crm-item name="created" type="date">2012-10-31T11:15:48Z</crm-item>
        <crm-item name="citedby-count" type="number">1</crm-item>
        <doi_record>
          <crossref xmlns="http://www.crossref.org/xschema/1.0" xsi:schemaLocation="http://www.crossref.org/xschema/1.0 http://doi.crossref.org/schemas/unixref1.0.xsd">
            <book book_type="other">
              <book_series_metadata>
                <series_metadata>
                  <titles>
                    <title>Studies in Fuzziness and Soft Computing</title>
                  </titles>
                  <issn media_type="print">1434-9922</issn>
                  <issn media_type="electronic">1860-0808</issn>
                </series_metadata>
                <contributors>
                  <person_name contributor_role="editor" sequence="first">
                    <given_name>Ronald R.</given_name>
                    <surname>Yager</surname>
                  </person_name>
                  <person_name contributor_role="editor" sequence="additional">
                    <given_name>Ali M.</given_name>
                    <surname>Abbasov</surname>
                  </person_name>
                  <person_name contributor_role="editor" sequence="additional">
                    <given_name>Marek Z.</given_name>
                    <surname>Reformat</surname>
                  </person_name>
                  <person_name contributor_role="editor" sequence="additional">
                    <given_name>Shahnaz N.</given_name>
                    <surname>Shahbazova</surname>
                  </person_name>
                </contributors>
                <titles>
                  <title>Soft Computing: State of the Art Theory and Novel Applications</title>
                </titles>
                <volume>291</volume>
                <publication_date media_type="print">
                  <year>2013</year>
                </publication_date>
                <isbn media_type="print">978-3-642-34921-8</isbn>
                <isbn media_type="electronic">978-3-642-34922-5</isbn>
                <publisher>
                  <publisher_name>Springer Berlin Heidelberg</publisher_name>
                  <publisher_place>Berlin, Heidelberg</publisher_place>
                </publisher>
                <doi_data>
                  <doi>10.1007/978-3-642-34922-5</doi>
                  <resource>http://www.springerlink.com/index/10.1007/978-3-642-34922-5</resource>
                  <collection property="crawler-based" setbyID="springer">
                    <item crawler="iParadigms">
                      <resource>http://www.springerlink.com/index/pdf/10.1007/978-3-642-34922-5</resource>
                    </item>
                  </collection>
                </doi_data>
              </book_series_metadata>
              <content_item component_type="chapter" level_sequence_number="1" publication_type="full_text">
                <contributors>
                  <person_name contributor_role="author" sequence="first">
                    <given_name>Ali</given_name>
                    <surname>Razib</surname>
                  </person_name>
                  <person_name contributor_role="author" sequence="additional">
                    <given_name>Scott</given_name>
                    <surname>Dick</surname>
                  </person_name>
                  <person_name contributor_role="author" sequence="additional">
                    <given_name>Vincent</given_name>
                    <surname>Gaudet</surname>
                  </person_name>
                </contributors>
                <titles>
                  <title>Log-Domain Arithmetic for High-Speed Fuzzy Control on a Field-Programmable Gate Array</title>
                </titles>
                <component_number>Chapter 19</component_number>
                <publication_date media_type="print">
                  <year>2013</year>
                </publication_date>
                <pages>
                  <first_page>269</first_page>
                  <last_page>287</last_page>
                </pages>
                <doi_data>
                  <doi>10.1007/978-3-642-34922-5_19</doi>
                  <resource>http://link.springer.com/10.1007/978-3-642-34922-5_19</resource>
                  <collection property="crawler-based" setbyID="springer">
                    <item crawler="iParadigms">
                      <resource>http://www.springerlink.com/index/pdf/10.1007/978-3-642-34922-5_19</resource>
                    </item>
                  </collection>
                </doi_data>
                <citation_list>
                  <citation key="19_CR1">
                    <journal_title>Information and Control</journal_title>
                    <author>L. Zadeh</author>
                    <volume>8</volume>
                    <issue>3</issue>
                    <first_page>338</first_page>
                    <cYear>1965</cYear>
                    <doi>10.1016/S0019-9958(65)90241-X</doi>
                    <unstructured_citation>Zadeh, L.: Fuzzy Sets. Information and Control 8(3), 338–353 (1965)</unstructured_citation>
                  </citation>
                  <citation key="19_CR2">
                    <journal_title>IEEE Trans. Computers</journal_title>
                    <author>E.H. Mamdani</author>
                    <volume>26</volume>
                    <first_page>1182</first_page>
                    <cYear>1977</cYear>
                    <doi>10.1109/TC.1977.1674779</doi>
                    <unstructured_citation>Mamdani, E.H.: Application of Fuzzy Logic to Approximate Reasoning. IEEE Trans. Computers (26), 1182–1191 (1977)</unstructured_citation>
                  </citation>
                  <citation key="19_CR3">
                    <doi provider="crossref">10.1109/FUZZY.2007.4295669</doi>
                    <unstructured_citation>Han, I.S.: Membership Function Circuit for Neural/Fuzzy Hardware of Analog-Mixed Operation Based on the Programmable Conductance. In: IEEE Int. Fuzzy Systems Conf., pp. 1–4 (2007)</unstructured_citation>
                  </citation>
                  <citation key="19_CR4">
                    <journal_title>Electronics Letters</journal_title>
                    <author>L. Tigaeru</author>
                    <volume>39</volume>
                    <issue>8</issue>
                    <first_page>642</first_page>
                    <cYear>2003</cYear>
                    <doi>10.1049/el:20030434</doi>
                    <unstructured_citation>Tigaeru, L.: Programmable analogue membership function circuit for hybrid-mode fuzzy systems. Electronics Letters 39(8), 642–644 (2003)</unstructured_citation>
                  </citation>
                  <citation key="19_CR5">
                    <doi provider="crossref">10.1109/NAFIPS.2002.1018021</doi>
                    <unstructured_citation>Kalaykov, I., Tolt, G.: Fast fuzzy signal and image processing hardware. In: Annual Meeting of the North American Fuzzy Information Processing Society, pp. 7–12 (2002)</unstructured_citation>
                  </citation>
                  <citation key="19_CR6">
                    <doi provider="crossref">10.1109/NAFIPS.2008.4531258</doi>
                    <unstructured_citation>Dick, S., Gaudet, V., Bai, H.: Bit-serial arithmetic: A novel approach to fuzzy hardware implementation. In: Annual Meeting of the North American Fuzzy Information Processing Society, pp. 1–6 (2008)</unstructured_citation>
                  </citation>
                  <citation key="19_CR7">
                    <journal_title>IEEE Transactions on Systems, Man and Cybernetics, Part A</journal_title>
                    <author>Z. Salcic</author>
                    <volume>31</volume>
                    <issue>6</issue>
                    <first_page>731</first_page>
                    <cYear>2001</cYear>
                    <doi>10.1109/3468.983430</doi>
                    <unstructured_citation>Salcic, Z.: High-speed customizable fuzzy-logic processor: architecture and implementation. IEEE Transactions on Systems, Man and Cybernetics, Part A 31(6), 731–737 (2001)</unstructured_citation>
                  </citation>
                  <citation key="19_CR8">
                    <author>R.R. Stoll</author>
                    <cYear>1979</cYear>
                    <volume_title>Set Theory and Logic</volume_title>
                    <unstructured_citation>Stoll, R.R.: Set Theory and Logic. Dover Publications, New York (1979)</unstructured_citation>
                  </citation>
                  <citation key="19_CR9">
                    <author>D.P. Filev</author>
                    <cYear>1994</cYear>
                    <volume_title>Essentials of Fuzzy Modeling and Control</volume_title>
                    <unstructured_citation>Filev, D.P., Yager, R.R.: Essentials of Fuzzy Modeling and Control. Wiley, New York (1994)</unstructured_citation>
                  </citation>
                  <citation key="19_CR10">
                    <author>J. Jantzen</author>
                    <cYear>2007</cYear>
                    <volume_title>Foundations of Fuzzy Control</volume_title>
                    <doi>10.1002/9780470061176</doi>
                    <unstructured_citation>Jantzen, J.: Foundations of Fuzzy Control. Wiley, New York (2007)</unstructured_citation>
                  </citation>
                  <citation key="19_CR11">
                    <doi provider="crossref">10.1016/B978-075067605-2/50003-X</doi>
                    <unstructured_citation>Ibrahim, A.: Fuzzy Logic for Embedded Systems Applications. Elsevier (2004)</unstructured_citation>
                  </citation>
                  <citation key="19_CR12">
                    <journal_title>IEEE Trans. on Systems, Man, and Cybernetics – Part A</journal_title>
                    <author>Y.D. Kim</author>
                    <volume>27</volume>
                    <issue>1</issue>
                    <first_page>45</first_page>
                    <cYear>1997</cYear>
                    <doi>10.1109/3468.553224</doi>
                    <unstructured_citation>Kim, Y.D.: High Speed Flexible Fuzzy Hardware for Fuzzy Information Processing. IEEE Trans. on Systems, Man, and Cybernetics – Part A 27(1), 45–56 (1997)</unstructured_citation>
                  </citation>
                  <citation key="19_CR13">
                    <author>C.S. Lee</author>
                    <cYear>1996</cYear>
                    <volume_title>Neural Fuzzy Systems: A Neuro-Fuzzy Synergism to Intelligent Systems</volume_title>
                    <unstructured_citation>Lee, C.S., Lin, C.: Neural Fuzzy Systems: A Neuro-Fuzzy Synergism to Intelligent Systems. Prentice Hall, Alexandria (1996)</unstructured_citation>
                  </citation>
                  <citation key="19_CR14">
                    <unstructured_citation>Ginart, A., Sanchez, G.: Fast Defuzzification Method Based on Centroid Estimation. Applied Modelling and Simulation (2002)</unstructured_citation>
                  </citation>
                  <citation key="19_CR15">
                    <doi provider="crossref">10.1145/326619.326688</doi>
                    <unstructured_citation>Runkler, T., Glesner, M.: DECADE—fast centroid approximation defuzzification for real time fuzzy control applications. In: Proceedings of the 1994 ACM Symposium on Applied Computing, pp. 161–165 (1994)</unstructured_citation>
                  </citation>
                  <citation key="19_CR16">
                    <doi provider="crossref">10.1109/ICMNN.1994.593726</doi>
                    <unstructured_citation>Eisele, M., Hentschel, K., Kunemund, T.: Hardware realization of fast defuzzification by adaptive integration. In: Proceedings of the Fourth International Conference on Microelectronics for Neural Networks and Fuzzy Systems, pp. 318–323 (1994)</unstructured_citation>
                  </citation>
                  <citation key="19_CR17">
                    <journal_title>Fuzzy Sets and Systems</journal_title>
                    <author>E. Broekhoven</author>
                    <volume>157</volume>
                    <issue>7</issue>
                    <first_page>904</first_page>
                    <cYear>2006</cYear>
                    <doi>10.1016/j.fss.2005.11.005</doi>
                    <unstructured_citation>Broekhoven, E., Baets, B.: Fast and accurate center of gravity defuzzification of fuzzy system outputs defined on trapezoidal fuzzy partitions. Fuzzy Sets and Systems 157(7), 904–918 (2006)</unstructured_citation>
                  </citation>
                  <citation key="19_CR18">
                    <journal_title>International Journal of Computational Cognition</journal_title>
                    <author>A. Patel</author>
                    <volume>2</volume>
                    <issue>3</issue>
                    <first_page>115</first_page>
                    <cYear>2004</cYear>
                    <unstructured_citation>Patel, A.: Transformation functions for trapezoidal membership functions. International Journal of Computational Cognition 2(3), 115–135 (2004)</unstructured_citation>
                  </citation>
                  <citation key="19_CR19">
                    <author>S.-G. Lee</author>
                    <first_page>93</first_page>
                    <cYear>2007</cYear>
                    <series_title>Lecture Notes in Artificial Intelligence</series_title>
                    <volume_title>Knowledge-Based Intelligent Information and Engineering Systems</volume_title>
                    <doi>10.1007/978-3-540-74819-9_12</doi>
                    <unstructured_citation>Lee, S.-G., Miyazaki, M., Kim, J.-I.: Design of Very High-Speed Integer Fuzzy Controller Without Multiplications by Using VHDL. In: Apolloni, B., Howlett, R.J., Jain, L. (eds.) KES 2007, Part I. LNCS (LNAI), vol. 4692, pp. 93–100. Springer, Heidelberg (2007)</unstructured_citation>
                  </citation>
                  <citation key="19_CR20">
                    <doi provider="crossref">10.1109/ICC.1995.524253</doi>
                    <unstructured_citation>Robertson, P., Villebrun, E., Hoeher, P.: A Comparison of Optimal and Sub-Optimal MAP Decoding Algorithms Operating in the Log Domain. In: IEEE Int. Conf. Communications, Seattle, WA, pp. 1009–1013 (1995)</unstructured_citation>
                  </citation>
                  <citation key="19_CR21">
                    <doi provider="crossref">10.1109/GLOCOM.1990.116598</doi>
                    <unstructured_citation>Erfanian, J., Pasupathy, S., Gulak, G.: Reduced Complexity Symbol Detectors with Parallel Structures. In: IEEE GLOBECOM, pp. 704–708 (1990)</unstructured_citation>
                  </citation>
                  <citation key="19_CR22">
                    <unstructured_citation>Kawaji, S., Maeda, T., Matsunaga, N.: Fuzzy Control Using Knowledge Acquired from PD Control. Industrial Electronics, Control and Instrumentation 2, 1549–1554 (1991)</unstructured_citation>
                  </citation>
                  <citation key="19_CR23">
                    <unstructured_citation>Gwaltney, D., King, K., Smith, K., Ormsby, J.: Implementation of Adaptive Digital Controllers on Programmable Logic Devices (2002), https://www.researchgate.net/publication/23892297_Implementation_of_Adaptive_Digital_Controllers_on_Programmable_Logic_Devices</unstructured_citation>
                  </citation>
                  <citation key="19_CR24">
                    <journal_title>IEEE Trans. on Systems, Man and Cybernetics</journal_title>
                    <author>J. Taur</author>
                    <volume>27</volume>
                    <issue>3</issue>
                    <first_page>526</first_page>
                    <cYear>1997</cYear>
                    <doi>10.1109/3477.584960</doi>
                    <unstructured_citation>Taur, J., Tao, C.: Design and Analysis of Region-Wise Linear Fuzzy Controllers. IEEE Trans. on Systems, Man and Cybernetics 27(3), 526–532 (1997)</unstructured_citation>
                  </citation>
                  <citation key="19_CR25">
                    <author>N.F. Macia</author>
                    <cYear>2004</cYear>
                    <volume_title>Modeling and Control of Dynamic Systems</volume_title>
                    <unstructured_citation>Macia, N.F., Thaler, G.J.: Modeling and Control of Dynamic Systems. Delmar Cengage Learning, Albany (2004)</unstructured_citation>
                  </citation>
                  <citation key="19_CR26">
                    <doi provider="crossref">10.1109/AINA.2005.14</doi>
                    <unstructured_citation>Barolli, L., et al.: A CAC scheme for multimedia applications based on fuzzy logic. In: Proc. Int. C. Advanced Inf. Networking &amp; Apps., Taipei, Taiwan (2005)</unstructured_citation>
                  </citation>
                  <citation key="19_CR27">
                    <journal_title>IEEE/ACM Trans. Networking</journal_title>
                    <author>G. Ascia</author>
                    <volume>13</volume>
                    <issue>2</issue>
                    <first_page>262</first_page>
                    <cYear>2005</cYear>
                    <doi>10.1109/TNET.2005.845543</doi>
                    <unstructured_citation>Ascia, G., Catania, V., Panno, D.: An evolutionary management scheme in high-performance packet switches. IEEE/ACM Trans. Networking 13(2), 262–275 (2005)</unstructured_citation>
                  </citation>
                  <citation key="19_CR28">
                    <journal_title>IEEE Trans. Mobile Comput.</journal_title>
                    <author>H.-P. Lin</author>
                    <volume>4</volume>
                    <issue>5</issue>
                    <first_page>530</first_page>
                    <cYear>2005</cYear>
                    <doi>10.1109/TMC.2005.70</doi>
                    <unstructured_citation>Lin, H.-P., Juang, R.-T., Lin, D.-B.: Validation of an improved location-based handover algorithm using GSM measurement data. IEEE Trans. Mobile Comput. 4(5), 530–536 (2005)</unstructured_citation>
                  </citation>
                  <citation key="19_CR29">
                    <doi provider="crossref">10.1109/ISMVL.2009.40</doi>
                    <unstructured_citation>Razib, A., Dick, S., Gaudet, V.: Design of a High-Speed Fuzzy Logic Controller Based on Log-Domain Arithmetic. In: Proceedings, ISMVL 2009, Naha, Okinawa, Japan, May 21-23, pp. 139–144 (2009)</unstructured_citation>
                  </citation>
                </citation_list>
              </content_item>
            </book>
          </crossref>
        </doi_record>
      </query>
    </body>
  </query_result>
</crossref_result>
+    http_version:
+  recorded_at: Mon, 12 Oct 2020 21:10:29 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")

data/spec/readers/crossref_reader_spec.rb

@@ -20,7 +20,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
       expect(subject.identifiers).to eq([{"identifier"=>"e01567", "identifierType"=>"article_number"}])
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.url).to eq("https://elifesciences.org/articles/01567")
       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"}])
@@ -33,7 +33,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.dates).to eq([{"date"=>"2014-02-11", "dateType"=>"Issued"}, {"date"=>"2018-08-23T13:41:49Z", "dateType"=>"Updated"}])
       expect(subject.publication_year).to eq("2014")
       expect(subject.publisher).to eq("eLife Sciences Publications, Ltd")
-      expect(subject.container).to eq("identifier"=>"2050-084X", "identifierType"=>"ISSN", "title"=>"eLife", "type"=>"Journal", "volume"=>"3")
+      expect(subject.container).to eq("firstPage" => "e01567", "identifier"=>"2050-084X", "identifierType"=>"ISSN", "title"=>"eLife", "type"=>"Journal", "volume"=>"3")
       expect(subject.related_identifiers.length).to eq(27)
       expect(subject.related_identifiers.first).to eq("relatedIdentifier"=>"2050-084X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.1038/ncb2764", "relatedIdentifierType"=>"DOI", "relationType"=>"References")
@@ -57,7 +57,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.1371/journal.pone.0000030")
       expect(subject.identifiers).to eq([{"identifier"=>"10.1371/journal.pone.0000030", "identifierType"=>"Publisher ID"}])
       expect(subject.url).to eq("https://dx.plos.org/10.1371/journal.pone.0000030")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.length).to eq(5)
       expect(subject.creators.first).to eq("nameType"=>"Personal", "name"=>"Ralser, Markus", "givenName"=>"Markus", "familyName"=>"Ralser")
       expect(subject.contributors).to eq([{"contributorType"=>"Editor", "familyName"=>"Janbon", "givenName"=>"Guilhem", "name"=>"Janbon, Guilhem", "nameType"=>"Personal"}])
@@ -84,7 +84,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.3389/fpls.2019.00816")
       expect(subject.identifiers).to eq([{"identifier"=>"816", "identifierType"=>"article_number"}])
       expect(subject.url).to eq("https://www.frontiersin.org/article/10.3389/fpls.2019.00816/full")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.length).to eq(4)
       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"}])
@@ -100,7 +100,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.related_identifiers.length).to eq(70)
       expect(subject.related_identifiers.first).to eq("relatedIdentifier"=>"1664-462X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Collection")
       expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.17660/actahortic.2004.632.41", "relatedIdentifierType"=>"DOI", "relationType"=>"References")
-      expect(subject.container).to eq("identifier"=>"1664-462X", "identifierType"=>"ISSN", "title"=>"Frontiers in Plant Science", "type"=>"Journal", "volume"=>"10")
+      expect(subject.container).to eq("firstPage" => "816", "identifier"=>"1664-462X", "identifierType"=>"ISSN", "title"=>"Frontiers in Plant Science", "type"=>"Journal", "volume"=>"10")
       expect(subject.agency).to eq("crossref")
     end
 
@@ -110,7 +110,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.7600/jspfsm.56.60")
       expect(subject.url).to eq("http://jlc.jst.go.jp/JST.JSTAGE/jspfsm/56.60?lang=en&from=CrossRef&type=abstract")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators).to eq([{"name"=>":(unav)", "nameType"=>"Organizational"}])
       expect(subject.titles).to eq([{"lang"=>"ja", "title"=>"自律神経・循環器応答"}])
       expect(subject.dates).to include({"date"=>"2007", "dateType"=>"Issued"})
@@ -128,7 +128,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1163/1937240x-00002096")
       expect(subject.url).to eq("https://academic.oup.com/jcb/article-lookup/doi/10.1163/1937240X-00002096")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.length).to eq(8)
       expect(subject.creators.first).to eq("familyName"=>"Mesquita-Joanes", "givenName"=>"Francesc", "name"=>"Mesquita-Joanes, Francesc", "nameType"=>"Personal")
       expect(subject.titles).to eq([{"title"=>"Global distribution of Fabaeformiscandona subacuta: an exotic invasive Ostracoda on the Iberian Peninsula?"}])
@@ -148,7 +148,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1007/978-3-642-33191-6_49")
       expect(subject.url).to eq("http://link.springer.com/10.1007/978-3-642-33191-6_49")
-      expect(subject.types).to eq("bibtex"=>"inbook", "citeproc"=>"chapter", "resourceType"=>"BookChapter", "resourceTypeGeneral"=>"Text", "ris"=>"CHAP", "schemaOrg"=>"Chapter")
+      expect(subject.types).to eq("bibtex"=>"inbook", "citeproc"=>"chapter", "resourceType"=>"BookChapter", "resourceTypeGeneral"=>"BookChapter", "ris"=>"CHAP", "schemaOrg"=>"Chapter")
       expect(subject.creators.length).to eq(3)
       expect(subject.creators.first).to eq("familyName"=>"Chen", "givenName"=>"Lili", "name"=>"Chen, Lili", "nameType"=>"Personal")
       expect(subject.titles).to eq([{"title"=>"Human Body Orientation Estimation in Multiview Scenarios"}])
@@ -166,7 +166,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.url).to eq("http://biorxiv.org/lookup/doi/10.1101/097196")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"PostedContent", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"PostedContent", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.count).to eq(11)
       expect(subject.creators.last).to eq("nameType"=>"Personal", "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0003-4060-7360", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "name"=>"Clark, Timothy", "givenName"=>"Timothy", "familyName"=>"Clark")
       expect(subject.titles).to eq([{"title"=>"A Data Citation Roadmap for Scholarly Data Repositories"}])
@@ -184,7 +184,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.url).to eq("https://elifesciences.org/articles/55167#sa2")
-      expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"article-journal", "resourceType"=>"PeerReview", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"Review")
+      expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"article-journal", "resourceType"=>"PeerReview", "resourceTypeGeneral"=>"PeerReview", "ris"=>"JOUR", "schemaOrg"=>"Review")
       expect(subject.creators.count).to eq(8)
       expect(subject.creators.last).to eq("affiliation" => [{"name"=>"Center for Computational Mathematics, Flatiron Institute, New York, United States"}],
         "familyName" => "Barnett",
@@ -206,7 +206,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.url).to eq("http://espace.library.uq.edu.au/view/UQ:23a1e74")
-      expect(subject.types).to eq("bibtex"=>"phdthesis", "citeproc"=>"thesis", "resourceType"=>"Dissertation", "resourceTypeGeneral"=>"Text", "ris"=>"THES", "schemaOrg"=>"Thesis")
+      expect(subject.types).to eq("bibtex"=>"phdthesis", "citeproc"=>"thesis", "resourceType"=>"Dissertation", "resourceTypeGeneral"=>"Dissertation", "ris"=>"THES", "schemaOrg"=>"Thesis")
       expect(subject.creators).to eq([{"familyName"=>"Collingwood",
         "givenName"=>"Patricia Maree",
         "name"=>"Collingwood, Patricia Maree",
@@ -231,7 +231,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1890/0012-9658(2006)87%255b2832:tiopma%255d2.0.co;2")
       expect(subject.url).to eq("http://doi.wiley.com/10.1890/0012-9658(2006)87[2832:TIOPMA]2.0.CO;2")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators).to eq([{"nameType"=>"Personal", "name"=>"Fenton, A.", "givenName"=>"A.", "familyName"=>"Fenton"}, {"nameType"=>"Personal", "name"=>"Rands, S. A.", "givenName"=>"S. A.", "familyName"=>"Rands"}])
       expect(subject.rights_list).to eq([{"rightsUri"=>"http://doi.wiley.com/10.1002/tdm_license_1.1"}])
       expect(subject.titles).to eq([{"title"=>"THE IMPACT OF PARASITE MANIPULATION AND PREDATOR FORAGING BEHAVIOR ON PREDATOR–PREY COMMUNITIES"}])
@@ -251,7 +251,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1155/2012/291294")
       expect(subject.url).to eq("http://www.hindawi.com/journals/pm/2012/291294/")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       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",
@@ -277,7 +277,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.1016/j.ejphar.2015.03.018")
       expect(subject.identifiers).to eq([{"identifier"=>"S0014299915002332", "identifierType"=>"sequence-number"}])
       expect(subject.url).to eq("https://linkinghub.elsevier.com/retrieve/pii/S0014299915002332")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.length).to eq(10)
       expect(subject.creators.first).to eq("nameType"=>"Personal", "name"=>"Beck, Sarah E.", "givenName"=>"Sarah E.", "familyName"=>"Beck")
       expect(subject.titles).to eq([{"title"=>"Paving the path to HIV neurotherapy: Predicting SIV CNS disease"}])
@@ -295,7 +295,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1038/hdy.2013.26")
       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.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "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"}])
@@ -364,7 +364,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1007/978-3-662-46370-3_13")
       expect(subject.url).to eq("http://link.springer.com/10.1007/978-3-662-46370-3_13")
-      expect(subject.types).to eq("bibtex"=>"inbook", "citeproc"=>"chapter", "resourceType"=>"BookChapter", "resourceTypeGeneral"=>"Text", "ris"=>"CHAP", "schemaOrg"=>"Chapter")
+      expect(subject.types).to eq("bibtex"=>"inbook", "citeproc"=>"chapter", "resourceType"=>"BookChapter", "resourceTypeGeneral"=>"BookChapter", "ris"=>"CHAP", "schemaOrg"=>"Chapter")
       expect(subject.creators.length).to eq(2)
       expect(subject.creators.first).to eq("nameType"=>"Personal", "name"=>"Diercks, Ronald L.", "givenName"=>"Ronald L.", "familyName"=>"Diercks")
       expect(subject.titles).to eq([{"title"=>"Clinical Symptoms and Physical Examinations"}])
@@ -380,7 +380,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1007/978-3-319-75889-3_1")
       expect(subject.url).to eq("http://link.springer.com/10.1007/978-3-319-75889-3_1")
-      expect(subject.types).to eq("bibtex"=>"inbook", "citeproc"=>"chapter", "resourceType"=>"BookChapter", "resourceTypeGeneral"=>"Text", "ris"=>"CHAP", "schemaOrg"=>"Chapter")
+      expect(subject.types).to eq("bibtex"=>"inbook", "citeproc"=>"chapter", "resourceType"=>"BookChapter", "resourceTypeGeneral"=>"BookChapter", "ris"=>"CHAP", "schemaOrg"=>"Chapter")
       expect(subject.creators).to eq([{"familyName"=>"Jones", "givenName"=>"Hunter M.", "name"=>"Jones, Hunter M.", "nameType"=>"Personal"}])
       expect(subject.titles).to eq([{"title"=>"Climate Change and Increasing Risk of Extreme Heat"}])
       expect(subject.dates).to include({"date"=>"2018", "dateType"=>"Issued"})
@@ -395,7 +395,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.4018/978-1-4666-1891-6.ch004")
       expect(subject.url).to eq("http://services.igi-global.com/resolvedoi/resolve.aspx?doi=10.4018/978-1-4666-1891-6.ch004")
-      expect(subject.types).to eq("bibtex"=>"inbook", "citeproc"=>"chapter", "resourceType"=>"BookChapter", "resourceTypeGeneral"=>"Text", "ris"=>"CHAP", "schemaOrg"=>"Chapter")
+      expect(subject.types).to eq("bibtex"=>"inbook", "citeproc"=>"chapter", "resourceType"=>"BookChapter", "resourceTypeGeneral"=>"BookChapter", "ris"=>"CHAP", "schemaOrg"=>"Chapter")
       expect(subject.creators).to eq([{"affiliation"=>[{"name"=>"Université de Lyon, France"}], "familyName"=>"Bichot", "givenName"=>"Charles-Edmond", "name"=>"Bichot, Charles-Edmond", "nameType"=>"Personal"}])
       expect(subject.titles).to eq([{"title"=>"Unsupervised and Supervised Image Segmentation Using Graph Partitioning"}])
       expect(subject.dates).to eq([{"date"=>"2012-08-08", "dateType"=>"Issued"}, {"date"=>"2019-07-02T17:17:21Z", "dateType"=>"Updated"}])
@@ -410,7 +410,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.3390/publications6020015")
       expect(subject.url).to eq("http://www.mdpi.com/2304-6775/6/2/15")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators).to eq([{"name"=>"Alexander Kohls", "nameType"=>"Organizational"}, {"name"=>"Salvatore Mele", "nameType"=>"Organizational"}])
       expect(subject.titles).to eq([{"title"=>"Converting the Literature of a Scientific Field to Open Access through Global Collaboration: The Experience of SCOAP3 in Particle Physics"}])
       expect(subject.dates).to eq([{"date"=>"2018-04-09", "dateType"=>"Issued"}, {"date"=>"2018-04-10T17:58:05Z", "dateType"=>"Updated"}])
@@ -426,7 +426,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.1017/9781108348843")
       expect(subject.identifiers).to eq([{"identifier"=>"9781108348843", "identifierType"=>"ISBN"}])
       expect(subject.url).to eq("https://www.cambridge.org/core/product/identifier/9781108348843/type/book")
-      expect(subject.types).to eq("bibtex"=>"book", "citeproc"=>"book", "resourceType"=>"Book", "resourceTypeGeneral"=>"Text", "ris"=>"BOOK", "schemaOrg"=>"Book")
+      expect(subject.types).to eq("bibtex"=>"book", "citeproc"=>"book", "resourceType"=>"Book", "resourceTypeGeneral"=>"Book", "ris"=>"BOOK", "schemaOrg"=>"Book")
       expect(subject.creators).to eq([{"familyName"=>"Leung", "givenName"=>"Vincent S.", "name"=>"Leung, Vincent S.", "nameType"=>"Personal"}])
       expect(subject.titles).to eq([{"title"=>"The Politics of the Past in Early China"}])
       expect(subject.dates).to eq([{"date"=>"2019-07-01", "dateType"=>"Issued"}, {"date"=>"2019-12-01T18:11:11Z", "dateType"=>"Updated"}])
@@ -442,7 +442,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.2973/odp.proc.ir.180.2000")
       expect(subject.url).to eq("http://www-odp.tamu.edu/publications/180_IR/180TOC.HTM")
-      expect(subject.types).to eq("bibtex"=>"book", "citeproc"=>"book", "resourceType"=>"Book", "resourceTypeGeneral"=>"Text", "ris"=>"BOOK", "schemaOrg"=>"Book")
+      expect(subject.types).to eq("bibtex"=>"book", "citeproc"=>"book", "resourceType"=>"Book", "resourceTypeGeneral"=>"Book", "ris"=>"BOOK", "schemaOrg"=>"Book")
       expect(subject.creators).to eq([{"name"=>":(unav)", "nameType"=>"Organizational"}])
       expect(subject.contributors.size).to eq(4)
       expect(subject.contributors.first).to eq("contributorType"=>"Editor", "familyName"=>"Taylor", "givenName"=>"B.", "name"=>"Taylor, B.", "nameType"=>"Personal")
@@ -461,7 +461,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.1029/ar035")
       expect(subject.identifiers).to eq([{"identifier"=>"0-87590-181-6", "identifierType"=>"ISBN"}])
       expect(subject.url).to eq("http://doi.wiley.com/10.1029/AR035")
-      expect(subject.types).to eq("bibtex"=>"book", "citeproc"=>"book", "resourceType"=>"Book", "resourceTypeGeneral"=>"Text", "ris"=>"BOOK", "schemaOrg"=>"Book")
+      expect(subject.types).to eq("bibtex"=>"book", "citeproc"=>"book", "resourceType"=>"Book", "resourceTypeGeneral"=>"Book", "ris"=>"BOOK", "schemaOrg"=>"Book")
       expect(subject.creators).to eq([{"familyName"=>"McGinnis", "givenName"=>"Richard Frank", "name"=>"McGinnis, Richard Frank", "nameType"=>"Personal"}])
       expect(subject.titles).to eq([{"title"=>"Biogeography of Lanternfishes (Myctophidae) South of 30°S"}])
       expect(subject.dates).to eq([{"date"=>"1982", "dateType"=>"Issued"}, {"date"=>"2019-06-15T05:11:12Z", "dateType"=>"Updated"}])
@@ -481,7 +481,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.3280/ecag2018-001005")
       expect(subject.identifiers).to eq([{"identifier"=>"5", "identifierType"=>"article_number"}])
       expect(subject.url).to eq("http://www.francoangeli.it/riviste/Scheda_Riviste.asp?IDArticolo=61645")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.length).to eq(2)
       expect(subject.creators.first).to eq("familyName"=>"Oh", "givenName"=>"Sohae Eve", "name"=>"Oh, Sohae Eve", "nameType"=>"Personal")
       expect(subject.titles).to eq([{"title"=>"Substitutability between organic and conventional poultry products and organic price premiums"}])
@@ -498,7 +498,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.5012/bkcs.2013.34.10.2889")
       expect(subject.identifiers).to eq([{"identifier"=>"JCGMCS_2013_v34n10_2889", "identifierType"=>"Publisher ID"}])
       expect(subject.url).to eq("http://koreascience.or.kr/journal/view.jsp?kj=JCGMCS&py=2013&vnc=v34n10&sp=2889")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.length).to eq(7)
       expect(subject.creators.first).to eq("familyName"=>"Huang", "givenName"=>"Guimei", "name"=>"Huang, Guimei", "nameType"=>"Personal")
       expect(subject.titles).to eq([{"title"=>"Synthesis, Crystal Structure and Theoretical Calculation of a Novel Nickel(II) Complex with Dibromotyrosine and 1,10-Phenanthroline"}])
@@ -514,7 +514,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1241/johokanri.39.979")
       expect(subject.url).to eq("http://joi.jlc.jst.go.jp/JST.JSTAGE/johokanri/39.979?from=CrossRef")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators).to eq([{"familyName"=>"KUSUMOTO", "givenName"=>"Hiroyuki", "name"=>"KUSUMOTO, Hiroyuki", "nameType"=>"Personal"}])
       expect(subject.titles).to eq([{"title"=>"Utilizing the Internet. 12 Series. Future of the Internet."}])
       expect(subject.dates).to eq([{"date"=>"1997", "dateType"=>"Issued"}, {"date"=>"2020-03-06T06:44:36Z", "dateType"=>"Updated"}])
@@ -529,7 +529,7 @@ describe Bolognese::Metadata, vcr: true do
       #expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.2903/j.efsa.2018.5239")
       expect(subject.url).to eq("http://doi.wiley.com/10.2903/j.efsa.2018.5239")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.length).to eq(28)
       expect(subject.creators.first).to eq("familyName"=>"Younes", "givenName"=>"Maged", "name"=>"Younes, Maged", "nameType"=>"Personal")
       expect(subject.titles).to eq([{"title"=>"Scientific opinion on the safety of green tea catechins"}])
@@ -545,7 +545,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.4000/dms.865")
       expect(subject.url).to eq("http://journals.openedition.org/dms/865")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators).to eq([{"familyName"=>"Peraya", "givenName"=>"Daniel", "name"=>"Peraya, Daniel", "nameType"=>"Personal"}])
       expect(subject.titles).to eq([{"title"=>"Distances, absence, proximités et présences : des concepts en déplacement"}, {"title"=>"Distance(s), proximity and presence(s): evolving concepts"}])
       expect(subject.dates).to include({"date"=>"2014-12-23", "dateType"=>"Issued"})
@@ -561,7 +561,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1186/1471-2164-7-187")
       expect(subject.url).to eq("https://bmcgenomics.biomedcentral.com/articles/10.1186/1471-2164-7-187")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators).to eq([{"familyName"=>"Myers",
         "givenName"=>"Chad L",
         "name"=>"Myers, Chad L",
@@ -596,7 +596,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1098/rspb.2017.0132")
       expect(subject.url).to eq("https://royalsocietypublishing.org/doi/10.1098/rspb.2017.0132")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.size).to eq(6)
       expect(subject.creators.first).to eq("affiliation" => [{"name"=>"School of Biological Sciences, Centre for Evolutionary Biology, University of Western Australia, Crawley, WA 6009, Australia"}], "familyName" => "Dougherty","givenName" => "Liam R.","name" => "Dougherty, Liam R.","nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0003-1406-0680", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}],"nameType"=>"Personal")
       expect(subject.titles).to eq([{"title"=>"Sexual conflict and correlated evolution between male persistence and female resistance traits in the seed beetle <i>Callosobruchus maculatus</i>"}])
@@ -613,7 +613,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1111/j.1865-1682.2010.01171.x")
       expect(subject.url).to eq("http://doi.wiley.com/10.1111/j.1865-1682.2010.01171.x")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.length).to eq(5)
       expect(subject.creators[3]).to eq("familyName"=>"Ehtisham-ul-Haq", "givenName"=>" ", "name"=>"Ehtisham-ul-Haq,  ", "nameType"=>"Personal")
       expect(subject.titles).to eq([{"title"=>"Serological Evidence of Brucella abortus Prevalence in Punjab Province, Pakistan - A Cross-Sectional Study"}])
@@ -630,7 +630,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.1055/s-0039-1690894")
       expect(subject.identifiers).to eq([{"identifier"=>"s-0039-1690894", "identifierType"=>"sequence-number"}])
       expect(subject.url).to eq("http://www.thieme-connect.de/DOI/DOI?10.1055/s-0039-1690894")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.length).to eq(4)
       expect(subject.creators[3]).to eq("affiliation" => [{"name"=>"Department of Chemistry, Tianjin Key Laboratory of Molecular Optoelectronic Sciences, and Tianjin Collaborative Innovation Centre of Chemical Science and Engineering, Tianjin University"}, {"name"=>"Joint School of National University of Singapore and Tianjin University, International Campus of Tianjin University"}],
         "familyName" => "Ma",
@@ -650,7 +650,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1111/nph.14619")
       expect(subject.url).to eq("http://doi.wiley.com/10.1111/nph.14619")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.length).to eq(3)
       expect(subject.creators.first).to eq("nameType"=>"Personal", "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0002-4156-3761", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "name"=>"Dissmeyer, Nico", "givenName"=>"Nico", "familyName"=>"Dissmeyer", "affiliation" => [{"name"=>"Independent Junior Research Group on Protein Recognition and Degradation; Leibniz Institute of Plant Biochemistry (IPB); Weinberg 3 Halle (Saale) D-06120 Germany"}, {"name"=>"ScienceCampus Halle - Plant-based Bioeconomy; Betty-Heimann-Strasse 3 Halle (Saale) D-06120 Germany"}])
       expect(subject.titles).to eq([{"title"=>"Life and death of proteins after protease cleavage: protein degradation by the N-end rule pathway"}])
@@ -672,7 +672,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1038/ng.3834")
       expect(subject.url).to eq("http://www.nature.com/articles/ng.3834")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.length).to eq(14)
       expect(subject.creators.last).to eq("name"=>"GTEx Consortium", "nameType"=>"Organizational")
       expect(subject.titles).to eq([{"title"=>"The impact of structural variation on human gene expression"}])
@@ -683,12 +683,65 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_registered).to eq("2019-11-02T09:30:06Z")
     end
 
+    it "affiliation is space" do
+      input = "https://doi.org/10.1177/0042098011428175"
+      subject = Bolognese::Metadata.new(input: input)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.1177/0042098011428175")
+      expect(subject.url).to eq("http://journals.sagepub.com/doi/10.1177/0042098011428175")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.creators.length).to eq(1)
+      expect(subject.creators.first).to eq("familyName"=>"Petrovici", "givenName"=>"Norbert", "name"=>"Petrovici, Norbert", "nameType"=>"Personal")
+      expect(subject.titles).to eq([{"title"=>"Workers and the City: Rethinking the Geographies of Power in Post-socialist Urbanisation"}])
+      expect(subject.dates).to include({"date"=>"2011-12-22", "dateType"=>"Issued"})
+      expect(subject.publication_year).to eq("2011")
+      expect(subject.publisher).to eq("SAGE Publications")
+      expect(subject.agency).to eq("crossref")
+      expect(subject.date_registered).to eq("2017-12-17T00:37:32Z")
+    end
+
+    it "multiple issn" do
+      input = "https://doi.org/10.1007/978-3-642-34922-5_19"
+      subject = Bolognese::Metadata.new(input: input)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.1007/978-3-642-34922-5_19")
+      expect(subject.url).to eq("http://link.springer.com/10.1007/978-3-642-34922-5_19")
+      expect(subject.types).to eq("bibtex"=>"inbook", "citeproc"=>"chapter", "resourceType"=>"BookChapter", "resourceTypeGeneral"=>"BookChapter", "ris"=>"CHAP", "schemaOrg"=>"Chapter")
+      expect(subject.creators.length).to eq(3)
+      expect(subject.creators.first).to eq("familyName"=>"Razib", "givenName"=>"Ali", "name"=>"Razib, Ali", "nameType"=>"Personal")
+      expect(subject.titles).to eq([{"title"=>"Log-Domain Arithmetic for High-Speed Fuzzy Control on a Field-Programmable Gate Array"}])
+      expect(subject.dates).to include({"date"=>"2013", "dateType"=>"Issued"})
+      expect(subject.publication_year).to eq("2013")
+      expect(subject.publisher).to eq("Springer Science and Business Media LLC")
+      expect(subject.container).to eq("identifier"=>"1860-0808", "identifierType"=>"ISSN", "title"=>"Studies in Fuzziness and Soft Computing", "type"=>"Book Series")
+      expect(subject.agency).to eq("crossref")
+      expect(subject.date_registered).to eq("2012-10-31T16:15:44Z")
+    end
+
+    it "article id as page number" do
+      input = "https://doi.org/10.1103/physrevlett.120.117701"
+      subject = Bolognese::Metadata.new(input: input)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.1103/physrevlett.120.117701")
+      expect(subject.url).to eq("https://link.aps.org/doi/10.1103/PhysRevLett.120.117701")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.creators.length).to eq(5)
+      expect(subject.creators.first).to eq("familyName"=>"Marrazzo", "givenName"=>"Antimo", "name"=>"Marrazzo, Antimo", "nameType"=>"Personal")
+      expect(subject.titles).to eq([{"title"=>"Prediction of a Large-Gap and Switchable Kane-Mele Quantum Spin Hall Insulator"}])
+      expect(subject.dates).to include({"date"=>"2018-03-13", "dateType"=>"Issued"})
+      expect(subject.publication_year).to eq("2018")
+      expect(subject.publisher).to eq("American Physical Society (APS)")
+      expect(subject.container).to eq("firstPage" => "117701", "identifier"=>"1079-7114", "identifierType"=>"ISSN", "issue"=>"11", "title"=>"Physical Review Letters", "type"=>"Journal", "volume"=>"120")
+      expect(subject.agency).to eq("crossref")
+      expect(subject.date_registered).to eq("2018-03-13T15:18:48Z")
+    end
+
     it "posted content copernicus" do
       input = "https://doi.org/10.5194/CP-2020-95"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.url).to eq("https://cp.copernicus.org/preprints/cp-2020-95/")
-      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"PostedContent", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
+      expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"PostedContent", "resourceTypeGeneral"=>"JournalArticle", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
       expect(subject.creators.count).to eq(6)
       expect(subject.creators.first).to eq("nameType" => "Personal", "familyName" => "Shao",
         "givenName" => "Jun",
@@ -709,7 +762,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.url).to eq("http://oxfordhandbooks.com/view/10.1093/oxfordhb/9780198746140.001.0001/oxfordhb-9780198746140-e-5")
-      expect(subject.types).to eq("bibtex"=>"book", "citeproc"=>"book", "resourceType"=>"Book", "resourceTypeGeneral"=>"Text", "ris"=>"BOOK", "schemaOrg"=>"Book")
+      expect(subject.types).to eq("bibtex"=>"book", "citeproc"=>"book", "resourceType"=>"Book", "resourceTypeGeneral"=>"Book", "ris"=>"BOOK", "schemaOrg"=>"Book")
       expect(subject.creators.count).to eq(1)
       expect(subject.creators.first).to eq("familyName"=>"Clayton", "givenName"=>"Barbra R.", "name"=>"Clayton, Barbra R.", "nameType"=>"Personal")
       expect(subject.contributors.count).to eq(2)
@@ -729,7 +782,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.url).to eq("http://www.osti.gov/servlets/purl/972169-1QXROM/")
-      expect(subject.types).to eq("bibtex"=>"techreport", "citeproc"=>"report", "resourceType"=>"Report", "resourceTypeGeneral"=>"Text", "ris"=>"RPRT", "schemaOrg"=>"Report")
+      expect(subject.types).to eq("bibtex"=>"techreport", "citeproc"=>"report", "resourceType"=>"Report", "resourceTypeGeneral"=>"Report", "ris"=>"RPRT", "schemaOrg"=>"Report")
       expect(subject.creators.count).to eq(4)
       expect(subject.creators.first).to eq("familyName"=>"Denholm", "givenName"=>"P.", "name"=>"Denholm, P.", "nameType"=>"Personal")
       expect(subject.contributors.count).to eq(0)