bolognese 1.8.12 → 1.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e9ef883158d4d5c7759604384e40187b696797da54ef3746110dae68ae4172e
-  data.tar.gz: 6df03fa50cdb1902b55e371c5fd32293d5c33b842c9a3ba90b12e78554c8e53b
+  metadata.gz: ea0a1d41de990f8bc6e940f8df5c3734b8751b262306273084e770bfe0834ddb
+  data.tar.gz: a3bbc207e08285915c00db8c1294a09ebc0c3bc2f6a13a996a76a6b2e36c6a6b
 SHA512:
-  metadata.gz: 89ba372c20d10fc5315764121c926e574035acf4a5efc6826a82417f263afa48b8593bd50c08252c9330e705de71143bdd3d6f187ea077c3b6cff50ccfbe39f6
-  data.tar.gz: 277381d2382c4475d550eb3b1e9904c4720d954ea81c84b0fcbe1914e3c15e6d5d69575fffd9c0cb27fa2a4eacd8e1ccad9168fcd173a796e15247f665276063
+  metadata.gz: 40d1961b4ef91c03d58ec3bc9782c03c2862db4aa81eeaca42e8873fa475d4181c05057846030ef7508323c88a1e80c36fa783c8b057b7bd3145a9831f89d286
+  data.tar.gz: 86018966453c45e25911663ceb7e910a8a251a51fe2d441210255c2ea3f3ebf69f62c5b3bbc942f0dd5504efc1322071724c2b2f44ec87bb40c9d2340e7405d7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.8.12)
+    bolognese (1.8.13)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)

data/lib/bolognese/readers/crossref_reader.rb

@@ -64,7 +64,6 @@ module Bolognese
           journal_article = meta.dig("crossref", "journal", "journal_article") || {}
           bibliographic_metadata = journal_article.presence || journal_issue.presence || journal_metadata
           program_metadata = bibliographic_metadata.dig("crossmark", "custom_metadata", "program") || bibliographic_metadata.dig("program")
-          
           resource_type = if journal_article.present?
                               "journal_article"
                             elsif journal_issue.present?
@@ -150,7 +149,7 @@ module Bolognese
                         "title" => parse_attributes(journal_metadata.to_h["full_title"]),
                         "volume" => parse_attributes(journal_issue.dig("journal_volume", "volume")),
                         "issue" => parse_attributes(journal_issue.dig("issue")),
-                        "firstPage" => bibliographic_metadata.dig("pages", "first_page"),
+                        "firstPage" => bibliographic_metadata.dig("pages", "first_page") || parse_attributes(journal_article.to_h.dig("publisher_item", "item_number"), first: true),
                         "lastPage" => bibliographic_metadata.dig("pages", "last_page") }.compact
                     elsif book_series_metadata.to_h.fetch("series_metadata", nil).present?
                       issn = normalize_issn(book_series_metadata.dig("series_metadata", "issn"))

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.8.12"
+  VERSION = "1.8.13"
 end

data/lib/bolognese/writers/bibtex_writer.rb

@@ -6,7 +6,7 @@ module Bolognese
       def bibtex
         return nil unless valid?
 
-        pages = container.to_h["firstPage"].present? ? [container["firstPage"], container["lastPage"]].join("-") : nil
+        pages = container.to_h["firstPage"].present? ? [container["firstPage"], container["lastPage"]].compact.join("-") : nil
 
         bib = {
           bibtex_type: types["bibtex"].presence || "misc",

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

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

data/spec/readers/crossref_reader_spec.rb

@@ -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")
@@ -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
 
@@ -718,6 +718,24 @@ describe Bolognese::Metadata, vcr: true do
       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"=>"Text", "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)

data/spec/writers/bibtex_writer_spec.rb

@@ -56,7 +56,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(bibtex[:bibtex_key]).to eq("https://doi.org/10.3204/desy-2014-01645")
       expect(bibtex[:doi]).to eq("10.3204/desy-2014-01645")
       expect(bibtex[:title]).to eq("Dynamics of colloids in molecular glass forming liquids studied via X-ray photon correlation spectroscopy")
-      expect(bibtex[:pages]).to eq("2014-")
+      expect(bibtex[:pages]).to eq("2014")
       expect(bibtex[:year]).to eq("2014")
     end
 

