bolognese 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87dcfda2acc47c84644d1b5bde8df749b7b8700
-  data.tar.gz: 83491658ed3d00d359bb7c3e087c7b477dd73305
+  metadata.gz: 0f0ad35d86007004e6b15e1d87388be0e27975d4
+  data.tar.gz: 272aa8029bb7002ae0a3ec267fd606fadcc84d2d
 SHA512:
-  metadata.gz: d92685458199416d739bbe1420044d94bf5f6a6be10e556471d30227ec52c614edc0a5514aa06cad8be2042078d374b3f7af148db28972a0b9f775307f9bcf6e
-  data.tar.gz: c21cdcf2a8b74bd5089da69910cc3631b3896d53392f3f3ef5992dba1b828f58b862dcc2fe8fafc95ca45c774f71c3955b31e843abe3c7a02dfc3ad4f153e8bf
+  metadata.gz: e436ada7729c2c837573c31e704c799771998338df4d00677eb59853be900e5b500fcf0410141f64c981fc1b80a4d25f573441259b6a8eaa2eed847eb6615bcd
+  data.tar.gz: 2193e6806968bfa552f17c9a2c79fca9a05608730397aac7aec4db4d1eab1ba47f21d919586a1b5dc6c1f0f7bbc7b0f4cbfbaf669d88bd6df5d7756ebe0f3736

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.9.3)
+    bolognese (0.9.4)
       activesupport (>= 4.2.5)
       bibtex-ruby (~> 4.1)
       builder (~> 3.2, >= 3.2.2)

data/lib/bolognese/crossref.rb

@@ -60,13 +60,17 @@ module Bolognese
       "PostedContent" => "article"
     }
 
+    CONTACT_EMAIL = "tech@datacite.org"
+
     def initialize(id: nil, string: nil)
       id = normalize_doi(id) if id.present?
 
       if string.present?
         @raw = string
       elsif id.present?
-        response = Maremma.get(id, accept: "application/vnd.crossref.unixref+xml", host: true, raw: true)
+        doi = doi_from_url(id)
+        url = "http://www.crossref.org/openurl/?id=doi:#{doi}&noredirect=true&pid=#{CONTACT_EMAIL}&format=unixref"
+        response = Maremma.get(url, accept: "text/xml", raw: true)
         @raw = response.body.fetch("data", nil)
         @raw = Nokogiri::XML(@raw, nil, 'UTF-8', &:noblanks).to_s if @raw.present?
       end
@@ -75,7 +79,12 @@ module Bolognese
     alias_method :crossref, :raw
 
     def metadata
-      @metadata ||= raw.present? ? Maremma.from_xml(raw).fetch("doi_records", {}).fetch("doi_record", {}) : {}
+      @metadata ||= if raw.present?
+        m = Maremma.from_xml(raw).fetch("doi_records", {}).fetch("doi_record", {})
+        m.dig("crossref", "error").nil? ? m : {}
+      else
+        {}
+      end
     end
 
     def exists?

data/lib/bolognese/datacite.rb

@@ -88,7 +88,13 @@ module Bolognese
     end
 
     def title
-      metadata.dig("titles", "title")
+      Array.wrap(metadata.dig("titles", "title")).map do |r|
+        if r.is_a?(String)
+          sanitize(r)
+        else
+          { "title_type" => r["titleType"], "lang" => r["xml:lang"], "text" => sanitize(r["__content__"]) }.compact
+        end
+      end.unwrap
     end
 
     def alternate_name

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

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

@@ -29,7 +29,7 @@ http_interactions:
       Content-Type:
       - application/vnd.api+json; charset=utf-8
       Date:
-      - Tue, 18 Apr 2017 18:28:05 GMT
+      - Thu, 20 Apr 2017 20:22:10 GMT
       Etag:
       - W/"daf85afdb45f3c2713bc7e75916ba82a"
       Server:
@@ -45,23 +45,21 @@ http_interactions:
       X-Powered-By:
       - Phusion Passenger 5.1.2
       X-Request-Id:
-      - b6886db1-cbeb-4be6-855a-929a807c14fc
+      - 2d99412d-a622-4e13-9b87-70f8e0b9646b
       X-Runtime:
-      - '0.772071'
+      - '0.562022'
       X-Xss-Protection:
       - 1; mode=block
