bolognese 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f624193ecf8a118b01013a5a0a442fe57f304b6
-  data.tar.gz: e4c32a8f60033476ecd438956e0abbe6e891f4e2
+  metadata.gz: 063f676946258c78127e1d88782896a0b897e8a5
+  data.tar.gz: 3b9f829af641f7aa53394eb79e588a838bc88abb
 SHA512:
-  metadata.gz: bbddae6659ad97a27ea93411936b868403597a260de06e5398e20e4e6da95086c02598bab75cf99021a5cffa915178be8c499d72ecbbbabf7ebe35daf34629bf
-  data.tar.gz: 70dac5753375a8fd3c288c129e5580b9ad4489f1721638c63a53c85cca1379890417f28a56a952af45a73cecc7f508e6dc5c76d3d072509b3715ba8cc1fc7a97
+  metadata.gz: 0583e3e9ec72227314e388c395b2d03c9e61421e6b5307b2bfa8254c988dca539cad1ffa3f94f1775d8f3f0ca2848d6fb6e6be808e2089b19657ac30eb17020a
+  data.tar.gz: dd8d205fa555873683f496c5e49572bcc3a953fbb7d128baba3ca062e7ea206e86dc1592080edbea5e982d8fdccdfb042a29f0ad52d009ea7ba85d9c7a70c768

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.8.3)
+    bolognese (0.8.4)
       activesupport (~> 4.2, >= 4.2.5)
       bibtex-ruby (~> 4.1)
       builder (~> 3.2, >= 3.2.2)
@@ -123,4 +123,4 @@ DEPENDENCIES
   webmock (~> 1.22, >= 1.22.3)
 
 BUNDLED WITH
-   1.14.6
+   1.12.5

data/lib/bolognese/doi_utils.rb