data/spec/writers/citation_writer_spec.rb

@@ -9,7 +9,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       expect(subject.style).to eq("apa")
       expect(subject.locale).to eq("en-US")
-      expect(subject.citation).to eq("Sankar, M., Nieminen, K., Ragni, L., Xenarios, I., &amp; Hardtke, C. S. (2014). Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth. <i>ELife</i>, <i>3</i>. https://doi.org/10.7554/elife.01567")
+      expect(subject.citation).to eq("Sankar, M., Nieminen, K., Ragni, L., Xenarios, I., &amp; Hardtke, C. S. (2014). Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth. <i>ELife</i>, <i>3</i>, e01567. https://doi.org/10.7554/elife.01567")
     end
 
     it "Journal article vancouver style" do
@@ -17,7 +17,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref", style: "vancouver", locale: "en-US")
       expect(subject.style).to eq("vancouver")
       expect(subject.locale).to eq("en-US")
-      expect(subject.citation).to eq("Sankar M, Nieminen K, Ragni L, Xenarios I, Hardtke CS. Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth. eLife [Internet]. 2014Feb11;3. Available from: https://elifesciences.org/articles/01567")
+      expect(subject.citation).to eq("Sankar M, Nieminen K, Ragni L, Xenarios I, Hardtke CS. Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth. eLife [Internet]. 2014Feb11;3:e01567. Available from: https://elifesciences.org/articles/01567")
     end
 
     it "Dataset" do

data/spec/writers/datacite_writer_spec.rb

@@ -316,7 +316,7 @@ describe Bolognese::Metadata, vcr: true do
       subject.descriptions = { "description" => "This is an abstract." }
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
-      expect(datacite.dig("descriptions", "description")).to eq( [{"__content__"=>"eLife, 3", "descriptionType"=>"SeriesInformation"}, {"__content__"=>"This is an abstract.", "descriptionType"=>"Abstract"}])
+      expect(datacite.dig("descriptions", "description")).to eq([{"__content__"=>"eLife, 3, e01567", "descriptionType"=>"SeriesInformation"}, {"__content__"=>"This is an abstract.", "descriptionType"=>"Abstract"}])
     end
 
     it "change description no input" do

data/spec/writers/ris_writer_spec.rb

@@ -19,8 +19,9 @@ describe Bolognese::Metadata, vcr: true do
       expect(ris[11]).to eq("PY  - 2014")
       expect(ris[12]).to eq("PB  - eLife Sciences Publications, Ltd")
       expect(ris[13]).to eq("VL  - 3")
-      expect(ris[14]).to eq("SN  - 2050-084X")
-      expect(ris[15]).to eq("ER  - ")
+      expect(ris[14]).to eq("SP  - e01567")
+      expect(ris[15]).to eq("SN  - 2050-084X")
+      expect(ris[16]).to eq("ER  - ")
     end
 
     it "with pages" do

data/spec/writers/schema_org_writer_spec.rb

@@ -11,7 +11,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["@id"]).to eq("https://doi.org/10.7554/elife.01567")
       expect(json["@type"]).to eq("ScholarlyArticle")
       expect(json["isPartOf"]).to eq("@type"=>"Periodical", "issn"=>"2050-084X")
-      expect(json["periodical"]).to eq("@type"=>"Journal", "identifier"=>"2050-084X", "identifierType"=>"ISSN", "name"=>"eLife", "volume"=>"3")
+      expect(json["periodical"]).to eq("@type"=>"Journal", "firstPage" => "e01567", "identifier"=>"2050-084X", "identifierType"=>"ISSN", "name"=>"eLife", "volume"=>"3")
       expect(json["citation"].length).to eq(26)
       expect(json["citation"].first).to eq("@id"=>"https://doi.org/10.1038/nature02100", "@type"=>"CreativeWork")
       expect(json["funder"]).to eq([{"name"=>"SystemsX", "@type"=>"Organization"},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.8.12
+  version: 1.8.13
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -899,6 +899,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/affiliation_is_space.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/another_book.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/another_book_chapter.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/article_id_as_page_number.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/author_literal.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/book.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/book_chapter.yml