-      Content-Length:
-      - '124'
       Connection:
       - keep-alive
     body:
       encoding: UTF-8
       string: '{"data":{"id":"10.7554","type":"prefixes","attributes":{"registration-agency":"Crossref","updated":"2016-09-21T21:07:27Z"}}}'
     http_version: 
-  recorded_at: Tue, 18 Apr 2017 18:28:05 GMT
+  recorded_at: Thu, 20 Apr 2017 20:22:10 GMT
 - request:
     method: get
-    uri: https://doi.org/10.7554/elife.01567
+    uri: http://www.crossref.org/openurl/?format=unixref&id=doi:10.7554/elife.01567&noredirect=true&pid=tech@datacite.org
     body:
       encoding: US-ASCII
       string: ''
@@ -69,73 +67,22 @@ http_interactions:
       User-Agent:
       - Maremma - https://github.com/datacite/maremma
       Accept:
-      - application/vnd.crossref.unixref+xml
+      - text/xml
   response:
     status:
-      code: 303
+      code: 200
       message: ''
     headers:
       Server:
       - Apache-Coyote/1.1
-      Vary:
-      - Accept
-      Location:
-      - http://data.crossref.org/10.7554%2Felife.01567
-      Expires:
-      - Tue, 18 Apr 2017 18:39:23 GMT
+      Crossref-Deployment-Name:
+      - qs4-1
       Content-Type:
-      - text/html;charset=utf-8
-      Content-Length:
-      - '177'
-      Date:
-      - Tue, 18 Apr 2017 18:28:05 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: Tue, 18 Apr 2017 18:28:05 GMT
-- request:
-    method: get
-    uri: http://data.crossref.org/10.7554%2Felife.01567
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      User-Agent:
-      - Maremma - https://github.com/datacite/maremma
-      Accept:
-      - application/vnd.crossref.unixref+xml
-  response:
-    status:
-      code: 200
-      message: ''
-    headers:
-      Access-Control-Allow-Origin:
-      - "*"
-      Access-Control-Allow-Headers:
-      - X-Requested-With, Accept, Accept-Encoding, Accept-Charset, Accept-Language,
-        Accept-Ranges, Cache-Control
-      Access-Control-Expose-Headers:
-      - Link
-      Link:
-      - <http://dx.doi.org/10.7554/elife.01567>; rel="canonical", <http://creativecommons.org/licenses/by/3.0/>;
-        version="vor"; rel="license", <http://creativecommons.org/licenses/by/3.0/>;
-        version="am"; rel="license", <http://creativecommons.org/licenses/by/3.0/>;
-        version="tdm"; rel="license"
-      Content-Type:
-      - application/vnd.crossref.unixref+xml
-      Content-Length:
-      - '28603'
-      Server:
-      - http-kit
+      - text/xml;charset=UTF-8
+      Content-Language:
+      - en-US
       Date:
-      - Tue, 18 Apr 2017 18:28:06 GMT
-      X-Rate-Limit-Limit:
-      - '50'
-      X-Rate-Limit-Interval:
-      - 1s
+      - Thu, 20 Apr 2017 20:43:38 GMT
       Connection:
       - close
     body:
@@ -778,5 +725,5 @@ http_interactions:
         aWNsZT4NCiAgICAgIDwvam91cm5hbD4NCiAgICA8L2Nyb3NzcmVmPg0KICA8
         L2RvaV9yZWNvcmQ+DQo8L2RvaV9yZWNvcmRzPg==
     http_version: 
-  recorded_at: Tue, 18 Apr 2017 18:28:06 GMT
+  recorded_at: Thu, 20 Apr 2017 20:22:11 GMT
 recorded_with: VCR 3.0.3

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

@@ -29,7 +29,7 @@ http_interactions:
       Content-Type:
       - application/vnd.api+json; charset=utf-8
       Date:
-      - Tue, 18 Apr 2017 18:28:00 GMT
+      - Thu, 20 Apr 2017 20:22:14 GMT
       Etag:
       - W/"daf85afdb45f3c2713bc7e75916ba82a"
       Server:
@@ -45,23 +45,21 @@ http_interactions:
       X-Powered-By:
       - Phusion Passenger 5.1.2
       X-Request-Id:
