bolognese 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 168dbdf9c5d9941dc078dd58d9696fa8c725a6eda1b33ec0a683b7ecfc0ac00d
-  data.tar.gz: d156284fc1a2c67d5bc401e571909ab1c192bba5963b06e266c4a1d19ba4bc7b
+  metadata.gz: b7dfdd5a4ed9f32ebdda67aaa28c592b045e9545d3b9fdcd42c9f0172171b95c
+  data.tar.gz: f60e08a85484127ffc5181669ed1c5fc60fd02200fb09b9064f1acca1801d434
 SHA512:
-  metadata.gz: 1514f703356abef2dfc1dfb1be6131d2d1d5f861c89352780918aa57ee4878b61779ffa2f41221575abf09e15198f67e5491a923cfaad00b13d3ef233ddc8059
-  data.tar.gz: 9c39ab0ded867281c7fbfc3edca254e5cef2f023339d56e8ed00fd7755a7361cbf6569a6cf1c42d577e0e534f755c83587ee68e33900b6372eb8599f488b5bc4
+  metadata.gz: 29612aa1baaae799e0d6a25d6a35efb9ad2ce271511e032ae48f29a392aa41597f668854fda596f61aa27bced9fbe6382949a70719e0b9dc7e145e7aa33bb8ce
+  data.tar.gz: a931e3c075cfe2f1e67c5b4fe2a8784e579c74b12fb53771d4326ff26da2e59cf45d7872cf929d5b184ee46335e6ca23a62821ab281541b36f5913ebeb445e4b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.2.3)
+    bolognese (1.2.4)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)

data/lib/bolognese/metadata.rb

@@ -17,10 +17,17 @@ module Bolognese
 
     def initialize(input: nil, from: nil, **options)
       id = normalize_id(input, options)
+      ra = nil
 
       if id.present?
         @from = from || find_from_format(id: id)
 
+        # mEDRA DOIs are found in the Crossref index
+        if @from == "medra"
+          @from = "crossref"
+          ra = "mEDRA"
+        end
+
         # generate name for method to call dynamically
         hsh = @from.present? ? send("get_" + @from, id: id, sandbox: options[:sandbox]) : {}
         string = hsh.fetch("string", nil)
@@ -104,7 +111,7 @@ module Bolognese
       @regenerate = options[:regenerate] || read_options.present?
 
       # generate name for method to call dynamically
-      @meta = @from.present? ? send("read_" + @from, { string: string, sandbox: options[:sandbox], doi: options[:doi], id: id }.merge(read_options)) : {}
+      @meta = @from.present? ? send("read_" + @from, { string: string, sandbox: options[:sandbox], doi: options[:doi], id: id, ra: ra }.merge(read_options)) : {}
     end
 
     def id

data/lib/bolognese/readers/bibtex_reader.rb

@@ -27,7 +27,7 @@ module Bolognese
       }
 
       def read_bibtex(string: nil, **options)
-        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate))
+        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate, :ra))
 
         meta = string.present? ? BibTeX.parse(string).first : OpenStruct.new
 

data/lib/bolognese/readers/citeproc_reader.rb

@@ -31,7 +31,7 @@ module Bolognese
           return { "errors" => errors } if errors.present?
         end
 
-        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate))
+        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate, :ra))
 
         meta = string.present? ? Maremma.from_json(string) : {}
 

data/lib/bolognese/readers/codemeta_reader.rb

@@ -18,7 +18,7 @@ module Bolognese
           return { "errors" => errors } if errors.present?
         end
 
-        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate))
+        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate, :ra))
 
         meta = string.present? ? Maremma.from_json(string) : {}
 

data/lib/bolognese/readers/crossref_reader.rb

@@ -17,7 +17,7 @@ module Bolognese
       end
 
       def read_crossref(string: nil, **options)
-        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate))
+        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate, :ra))
 
         if string.present?
           m = Maremma.from_xml(string).dig("crossref_result", "query_result", "body", "query", "doi_record") || {}
@@ -125,7 +125,7 @@ module Bolognese
           "funding_references" => crossref_funding_reference(program_metadata),
           "publisher" => publisher,
           "container" => container,