@@ -4,6 +4,10 @@ module Bolognese
       Array(/\A(?:(http|https):\/\/(dx\.)?doi.org\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match(doi)).last
     end
 
+    def validate_prefix(doi)
+      Array(/\A(?:(http|https):\/\/(dx\.)?doi.org\/)?(doi:)?(10\.\d{4,5})\/.+\z/.match(doi)).last
+    end
+
     def normalize_doi(doi)
       doi = validate_doi(doi)
       return nil unless doi.present?
@@ -26,20 +30,15 @@ module Bolognese
       "https://doi.org/#{clean_doi(doi)}" if doi.present?
     end
 
-    # get DOI registration agency, assume a normalized DOI
+    # get DOI registration agency
     def get_doi_ra(doi)
-      return {} if doi.blank?
+      prefix = validate_prefix(doi)
+      return nil if prefix.blank?
 
-      url = "https://doi.crossref.org/doiRA/#{doi_from_url(doi)}"
-      response = Maremma.get(url, host: true, timeout: 120)
+      url = "https://api.datacite.org/prefixes/#{prefix}"
+      result = Maremma.get(url)
 
-      ra = response.body.fetch("data", {}).first.fetch("RA", nil)
-      if ra.present?
-        { "id" => ra.downcase,
-          "name" => ra }
-      else
-        { "errors" => response.body.fetch("errors", nil) || response.body.fetch("data", nil) }
-      end
+      result.body.fetch("data", {}).fetch('attributes', {}).fetch('registration-agency', nil)
     end
   end
 end

data/lib/bolognese/utils.rb

@@ -21,7 +21,8 @@ module Bolognese
       id = normalize_id(id)
 
       if /\A(?:(http|https):\/\/(dx\.)?doi.org\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match(id)
-        get_doi_ra(id).fetch("id", nil)
+        ra = get_doi_ra(id)
+        ra.present? ? 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 = "0.8.3"
+  VERSION = "0.8.4"
 end

data/spec/doi_utils_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 
-describe Bolognese::Crossref, vcr: true do
-  let(:id) { "https://doi.org/10.1371/journal.pone.0000030" }
+describe Bolognese::Metadata, vcr: true do
 
-  subject { Bolognese::Crossref.new(id: id) }
+  subject { Bolognese::Metadata.new }
 
   context "normalize doi" do
     it "doi" do
@@ -65,25 +64,31 @@ describe Bolognese::Crossref, vcr: true do
     it "datacite" do
       doi = "https://doi.org/10.5061/dryad.8515"
       response = subject.get_doi_ra(doi)
-      expect(response["name"]).to eq("DataCite")
+      expect(response).to eq("DataCite")
     end
 
     it "crossref" do
-      doi = "https://doi.org/10.1371/journal.pone.0000030"
+      doi = "10.1371/journal.pone.0000030"
       response = subject.get_doi_ra(doi)
-      expect(response["name"]).to eq("Crossref")
+      expect(response).to eq("Crossref")
     end
 
     it "medra" do
       doi = "https://doi.org/10.1392/roma081203"
       response = subject.get_doi_ra(doi)
-      expect(response["name"]).to eq("mEDRA")
+      expect(response).to eq("mEDRA")
+    end
+
+    it "not a valid prefix" do
+      doi = "https://doi.org/10.a/dryad.8515x"
+      response = subject.get_doi_ra(doi)
+      expect(response).to be_nil
     end
 
     it "not found" do
-      doi = "https://doi.org/10.5061/dryad.8515x"
+      doi = "https://doi.org/10.99999/dryad.8515x"
       response = subject.get_doi_ra(doi)
-      expect(response["errors"]).to eq([{"DOI"=>"10.5061/dryad.8515x", "status"=>"Invalid DOI"}])
+      expect(response).to be_nil
     end
   end
 end

data/spec/fixtures/vcr_cassettes/Bolognese_CLI/convert_from_id/crossref/default.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://doi.crossref.org/doiRA/10.7554/elife.01567
+    uri: https://api.datacite.org/prefixes/10.7554
     body:
       encoding: US-ASCII
       string: ''
@@ -16,31 +16,61 @@ http_interactions:
       code: 200
       message: ''
     headers:
-      Server:
-      - Apache-Coyote/1.1
-      Crossref-Deployment-Name:
-      - svc1-1
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Headers:
+      - Content-Type,Accept,Accept-Encoding,Origin,User-Agent,Cache-Control,Keep-Alive
+      Access-Control-Allow-Methods:
+      - POST, GET, OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
       Content-Type:
-      - application/json;charset=UTF-8
-      Content-Language:
-      - en-US
-      Content-Length:
-      - '57'
+      - application/vnd.api+json; charset=utf-8
       Date:
-      - Wed, 22 Feb 2017 17:21:17 GMT
+      - Sun, 12 Mar 2017 09:09:07 GMT
+      Etag:
+      - W/"daf85afdb45f3c2713bc7e75916ba82a"
+      Server:
+      - openresty/1.11.2.2
+      Status:
+      - 200 OK
+      Vary:
+      - Accept-Encoding
+      Via:
+      - kong/0.10.0rc3
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Kong-Proxy-Latency:
+      - '18'
+      X-Kong-Upstream-Latency:
+      - '545'
+      X-Powered-By:
+      - Phusion Passenger 5.1.2
+      X-Ratelimit-Limit-Hour:
+      - '10000'
+      X-Ratelimit-Remaining-Hour:
+      - '9992'
+      X-Request-Id:
+      - 4a1c67ea-4ffb-4674-93d8-e4b2e1fa71a4
+      X-Runtime:
+      - '0.543916'
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '124'
       Connection:
-      - close
+      - keep-alive
     body:
       encoding: UTF-8
-      string: |-
-        [
-         {
-         "DOI": "10.7554/elife.01567",
-         "RA": "Crossref"
-        }
-        ]
+      string: '{"data":{"id":"10.7554","type":"prefixes","attributes":{"registration-agency":"Crossref","updated":"2016-09-21T21:07:27Z"}}}'
     http_version: 
-  recorded_at: Wed, 22 Feb 2017 17:21:18 GMT
+  recorded_at: Sun, 12 Mar 2017 09:09:07 GMT
 - request:
     method: get
     uri: https://doi.org/10.7554/elife.01567
@@ -64,20 +94,20 @@ http_interactions:
       Location:
       - http://data.crossref.org/10.7554%2Felife.01567
       Expires:
-      - Wed, 22 Feb 2017 17:45:01 GMT
+      - Sun, 12 Mar 2017 09:59:19 GMT
       Content-Type:
       - text/html;charset=utf-8
       Content-Length:
       - '177'
       Date:
-      - Wed, 22 Feb 2017 17:21:26 GMT
+      - Sun, 12 Mar 2017 09:09:14 GMT
     body:
       encoding: UTF-8
       string: |-
         <html><head><title>Handle Redirect</title></head>
         <body><a href="http://data.crossref.org/10.7554%2Felife.01567">http://data.crossref.org/10.7554%2Felife.01567</a></body></html>
     http_version: 
-  recorded_at: Wed, 22 Feb 2017 17:21:27 GMT
+  recorded_at: Sun, 12 Mar 2017 09:09:15 GMT
 - request:
     method: get
     uri: http://data.crossref.org/10.7554%2Felife.01567
@@ -113,7 +143,7 @@ http_interactions:
       Server:
       - http-kit
       Date:
-      - Wed, 22 Feb 2017 17:21:27 GMT
+      - Sun, 12 Mar 2017 09:09:15 GMT
       Connection:
       - close
     body:
@@ -756,5 +786,5 @@ http_interactions:
         aWNsZT4NCiAgICAgIDwvam91cm5hbD4NCiAgICA8L2Nyb3NzcmVmPg0KICA8
         L2RvaV9yZWNvcmQ+DQo8L2RvaV9yZWNvcmRzPg==
     http_version: 
-  recorded_at: Wed, 22 Feb 2017 17:21:27 GMT
+  recorded_at: Sun, 12 Mar 2017 09:09:15 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Bolognese_CLI/convert_from_id/crossref/to_bibtex.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://doi.crossref.org/doiRA/10.7554/elife.01567
+    uri: https://api.datacite.org/prefixes/10.7554
     body:
       encoding: US-ASCII
       string: ''
@@ -16,31 +16,61 @@ http_interactions:
       code: 200
       message: ''
     headers:
-      Server:
-      - Apache-Coyote/1.1
-      Crossref-Deployment-Name:
-      - svc1-1
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Headers:
+      - Content-Type,Accept,Accept-Encoding,Origin,User-Agent,Cache-Control,Keep-Alive
+      Access-Control-Allow-Methods:
+      - POST, GET, OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
       Content-Type:
-      - application/json;charset=UTF-8
-      Content-Language:
-      - en-US
-      Content-Length:
-      - '57'
+      - application/vnd.api+json; charset=utf-8
       Date:
-      - Wed, 22 Feb 2017 17:30:21 GMT
+      - Sun, 12 Mar 2017 09:08:47 GMT
+      Etag:
+      - W/"daf85afdb45f3c2713bc7e75916ba82a"
+      Server:
+      - openresty/1.11.2.2
+      Status:
+      - 200 OK
+      Vary:
+      - Accept-Encoding
+      Via:
+      - kong/0.10.0rc3
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Kong-Proxy-Latency:
+      - '1'
+      X-Kong-Upstream-Latency:
+      - '489'
+      X-Powered-By:
+      - Phusion Passenger 5.1.2
+      X-Ratelimit-Limit-Hour:
+      - '10000'
+      X-Ratelimit-Remaining-Hour:
+      - '9994'
+      X-Request-Id:
+      - 62732ae3-9068-4d9c-ade4-36f6523afc7e
+      X-Runtime:
+      - '0.487711'
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '124'
       Connection:
-      - close
+      - keep-alive
     body:
       encoding: UTF-8
-      string: |-
-        [
-         {
-         "DOI": "10.7554/elife.01567",
-         "RA": "Crossref"
-        }
-        ]
+      string: '{"data":{"id":"10.7554","type":"prefixes","attributes":{"registration-agency":"Crossref","updated":"2016-09-21T21:07:27Z"}}}'
     http_version: 
-  recorded_at: Wed, 22 Feb 2017 17:30:22 GMT
+  recorded_at: Sun, 12 Mar 2017 09:08:48 GMT
 - request:
     method: get
     uri: https://doi.org/10.7554/elife.01567
@@ -64,20 +94,20 @@ http_interactions:
       Location:
       - http://data.crossref.org/10.7554%2Felife.01567
       Expires:
-      - Wed, 22 Feb 2017 17:45:01 GMT
+      - Sun, 12 Mar 2017 09:59:19 GMT
       Content-Type:
       - text/html;charset=utf-8
       Content-Length:
       - '177'
       Date:
-      - Wed, 22 Feb 2017 17:30:22 GMT
+      - Sun, 12 Mar 2017 09:08:55 GMT
     body:
       encoding: UTF-8
       string: |-
         <html><head><title>Handle Redirect</title></head>
         <body><a href="http://data.crossref.org/10.7554%2Felife.01567">http://data.crossref.org/10.7554%2Felife.01567</a></body></html>
     http_version: 
-  recorded_at: Wed, 22 Feb 2017 17:30:22 GMT
+  recorded_at: Sun, 12 Mar 2017 09:08:56 GMT
 - request:
     method: get
     uri: http://data.crossref.org/10.7554%2Felife.01567
@@ -113,7 +143,7 @@ http_interactions:
       Server:
       - http-kit
       Date:
-      - Wed, 22 Feb 2017 17:30:22 GMT
+      - Sun, 12 Mar 2017 09:08:56 GMT
       Connection:
       - close
     body:
@@ -756,5 +786,5 @@ http_interactions:
         aWNsZT4NCiAgICAgIDwvam91cm5hbD4NCiAgICA8L2Nyb3NzcmVmPg0KICA8
         L2RvaV9yZWNvcmQ+DQo8L2RvaV9yZWNvcmRzPg==
     http_version: 
-  recorded_at: Wed, 22 Feb 2017 17:30:22 GMT
+  recorded_at: Sun, 12 Mar 2017 09:08:56 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Bolognese_CLI/convert_from_id/crossref/to_crossref.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://doi.crossref.org/doiRA/10.7554/elife.01567
+    uri: https://api.datacite.org/prefixes/10.7554
     body:
       encoding: US-ASCII
       string: ''
@@ -16,31 +16,61 @@ http_interactions:
       code: 200
       message: ''
     headers:
-      Server:
-      - Apache-Coyote/1.1
-      Crossref-Deployment-Name:
-      - svc1-1
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Headers:
+      - Content-Type,Accept,Accept-Encoding,Origin,User-Agent,Cache-Control,Keep-Alive
+      Access-Control-Allow-Methods:
+      - POST, GET, OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
       Content-Type:
-      - application/json;charset=UTF-8
-      Content-Language:
-      - en-US
-      Content-Length:
-      - '57'
+      - application/vnd.api+json; charset=utf-8
       Date:
-      - Wed, 22 Feb 2017 17:30:20 GMT
+      - Sun, 12 Mar 2017 09:09:16 GMT
+      Etag:
+      - W/"daf85afdb45f3c2713bc7e75916ba82a"
+      Server:
+      - openresty/1.11.2.2
+      Status:
+      - 200 OK
+      Vary:
+      - Accept-Encoding
+      Via:
+      - kong/0.10.0rc3
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Kong-Proxy-Latency:
+      - '26'
+      X-Kong-Upstream-Latency:
+      - '237'
+      X-Powered-By:
+      - Phusion Passenger 5.1.2
+      X-Ratelimit-Limit-Hour:
+      - '10000'
+      X-Ratelimit-Remaining-Hour:
+      - '9991'
+      X-Request-Id:
+      - 2ceda84e-d266-4ed3-9f8a-df8675fd0106
+      X-Runtime:
+      - '0.236229'
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '124'
       Connection:
-      - close
+      - keep-alive
     body:
       encoding: UTF-8
-      string: |-
-        [
-         {
-         "DOI": "10.7554/elife.01567",
-         "RA": "Crossref"
-        }
-        ]
+      string: '{"data":{"id":"10.7554","type":"prefixes","attributes":{"registration-agency":"Crossref","updated":"2016-09-21T21:07:27Z"}}}'
     http_version: 
-  recorded_at: Wed, 22 Feb 2017 17:30:21 GMT
+  recorded_at: Sun, 12 Mar 2017 09:09:16 GMT
 - request:
     method: get
     uri: https://doi.org/10.7554/elife.01567
@@ -64,20 +94,20 @@ http_interactions:
       Location:
       - http://data.crossref.org/10.7554%2Felife.01567
       Expires:
-      - Wed, 22 Feb 2017 17:45:01 GMT
+      - Sun, 12 Mar 2017 09:59:19 GMT
       Content-Type:
       - text/html;charset=utf-8
       Content-Length:
       - '177'
       Date:
-      - Wed, 22 Feb 2017 17:30:20 GMT
+      - Sun, 12 Mar 2017 09:09:23 GMT
     body:
       encoding: UTF-8
       string: |-
         <html><head><title>Handle Redirect</title></head>
         <body><a href="http://data.crossref.org/10.7554%2Felife.01567">http://data.crossref.org/10.7554%2Felife.01567</a></body></html>
     http_version: 
-  recorded_at: Wed, 22 Feb 2017 17:30:21 GMT
+  recorded_at: Sun, 12 Mar 2017 09:09:24 GMT
 - request:
     method: get
     uri: http://data.crossref.org/10.7554%2Felife.01567
@@ -113,7 +143,7 @@ http_interactions:
       Server:
       - http-kit
       Date:
-      - Wed, 22 Feb 2017 17:30:21 GMT
+      - Sun, 12 Mar 2017 09:09:24 GMT
       Connection:
       - close
     body:
@@ -756,5 +786,5 @@ http_interactions:
         aWNsZT4NCiAgICAgIDwvam91cm5hbD4NCiAgICA8L2Nyb3NzcmVmPg0KICA8
         L2RvaV9yZWNvcmQ+DQo8L2RvaV9yZWNvcmRzPg==
     http_version: 
-  recorded_at: Wed, 22 Feb 2017 17:30:21 GMT
+  recorded_at: Sun, 12 Mar 2017 09:09:25 GMT
 recorded_with: VCR 3.0.3