-      - 8e173f08-f41f-4142-bb07-9ab28e17bc47
+      - 4a981e49-8f21-4b01-bbbe-1b0d53a3bfb1
       X-Runtime:
-      - '0.329946'
+      - '0.549376'
       X-Xss-Protection:
       - 1; mode=block
-      Content-Length:
-      - '124'
       Connection:
       - keep-alive
     body:
       encoding: UTF-8
       string: '{"data":{"id":"10.7554","type":"prefixes","attributes":{"registration-agency":"Crossref","updated":"2016-09-21T21:07:27Z"}}}'
     http_version: 
-  recorded_at: Tue, 18 Apr 2017 18:28:00 GMT
+  recorded_at: Thu, 20 Apr 2017 20:22:14 GMT
 - request:
     method: get
-    uri: https://doi.org/10.7554/elife.01567
+    uri: http://www.crossref.org/openurl/?format=unixref&id=doi:10.7554/elife.01567&noredirect=true&pid=tech@datacite.org
     body:
       encoding: US-ASCII
       string: ''
@@ -69,73 +67,22 @@ http_interactions:
       User-Agent:
       - Maremma - https://github.com/datacite/maremma
       Accept:
-      - application/vnd.crossref.unixref+xml
+      - text/xml
   response:
     status:
-      code: 303
+      code: 200
       message: ''
     headers:
       Server:
       - Apache-Coyote/1.1
-      Vary:
-      - Accept
-      Location:
-      - http://data.crossref.org/10.7554%2Felife.01567
-      Expires:
-      - Tue, 18 Apr 2017 18:39:23 GMT
+      Crossref-Deployment-Name:
+      - qs3-1
       Content-Type:
-      - text/html;charset=utf-8
-      Content-Length:
-      - '177'
-      Date:
-      - Tue, 18 Apr 2017 18:27:59 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: Tue, 18 Apr 2017 18:28:00 GMT
-- request:
-    method: get
-    uri: http://data.crossref.org/10.7554%2Felife.01567
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      User-Agent:
-      - Maremma - https://github.com/datacite/maremma
-      Accept:
-      - application/vnd.crossref.unixref+xml
-  response:
-    status:
-      code: 200
-      message: ''
-    headers:
-      Access-Control-Allow-Origin:
-      - "*"
-      Access-Control-Allow-Headers:
-      - X-Requested-With, Accept, Accept-Encoding, Accept-Charset, Accept-Language,
-        Accept-Ranges, Cache-Control
-      Access-Control-Expose-Headers:
-      - Link
-      Link:
-      - <http://dx.doi.org/10.7554/elife.01567>; rel="canonical", <http://creativecommons.org/licenses/by/3.0/>;
-        version="vor"; rel="license", <http://creativecommons.org/licenses/by/3.0/>;
-        version="am"; rel="license", <http://creativecommons.org/licenses/by/3.0/>;
-        version="tdm"; rel="license"
-      Content-Type:
-      - application/vnd.crossref.unixref+xml
-      Content-Length:
-      - '28603'
-      Server:
-      - http-kit
+      - text/xml;charset=UTF-8
+      Content-Language:
+      - en-US
       Date:
-      - Tue, 18 Apr 2017 18:28:00 GMT
-      X-Rate-Limit-Limit:
-      - '50'
-      X-Rate-Limit-Interval:
-      - 1s
+      - Thu, 20 Apr 2017 20:22:14 GMT
       Connection:
       - close
     body:
@@ -778,5 +725,5 @@ http_interactions:
         aWNsZT4NCiAgICAgIDwvam91cm5hbD4NCiAgICA8L2Nyb3NzcmVmPg0KICA8
         L2RvaV9yZWNvcmQ+DQo8L2RvaV9yZWNvcmRzPg==
     http_version: 
-  recorded_at: Tue, 18 Apr 2017 18:28:01 GMT
+  recorded_at: Thu, 20 Apr 2017 20:22:15 GMT
 recorded_with: VCR 3.0.3

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

@@ -29,7 +29,7 @@ http_interactions:
       Content-Type:
       - application/vnd.api+json; charset=utf-8
       Date:
