bolognese 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36737983981bbdb5e659c5226fe9c7a6f043d2cdea71ccf97ea358128770fa59
-  data.tar.gz: c09a31b4be63e5bc7998a6b506db232010eff1b60c6815b4aae86c186ea0d60b
+  metadata.gz: 2844940808f11b8faa885e34806bea245ab3c8d772bec2877de19a1122e49895
+  data.tar.gz: cc6167a8111867f03168c121a11db290671f2bbaf8a3ea2e295faa339b81ed12
 SHA512:
-  metadata.gz: cfee7c8750c022e47d0e6d7050dc72f487b17675c073a4d1c2469573cf101054efd11329f23dd01b2b8a55bf4dfffffeb28b038ebe26527d728f4ddb04ad09fa
-  data.tar.gz: 36068c59bfbbf0420c9423919fd4b8f93552a100b57f23f8841e63bdec6f9e5b03e6c7d23ee76c986708cb379e59af0ff1e435d1fb2d22a5c4baaebfe30e8e1f
+  metadata.gz: fb45a458092cde73a13a28a8208c4c115f0a6386afdb53cf9b25c89ff85de8767c7c0d6a368c056a3f736961e2e5ea9589ec38f212c038b105ceb32e6d435d9c
+  data.tar.gz: 43edabbc11bf430fd372c209bade25085e84ba73f4d64a52221cc143756ba374c703b485e1770afdede0939c5a33f40dda0017b0ead213d98704bd00f9cc0316

data/Gemfile.lock

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

data/lib/bolognese/readers/crossref_reader.rb

@@ -31,7 +31,7 @@ module Bolognese
         end
 
         # model should be one of book, conference, database, dissertation, journal, peer_review, posted_content,
-        # report-paper, sa_component, standard
+        # report_paper, sa_component, standard
         model = meta.dig("crossref").to_h.keys.last
 
         resource_type = nil
@@ -82,6 +82,9 @@ module Bolognese
         when "database"
           bibliographic_metadata = meta.dig("crossref", "database", "dataset").to_h
           resource_type = "dataset"
+        when "report_paper"
+          bibliographic_metadata = meta.dig("crossref", "report_paper", "report_paper_metadata").to_h
+          resource_type = "report"
         end
 
         resource_type = (resource_type || model).to_s.underscore.camelcase.presence
@@ -156,7 +159,7 @@ module Bolognese
                     end
 
         id = normalize_doi(options[:doi] || options[:id] || bibliographic_metadata.dig("doi_data", "doi"))