-          "agency" => "Crossref",
+          "agency" => agency = options[:ra] || "Crossref",
           "related_identifiers" => related_identifiers,
           "dates" => dates,
           "publication_year" => publication_year,

data/lib/bolognese/readers/datacite_reader.rb

@@ -47,7 +47,7 @@ module Bolognese
       end
 
       def read_datacite(string: nil, **options)
-        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate))
+        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate, :ra))
 
         doc = Nokogiri::XML(string, nil, 'UTF-8', &:noblanks)
         if read_options.present?

data/lib/bolognese/readers/ris_reader.rb

@@ -34,7 +34,7 @@ module Bolognese
       }
 
       def read_ris(string: nil, **options)
-        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate))
+        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate, :ra))
 
         meta = ris_meta(string: string)
 

data/lib/bolognese/readers/schema_org_reader.rb

@@ -44,7 +44,7 @@ module Bolognese
           return { "errors" => errors } if errors.present?
         end
 
-        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate))
+        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url, :sandbox, :validate, :ra))
 
         meta = string.present? ? Maremma.from_json(string) : {}
 

data/lib/bolognese/utils.rb

@@ -339,7 +339,7 @@ module Bolognese
 
       if /\A(?:(http|https):\/(\/)?(dx\.)?(doi.org|handle.test.datacite.org)\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match(id)
         ra = get_doi_ra(id)
-        %w(DataCite Crossref).include?(ra) ? ra.downcase : nil
+        %w(DataCite Crossref mEDRA).include?(ra) ? ra.downcase : nil
       elsif /\A(?:(http|https):\/(\/)?orcid\.org\/)?(\d{4}-\d{4}-\d{4}-\d{3}[0-9X]+)\z/.match(id)
         "orcid"
       elsif /\A(http|https):\/(\/)?github\.com\/(.+)\z/.match(id)

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

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

@@ -0,0 +1,125 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://doi.org/ra/10.3280
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Mozilla/5.0 (compatible; Maremma/4.2.3; 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:
+      - Fri, 05 Jul 2019 05:04:20 GMT
+      Content-Type:
+      - application/json;charset=UTF-8
+      Content-Length:
+      - '51'
+      Connection:
+      - keep-alive
+      Set-Cookie:
+      - __cfduid=dbad314cd019b12966bb82d714cc7ff471562303060; expires=Sat, 04-Jul-20
+        05:04:20 GMT; path=/; domain=.doi.org; HttpOnly
+      Expect-Ct:
+      - max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 4f16cc2e48b4a867-CDG
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        [
+          {
+            "DOI": "10.3280",
+            "RA": "mEDRA"
+          }
+        ]
+    http_version: 
+  recorded_at: Fri, 05 Jul 2019 05:04:20 GMT
+- request:
+    method: get
+    uri: https://api.crossref.org/works/10.3280/ecag2018-001005/transform/application/vnd.crossref.unixsd+xml
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Mozilla/5.0 (compatible; Maremma/4.2.3; mailto:info@datacite.org)
+      Accept:
+      - text/xml
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Link:
+      - <http://dx.doi.org/10.3280/ecag2018-001005>; rel="canonical"
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Headers:
+      - X-Requested-With
+      Content-Length:
+      - '3506'
+      Server:
+      - http-kit
+      Date:
+      - Fri, 05 Jul 2019 05:04:20 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=\"journal_article\">10.3280/ECAG2018-001005</doi>\r\n
+        \       <crm-item name=\"publisher-name\" type=\"string\">Franco Angeli</crm-item>\r\n
+        \       <crm-item name=\"prefix-name\" type=\"string\">Franco Angeli</crm-item>\r\n
+        \       <crm-item name=\"member-id\" type=\"number\">4169</crm-item>\r\n        <crm-item
+        name=\"citation-id\" type=\"number\">98889375</crm-item>\r\n        <crm-item
+        name=\"journal-id\" type=\"number\">215305</crm-item>\r\n        <crm-item
+        name=\"deposit-timestamp\" type=\"number\">20180712142055000</crm-item>\r\n
+        \       <crm-item name=\"owner-prefix\" type=\"string\">10.3280</crm-item>\r\n
+        \       <crm-item name=\"last-update\" type=\"date\">2018-10-18T14:30:29Z</crm-item>\r\n
+        \       <crm-item name=\"created\" type=\"date\">2018-06-07T09:40:49Z</crm-item>\r\n
+        \       <crm-item name=\"citedby-count\" type=\"number\">1</crm-item>\r\n
+        \       <doi_record>\r\n          <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\">\r\n
+        \           <journal>\r\n              <journal_metadata>\r\n                <full_title>ECONOMIA
+        AGRO-ALIMENTARE</full_title>\r\n                <issn media_type=\"print\">1126-1668</issn>\r\n
+        \               <issn media_type=\"electronic\">1972-4802</issn>\r\n              </journal_metadata>\r\n
+        \             <journal_issue>\r\n                <publication_date>\r\n                  <month>05</month>\r\n
+        \                 <year>2018</year>\r\n                </publication_date>\r\n
+        \               <issue>1</issue>\r\n              </journal_issue>\r\n              <journal_article
+        language=\"en\">\r\n                <titles>\r\n                  <title>Substitutability
+        between organic and conventional poultry products and organic price premiums</title>\r\n
+        \               </titles>\r\n                <contributors>\r\n                  <person_name
+        contributor_role=\"author\" sequence=\"first\">\r\n                    <given_name>Sohae
+        Eve</given_name>\r\n                    <surname>Oh</surname>\r\n                  </person_name>\r\n
+        \                 <person_name contributor_role=\"author\" sequence=\"additional\">\r\n
+        \                   <given_name>Tomislav</given_name>\r\n                    <surname>Vukina</surname>\r\n
+        \                 </person_name>\r\n                </contributors>\r\n                <publication_date>\r\n
+        \                 <month>05</month>\r\n                  <year>2018</year>\r\n
+        \               </publication_date>\r\n                <pages>\r\n                  <first_page>75</first_page>\r\n
+        \                 <last_page>92</last_page>\r\n                </pages>\r\n
+        \               <publisher_item>\r\n                  <item_number item_number_type=\"article_number\">5</item_number>\r\n
+        \               </publisher_item>\r\n                <doi_data>\r\n                  <doi>10.3280/ECAG2018-001005</doi>\r\n
+        \                 <resource>http://www.francoangeli.it/riviste/Scheda_Riviste.asp?IDArticolo=61645</resource>\r\n
+        \               </doi_data>\r\n              </journal_article>\r\n            </journal>\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: Fri, 05 Jul 2019 05:04:21 GMT
+recorded_with: VCR 3.0.3

data/spec/readers/crossref_reader_spec.rb

@@ -225,6 +225,22 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.agency).to eq("Crossref")
     end
 
+    it "mEDRA" do
+      input = "https://doi.org/10.3280/ecag2018-001005"
+      subject = Bolognese::Metadata.new(input: input)
+      expect(subject.valid?).to be true
+      expect(subject.identifiers).to eq([{"identifier"=>"https://doi.org/10.3280/ecag2018-001005", "identifierType"=>"DOI"}, {"identifier"=>"5", "identifierType"=>"Publisher ID"}])
+      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)
+      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"}])
+      expect(subject.dates).to eq([{"date"=>"2018-05", "dateType"=>"Issued"}, {"date"=>"2018-10-18T14:30:29Z", "dateType"=>"Updated"}])
+      expect(subject.publication_year).to eq("2018")
+      expect(subject.publisher).to eq("Franco Angeli")
+      expect(subject.agency).to eq("mEDRA")
+    end
+
     it "multiple titles" do
       input = "https://doi.org/10.4000/dms.865"
       subject = Bolognese::Metadata.new(input: input)

data/spec/readers/schema_org_reader_spec.rb

@@ -181,7 +181,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + 'schema_org_tdl_iodp_invalid_authors.json'
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be false
-     end
+    end
 
     it "geolocation" do
       input = fixture_path + 'schema_org_geolocation.json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -825,6 +825,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/date_in_future.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/journal_article.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/journal_article_with.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/mEDRA.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/missing_creator.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/multiple_t.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/multiple_titles.yml