-      - Tue, 18 Apr 2017 18:27:58 GMT
+      - Thu, 20 Apr 2017 20:22:09 GMT
       Etag:
       - W/"daf85afdb45f3c2713bc7e75916ba82a"
       Server:
@@ -45,21 +45,23 @@ http_interactions:
       X-Powered-By:
       - Phusion Passenger 5.1.2
       X-Request-Id:
-      - aac01895-c2ee-48e1-9fcf-5a8bc6add205
+      - 10adaa88-14d2-44b1-bfef-ffe701bea8d9
       X-Runtime:
-      - '0.370228'
+      - '0.356223'
       X-Xss-Protection:
       - 1; mode=block
+      Content-Length:
+      - '124'
       Connection:
       - keep-alive
     body:
       encoding: UTF-8
       string: '{"data":{"id":"10.7554","type":"prefixes","attributes":{"registration-agency":"Crossref","updated":"2016-09-21T21:07:27Z"}}}'
     http_version: 
-  recorded_at: Tue, 18 Apr 2017 18:27:58 GMT
+  recorded_at: Thu, 20 Apr 2017 20:22:09 GMT
 - request:
     method: get
-    uri: https://doi.org/10.7554/elife.01567
+    uri: http://www.crossref.org/openurl/?format=unixref&id=doi:10.7554/elife.01567&noredirect=true&pid=tech@datacite.org
     body:
       encoding: US-ASCII
       string: ''
@@ -67,73 +69,22 @@ http_interactions:
       User-Agent:
       - Maremma - https://github.com/datacite/maremma
       Accept:
-      - application/vnd.crossref.unixref+xml
+      - text/xml
   response:
     status:
-      code: 303
+      code: 200
       message: ''
     headers:
       Server:
       - Apache-Coyote/1.1
-      Vary:
-      - Accept
-      Location:
-      - http://data.crossref.org/10.7554%2Felife.01567
-      Expires:
-      - Tue, 18 Apr 2017 18:39:23 GMT
-      Content-Type:
-      - text/html;charset=utf-8
-      Content-Length:
-      - '177'
-      Date:
-      - Tue, 18 Apr 2017 18:27:58 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: Tue, 18 Apr 2017 18:27:59 GMT
-- request:
-    method: get
-    uri: http://data.crossref.org/10.7554%2Felife.01567
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      User-Agent:
-      - Maremma - https://github.com/datacite/maremma
-      Accept:
-      - application/vnd.crossref.unixref+xml
-  response:
-    status:
-      code: 200
-      message: ''
-    headers:
-      Access-Control-Allow-Origin:
-      - "*"
-      Access-Control-Allow-Headers:
-      - X-Requested-With, Accept, Accept-Encoding, Accept-Charset, Accept-Language,
-        Accept-Ranges, Cache-Control
-      Access-Control-Expose-Headers:
-      - Link
-      Link:
-      - <http://dx.doi.org/10.7554/elife.01567>; rel="canonical", <http://creativecommons.org/licenses/by/3.0/>;
-        version="vor"; rel="license", <http://creativecommons.org/licenses/by/3.0/>;
-        version="am"; rel="license", <http://creativecommons.org/licenses/by/3.0/>;
-        version="tdm"; rel="license"
+      Crossref-Deployment-Name:
+      - qs2-2
       Content-Type:
-      - application/vnd.crossref.unixref+xml
-      Content-Length:
-      - '28603'
-      Server:
-      - http-kit
+      - text/xml;charset=UTF-8
+      Content-Language:
+      - en-US
       Date:
-      - Tue, 18 Apr 2017 18:27:59 GMT
-      X-Rate-Limit-Limit:
-      - '50'
-      X-Rate-Limit-Interval:
-      - 1s
+      - Thu, 20 Apr 2017 20:22:09 GMT
       Connection:
       - close
     body:
@@ -776,5 +727,5 @@ http_interactions:
         aWNsZT4NCiAgICAgIDwvam91cm5hbD4NCiAgICA8L2Nyb3NzcmVmPg0KICA8
         L2RvaV9yZWNvcmQ+DQo8L2RvaV9yZWNvcmRzPg==
     http_version: 
-  recorded_at: Tue, 18 Apr 2017 18:27:59 GMT
+  recorded_at: Thu, 20 Apr 2017 20:22:10 GMT
 recorded_with: VCR 3.0.3