-        identifiers = [crossref_alternate_identifiers(bibliographic_metadata)].compact
+        identifiers = crossref_alternate_identifiers(bibliographic_metadata)
 
         { "id" => id,
           "types" => types,
@@ -187,14 +190,23 @@ module Bolognese
 
       def crossref_alternate_identifiers(bibliographic_metadata)
         if bibliographic_metadata.dig("publisher_item", "item_number").present?
-          { "identifier" => parse_attributes(bibliographic_metadata.dig("publisher_item", "item_number")),
-            "identifierType" => "Publisher ID" }
+          Array.wrap(bibliographic_metadata.dig("publisher_item", "item_number")).map do |item|
+            if item.is_a?(String)
+              { "identifier" => item,
+                "identifierType" => "Publisher ID" }
+            else
+              { "identifier" => item.fetch("__content__", nil),
+                "identifierType" => item.fetch("item_number_type", nil) || "Publisher ID" }
+            end
+          end
         elsif parse_attributes(bibliographic_metadata.fetch("item_number", nil)).present?
-          { "identifier" => parse_attributes(bibliographic_metadata.fetch("item_number", nil)),
-            "identifierType" => "Publisher ID" }
+          [{ "identifier" => parse_attributes(bibliographic_metadata.fetch("item_number", nil)),
+            "identifierType" => "Publisher ID" }]
         elsif parse_attributes(bibliographic_metadata.fetch("isbn", nil)).present?
-          { "identifier" => parse_attributes(bibliographic_metadata.fetch("isbn", nil), first: true),
-            "identifierType" => "ISBN" }
+          [{ "identifier" => parse_attributes(bibliographic_metadata.fetch("isbn", nil), first: true),
+             "identifierType" => "ISBN" }]
+        else
+          []
         end
       end
 

data/lib/bolognese/utils.rb

@@ -117,7 +117,7 @@ module Bolognese
       "EditedBook" => "Book",
       "JournalArticle" => "ScholarlyArticle",
       "Journal" => nil,
-      "Report" => nil,
+      "Report" => "Report",
       "BookSeries" => nil,
       "ReportSeries" => nil,
       "BookTrack" => nil,
@@ -146,7 +146,7 @@ module Bolognese
       "EditedBook" => "book",
       "JournalArticle" => "article",
       "Journal" => nil,
-      "Report" => nil,
+      "Report" => "techreport",
       "BookSeries" => nil,
       "ReportSeries" => nil,
       "BookTrack" => nil,
@@ -214,6 +214,7 @@ module Bolognese
       "ImageObject" => "Image",
       "Movie" => "Audiovisual",
       "PublicationIssue" => "Text",
+      "Report" => "Text",
       "ScholarlyArticle" => "Text",
       "Thesis" => "Text",
       "Service" => "Service",
@@ -258,6 +259,7 @@ module Bolognese
       "ImageObject" => "graphic",
       "Movie" => "motion_picture",
       "PublicationIssue" => nil,
+      "Report" => "report",
       "ScholarlyArticle" => "article-journal",
       "Service" => nil,
       "Thesis" => "thesis",
@@ -278,6 +280,7 @@ module Bolognese
       "Event" => nil,
       "ImageObject" => "FIGURE",
       "Movie" => "MPCT",
+      "Report" => "RPRT",
       "PublicationIssue" => nil,
       "ScholarlyArticle" => "JOUR",
       "Service" => nil,
@@ -298,11 +301,11 @@ module Bolognese
       "EditedBook" => "BOOK",
       "JournalArticle" => "JOUR",
       "Journal" => nil,
-      "Report" => nil,
+      "Report" => "RPRT",
       "BookSeries" => nil,
       "ReportSeries" => nil,
       "BookTrack" => nil,
-      "Standard" => nil,
+      "Standard" => "STAND",
       "BookSection" => "CHAP",
       "BookPart" => "CHAP",
       "Book" => "BOOK",

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.8.4"
+  VERSION = "1.8.5"
 end

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

@@ -0,0 +1,138 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://doi.org/ra/10.2172
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Mozilla/5.0 (compatible; Maremma/4.7.1; 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:
+      - Wed, 29 Jul 2020 21:23:48 GMT
+      Content-Type:
+      - application/json;charset=UTF-8
+      Connection:
+      - keep-alive
+      Set-Cookie:
+      - __cfduid=d01ef02c612a86c1cf7a059f5c9c803201596057828; expires=Fri, 28-Aug-20
+        21:23:48 GMT; path=/; domain=.doi.org; HttpOnly; SameSite=Lax; Secure
+      Cf-Cache-Status:
+      - DYNAMIC
+      Cf-Request-Id:
+      - 043e0ed580000096d473a7a200000001
+      Expect-Ct:
+      - max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 5ba9e7359f0c96d4-FRA
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        [
+          {
+            "DOI": "10.2172",
+            "RA": "Crossref"
+          }
+        ]
+    http_version:
+  recorded_at: Wed, 29 Jul 2020 21:23:48 GMT
+- request:
+    method: get
+    uri: https://api.crossref.org/works/10.2172/972169/transform/application/vnd.crossref.unixsd+xml
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Mozilla/5.0 (compatible; Maremma/4.7.1; mailto:info@datacite.org)
+      Accept:
+      - text/xml
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Link:
+      - <http://dx.doi.org/10.2172/972169>; rel="canonical"
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Headers:
+      - X-Requested-With
+      Content-Length:
+      - '4217'
+      Server:
+      - http-kit
+      Date:
+      - Wed, 29 Jul 2020 21:23:49 GMT
+      X-Rate-Limit-Limit:
+      - '50'
+      X-Rate-Limit-Interval:
+      - 1s
+      Connection:
+      - close
+    body:
+      encoding: ASCII-8BIT
+      string: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<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\">\r\n  <query_result>\r\n
+        \   <head>\r\n      <doi_batch_id>none</doi_batch_id>\r\n    </head>\r\n    <body>\r\n
+        \     <query status=\"resolved\">\r\n        <doi type=\"report-paper_title\">10.2172/972169</doi>\r\n
+        \       <crm-item name=\"publisher-name\" type=\"string\">Office of Scientific
+        and Technical Information  (OSTI)</crm-item>\r\n        <crm-item name=\"prefix-name\"
+        type=\"string\">Office of Scientific and Technical Information</crm-item>\r\n
+        \       <crm-item name=\"member-id\" type=\"number\">960</crm-item>\r\n        <crm-item
+        name=\"citation-id\" type=\"number\">41225045</crm-item>\r\n        <crm-item
+        name=\"book-id\" type=\"number\">584445</crm-item>\r\n        <crm-item name=\"deposit-timestamp\"
+        type=\"number\">20100218105553</crm-item>\r\n        <crm-item name=\"owner-prefix\"
+        type=\"string\">10.2172</crm-item>\r\n        <crm-item name=\"last-update\"
+        type=\"date\">2010-02-19T03:56:05Z</crm-item>\r\n        <crm-item name=\"created\"
+        type=\"date\">2010-02-19T03:56:03Z</crm-item>\r\n        <crm-item name=\"citedby-count\"
+        type=\"number\">159</crm-item>\r\n        <doi_record>\r\n          <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\">\r\n            <report-paper
+        publication_type=\"full_text\">\r\n              <report-paper_metadata language=\"en\">\r\n
+        \               <contributors>\r\n                  <person_name sequence=\"first\"
+        contributor_role=\"author\">\r\n                    <given_name>P.</given_name>\r\n
+        \                   <surname>Denholm</surname>\r\n                  </person_name>\r\n
+        \                 <person_name sequence=\"additional\" contributor_role=\"author\">\r\n
+        \                   <given_name>E.</given_name>\r\n                    <surname>Ela</surname>\r\n
+        \                 </person_name>\r\n                  <person_name sequence=\"additional\"
+        contributor_role=\"author\">\r\n                    <given_name>B.</given_name>\r\n
+        \                   <surname>Kirby</surname>\r\n                  </person_name>\r\n
+        \                 <person_name sequence=\"additional\" contributor_role=\"author\">\r\n
+        \                   <given_name>M.</given_name>\r\n                    <surname>Milligan</surname>\r\n
+        \                 </person_name>\r\n                </contributors>\r\n                <titles>\r\n
+        \                 <title>Role of Energy Storage with Renewable Electricity
+        Generation</title>\r\n                </titles>\r\n                <publication_date
+        media_type=\"online\">\r\n                  <month>01</month>\r\n                  <day>01</day>\r\n
+        \                 <year>2010</year>\r\n                </publication_date>\r\n
+        \               <approval_date>\r\n                  <month>02</month>\r\n
+        \                 <day>18</day>\r\n                  <year>2010</year>\r\n
+        \               </approval_date>\r\n                <institution>\r\n                  <institution_name>National
+        Renewable Energy Laboratory (NREL)</institution_name>\r\n                  <institution_acronym>NREL</institution_acronym>\r\n
+        \                 <institution_place>Golden, CO (United States)</institution_place>\r\n
+        \               </institution>\r\n                <institution>\r\n                  <institution_name>USDOE</institution_name>\r\n
+        \               </institution>\r\n                <publisher_item>\r\n                  <item_number
+        item_number_type=\"report-number\">NREL/TP-6A2-47187</item_number>\r\n                  <item_number
+        item_number_type=\"sequence-number\">972169</item_number>\r\n                </publisher_item>\r\n
+        \               <contract_number>AC36-99-GO10337</contract_number>\r\n                <doi_data>\r\n
+        \                 <doi>10.2172/972169</doi>\r\n                  <timestamp>20100218105553</timestamp>\r\n
+        \                 <resource>http://www.osti.gov/servlets/purl/972169-1QXROM/</resource>\r\n
+        \               </doi_data>\r\n              </report-paper_metadata>\r\n
+        \           </report-paper>\r\n          </crossref>\r\n        </doi_record>\r\n
+        \     </query>\r\n    </body>\r\n  </query_result>\r\n</crossref_result>"
+    http_version:
+  recorded_at: Wed, 29 Jul 2020 21:23:49 GMT
+recorded_with: VCR 3.0.3

data/spec/readers/crossref_reader_spec.rb

@@ -19,7 +19,7 @@ describe Bolognese::Metadata, vcr: true do
     it "DOI with data citation" 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"=>"Publisher ID"}])
+      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.url).to eq("https://elifesciences.org/articles/01567")
       expect(subject.creators.length).to eq(5)
@@ -82,7 +82,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.3389/fpls.2019.00816")
-      expect(subject.identifiers).to eq([{"identifier"=>"816", "identifierType"=>"Publisher ID"}])
+      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.creators.length).to eq(4)
@@ -229,7 +229,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1016/j.ejphar.2015.03.018")
-      expect(subject.identifiers).to eq([{"identifier"=>"S0014299915002332", "identifierType"=>"Publisher ID"}])
+      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.creators.length).to eq(10)
@@ -433,7 +433,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.3280/ecag2018-001005")
-      expect(subject.identifiers).to eq([{"identifier"=>"5", "identifierType"=>"Publisher ID"}])
+      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.creators.length).to eq(2)
@@ -547,7 +547,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.1055/s-0039-1690894")
-      expect(subject.identifiers).to eq([{"identifier"=>"s-0039-1690894", "identifierType"=>"Publisher ID"}])
+      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.creators.length).to eq(4)
@@ -643,6 +643,25 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.agency).to eq("crossref")
     end
 
+    it "report osti" do
+      input = "10.2172/972169"
+      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.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)
+      expect(subject.titles).to eq([{"title"=>"Role of Energy Storage with Renewable Electricity Generation"}])
+      expect(subject.id).to eq("https://doi.org/10.2172/972169")
+      expect(subject.identifiers).to eq( [{"identifier"=>"NREL/TP-6A2-47187", "identifierType"=>"report-number"}, {"identifier"=>"972169", "identifierType"=>"sequence-number"}])
+      expect(subject.descriptions).to be_empty
+      expect(subject.dates).to include({"date"=>"2010-01-01", "dateType"=>"Issued"})
+      expect(subject.publication_year).to eq("2010")
+      expect(subject.publisher).to eq("Office of Scientific and Technical Information  (OSTI)")
+      expect(subject.agency).to eq("crossref")
+    end
+
     it "journal issue" do
       input = "https://doi.org/10.6002/ect.2015.0371"
       subject = Bolognese::Metadata.new(input: input)

data/spec/writers/datacite_writer_spec.rb

@@ -386,11 +386,11 @@ describe Bolognese::Metadata, vcr: true do
       input = "10.7554/eLife.01567"
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       expect(subject.valid?).to be true
-      expect(subject.identifiers).to eq( [{"identifier"=>"e01567", "identifierType"=>"Publisher ID"}])
-      subject.identifiers = [{ "identifierType" => "Publisher ID", "identifier" => "abc" }]
+      expect(subject.identifiers).to eq([{"identifier"=>"e01567", "identifierType"=>"article_number"}])
+      subject.identifiers = [{ "identifierType" => "article_number", "identifier" => "abc" }]
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("identifier", "__content__")).to eq("10.7554/elife.01567")
-      expect(subject.identifiers).to eq([{"identifier"=>"abc", "identifierType"=>"Publisher ID"}])
+      expect(subject.identifiers).to eq([{"identifier"=>"abc", "identifierType"=>"article_number"}])
     end
 
     it "validates against schema" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -928,6 +928,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/not_found_error.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/posted_content.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/posted_content_copernicus.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/report_osti.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/vor_with_url.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/yet_another_book.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/yet_another_book_chapter.yml