bolognese 0.9.8 → 0.9.9

data/spec/cli_spec.rb

@@ -8,30 +8,30 @@ describe Bolognese::CLI do
 
   describe "convert from id", vcr: true do
     context "crossref" do
-      let(:id) { "10.7554/eLife.01567" }
+      let(:input) { "10.7554/eLife.01567" }
 
       it 'default' do
-        expect { subject.convert id }.to output(/additionalType/).to_stdout
+        expect { subject.convert input }.to output(/additionalType/).to_stdout
       end
 
       it 'to schema_org' do
         subject.options = { to: "schema_org" }
-        expect { subject.convert id }.to output(/additionalType/).to_stdout
+        expect { subject.convert input }.to output(/additionalType/).to_stdout
       end
 
       it 'to crossref' do
         subject.options = { to: "crossref" }
-        expect { subject.convert id }.to output(/journal_metadata/).to_stdout
+        expect { subject.convert input }.to output(/journal_metadata/).to_stdout
       end
 
       it 'to datacite' do
         subject.options = { to: "datacite" }
-        expect { subject.convert id }.to output(/http:\/\/datacite.org\/schema\/kernel-4/).to_stdout
+        expect { subject.convert input }.to output(/http:\/\/datacite.org\/schema\/kernel-4/).to_stdout
       end
 
       it 'to bibtex' do
         subject.options = { to: "bibtex" }
-        expect { subject.convert id }.to output(/@article{https:\/\/doi.org\/10.7554\/elife.01567/).to_stdout
+        expect { subject.convert input }.to output(/@article{https:\/\/doi.org\/10.7554\/elife.01567/).to_stdout
       end
     end
 

data/spec/datacite_utils_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe Bolognese::Datacite, vcr: true do
-  let(:id) { "https://doi.org/10.5061/DRYAD.8515" }
+describe Bolognese::Metadata, vcr: true do
+  let(:input) { "https://doi.org/10.5061/DRYAD.8515" }
 
-  subject { Bolognese::Datacite.new(id: id) }
+  subject { Bolognese::Metadata.new(input: input, from: "datacite") }
 
   context "insert_identifier" do
     it "doi" do
       xml = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') { |xml| subject.insert_identifier(xml) }.to_xml
       response = Maremma.from_xml(xml)
-      expect(response["identifier"]).to eq("identifierType"=>"DOI", "__content__"=>"10.5061/DRYAD.8515")
+      expect(response["identifier"]).to eq("identifierType"=>"DOI", "__content__"=>"10.5061/dryad.8515")
     end
   end
 
@@ -113,10 +113,9 @@ describe Bolognese::Datacite, vcr: true do
 
   context "insert_related_identifiers" do
     it "related_identifier" do
-      expect(subject.related_identifier).to eq([{"id"=>"https://doi.org/10.5061/dryad.8515/1", "relationType"=>"HasPart"},
-                                                {"id"=>"https://doi.org/10.5061/dryad.8515/2", "relationType"=>"HasPart"},
-                                                {"id"=>"https://doi.org/10.1371/journal.ppat.1000446",
-                                                 "relationType"=>"IsReferencedBy"}])
+      expect(subject.has_part).to eq([{"id"=>"https://doi.org/10.5061/dryad.8515/1"},
+                                      {"id"=>"https://doi.org/10.5061/dryad.8515/2"}])
+      expect(subject.is_referenced_by).to eq("id"=>"https://doi.org/10.1371/journal.ppat.1000446")
     end
 
     it "insert" do
@@ -138,14 +137,14 @@ describe Bolognese::Datacite, vcr: true do
     it "insert" do
       xml = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') { |xml| subject.insert_rights_list(xml) }.to_xml
       response = Maremma.from_xml(xml)
-      expect(response.dig("rightsList", "rights")).to eq("rightsURI"=>"http://creativecommons.org/publicdomain/zero/1.0/")
+      expect(response.dig("rightsList", "rights")).to eq("rightsURI"=>"http://creativecommons.org/publicdomain/zero/1.0")
     end
   end
 
   context "insert_descriptions" do
     it "insert" do
-      id = "https://doi.org/10.5438/4K3M-NYVG"
-      subject = Bolognese::Datacite.new(id: id)
+      input = "https://doi.org/10.5438/4K3M-NYVG"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite")
       xml = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') { |xml| subject.insert_descriptions(xml) }.to_xml
       response = Maremma.from_xml(xml)
       expect(response.dig("descriptions", "description")).to eq("descriptionType" => "Abstract", "__content__" => "Eating your own dog food is a slang term to describe that an organization should itself use the products and services it provides. For DataCite this means that we should use DOIs with appropriate metadata and strategies for long-term preservation for...")

data/spec/doi_utils_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
 describe Bolognese::Metadata, vcr: true do
+  let(:input) { "https://doi.org/10.1101/097196" }
 
-  subject { Bolognese::Metadata.new }
+  subject { Bolognese::Metadata.new(input: input, from: "crossref") }
 
   context "normalize doi" do
     it "doi" do

data/spec/fixtures/crossref.ris

@@ -8,6 +8,7 @@ AU - Xenarios, Ioannis
 AU - Hardtke, Christian S
 DO - 10.7554/eLife.01567
 UR - http://elifesciences.org/lookup/doi/10.7554/eLife.01567
+AB - Among various advantages, their small size makes model organisms preferred subjects of investigation. Yet, even in model systems detailed analysis of numerous developmental processes at cellular level is severely hampered by their scale.
 PY - 2014
 VL - 3
-ER - 
+ER -

data/spec/fixtures/datacite.json

@@ -25,20 +25,17 @@
     "type": "Local accession number",
     "name": "MS-49-3632-5083"
   },
-  "related_identifier": [
+  "references": [
     {
-      "id": "https://doi.org/10.5438/0012",
-      "relationType": "References"
+      "id": "https://doi.org/10.5438/0012"
     },
     {
-      "id": "https://doi.org/10.5438/55e5-t5c0",
-      "relationType": "References"
-    },
-    {
-      "id": "https://doi.org/10.5438/0000-00ss",
-      "relationType": "IsPartOf"
+      "id": "https://doi.org/10.5438/55e5-t5c0"
     }
   ],
+  "is_part_of": {
+    "id": "https://doi.org/10.5438/0000-00ss"
+  },
   "version": "1.0",
   "description": {
     "type": "Abstract",

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:
-      - Thu, 20 Apr 2017 20:22:10 GMT
+      - Sat, 06 May 2017 11:43:08 GMT
       Etag:
       - W/"daf85afdb45f3c2713bc7e75916ba82a"
       Server:
@@ -45,18 +45,20 @@ http_interactions:
       X-Powered-By:
       - Phusion Passenger 5.1.2
       X-Request-Id:
-      - 2d99412d-a622-4e13-9b87-70f8e0b9646b
+      - 2f1bdb1c-3cc4-4a53-95cf-4ade62881b46
       X-Runtime:
-      - '0.562022'
+      - '0.207923'
       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: Thu, 20 Apr 2017 20:22:10 GMT
+  recorded_at: Sat, 06 May 2017 11:43:08 GMT
 - request:
     method: get
     uri: http://www.crossref.org/openurl/?format=unixref&id=doi:10.7554/elife.01567&noredirect=true&pid=tech@datacite.org
@@ -76,13 +78,13 @@ http_interactions:
       Server:
       - Apache-Coyote/1.1
       Crossref-Deployment-Name:
-      - qs4-1
+      - cr6-1
       Content-Type:
       - text/xml;charset=UTF-8
       Content-Language:
       - en-US
       Date:
-      - Thu, 20 Apr 2017 20:43:38 GMT
+      - Sat, 06 May 2017 11:43:08 GMT
       Connection:
       - close
     body:
@@ -725,5 +727,5 @@ http_interactions:
         aWNsZT4NCiAgICAgIDwvam91cm5hbD4NCiAgICA8L2Nyb3NzcmVmPg0KICA8
         L2RvaV9yZWNvcmQ+DQo8L2RvaV9yZWNvcmRzPg==
     http_version: 
-  recorded_at: Thu, 20 Apr 2017 20:22:11 GMT
+  recorded_at: Sat, 06 May 2017 11:43:09 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:
-      - Thu, 20 Apr 2017 20:22:14 GMT
+      - Sat, 06 May 2017 11:43:09 GMT
       Etag:
       - W/"daf85afdb45f3c2713bc7e75916ba82a"
       Server:
@@ -45,18 +45,20 @@ http_interactions:
       X-Powered-By:
       - Phusion Passenger 5.1.2
       X-Request-Id:
-      - 4a981e49-8f21-4b01-bbbe-1b0d53a3bfb1
+      - 4c36c73b-0ca5-44f7-ad52-266dfc9cfb8d
       X-Runtime:
-      - '0.549376'
+      - '0.309895'
       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: Thu, 20 Apr 2017 20:22:14 GMT
+  recorded_at: Sat, 06 May 2017 11:43:09 GMT
 - request:
     method: get
     uri: http://www.crossref.org/openurl/?format=unixref&id=doi:10.7554/elife.01567&noredirect=true&pid=tech@datacite.org
@@ -76,13 +78,13 @@ http_interactions:
       Server:
       - Apache-Coyote/1.1
       Crossref-Deployment-Name:
-      - qs3-1
+      - cr6-1
       Content-Type:
       - text/xml;charset=UTF-8
       Content-Language:
       - en-US
       Date:
-      - Thu, 20 Apr 2017 20:22:14 GMT
+      - Sat, 06 May 2017 11:43:09 GMT
       Connection:
       - close
     body:
@@ -725,5 +727,5 @@ http_interactions:
         aWNsZT4NCiAgICAgIDwvam91cm5hbD4NCiAgICA8L2Nyb3NzcmVmPg0KICA8
         L2RvaV9yZWNvcmQ+DQo8L2RvaV9yZWNvcmRzPg==
     http_version: 
-  recorded_at: Thu, 20 Apr 2017 20:22:15 GMT
+  recorded_at: Sat, 06 May 2017 11:43:10 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:
-      - Thu, 20 Apr 2017 20:22:09 GMT
+      - Sat, 06 May 2017 11:43:10 GMT
       Etag:
       - W/"daf85afdb45f3c2713bc7e75916ba82a"
       Server:
@@ -45,9 +45,9 @@ http_interactions:
       X-Powered-By:
       - Phusion Passenger 5.1.2
       X-Request-Id:
-      - 10adaa88-14d2-44b1-bfef-ffe701bea8d9
+      - 297dcc10-e105-4235-8ee7-9b06911f0d1f
       X-Runtime:
-      - '0.356223'
+      - '0.550292'
       X-Xss-Protection:
       - 1; mode=block
       Content-Length:
@@ -58,7 +58,7 @@ http_interactions:
       encoding: UTF-8
       string: '{"data":{"id":"10.7554","type":"prefixes","attributes":{"registration-agency":"Crossref","updated":"2016-09-21T21:07:27Z"}}}'
     http_version: 
-  recorded_at: Thu, 20 Apr 2017 20:22:09 GMT
+  recorded_at: Sat, 06 May 2017 11:43:10 GMT
 - request:
     method: get
     uri: http://www.crossref.org/openurl/?format=unixref&id=doi:10.7554/elife.01567&noredirect=true&pid=tech@datacite.org
@@ -84,7 +84,7 @@ http_interactions:
       Content-Language:
       - en-US
       Date:
-      - Thu, 20 Apr 2017 20:22:09 GMT
+      - Sat, 06 May 2017 11:43:10 GMT
       Connection:
       - close
     body:
@@ -727,5 +727,5 @@ http_interactions:
         aWNsZT4NCiAgICAgIDwvam91cm5hbD4NCiAgICA8L2Nyb3NzcmVmPg0KICA8
         L2RvaV9yZWNvcmQ+DQo8L2RvaV9yZWNvcmRzPg==
     http_version: 
-  recorded_at: Thu, 20 Apr 2017 20:22:10 GMT
+  recorded_at: Sat, 06 May 2017 11:43:11 GMT
 recorded_with: VCR 3.0.3

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

@@ -29,7 +29,7 @@ http_interactions:
       Content-Type:
       - application/vnd.api+json; charset=utf-8
       Date:
-      - Thu, 20 Apr 2017 20:22:11 GMT
+      - Sat, 06 May 2017 11:43:13 GMT
       Etag:
       - W/"daf85afdb45f3c2713bc7e75916ba82a"
       Server:
@@ -45,9 +45,9 @@ http_interactions:
       X-Powered-By:
       - Phusion Passenger 5.1.2
       X-Request-Id:
-      - 3f3728c1-67ce-4357-806b-ac267ceae5a9
+      - 78190a5e-dcd1-477e-af7e-d723411fdd41
       X-Runtime:
-      - '0.147347'
+      - '0.745295'
       X-Xss-Protection:
       - 1; mode=block
       Connection:
@@ -56,7 +56,7 @@ http_interactions:
       encoding: UTF-8
       string: '{"data":{"id":"10.7554","type":"prefixes","attributes":{"registration-agency":"Crossref","updated":"2016-09-21T21:07:27Z"}}}'
     http_version: 
-  recorded_at: Thu, 20 Apr 2017 20:22:11 GMT
+  recorded_at: Sat, 06 May 2017 11:43:13 GMT
 - request:
     method: get
     uri: http://www.crossref.org/openurl/?format=unixref&id=doi:10.7554/elife.01567&noredirect=true&pid=tech@datacite.org
@@ -82,7 +82,7 @@ http_interactions:
       Content-Language:
       - en-US
       Date:
-      - Thu, 20 Apr 2017 20:22:11 GMT
+      - Sat, 06 May 2017 11:43:12 GMT
       Connection:
       - close
     body:
@@ -725,5 +725,5 @@ http_interactions:
         aWNsZT4NCiAgICAgIDwvam91cm5hbD4NCiAgICA8L2Nyb3NzcmVmPg0KICA8
         L2RvaV9yZWNvcmQ+DQo8L2RvaV9yZWNvcmRzPg==
     http_version: 
-  recorded_at: Thu, 20 Apr 2017 20:22:12 GMT
+  recorded_at: Sat, 06 May 2017 11:43:13 GMT
 recorded_with: VCR 3.0.3

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

@@ -29,7 +29,7 @@ http_interactions:
       Content-Type:
       - application/vnd.api+json; charset=utf-8
       Date:
-      - Thu, 20 Apr 2017 20:22:13 GMT
+      - Sat, 06 May 2017 11:43:11 GMT
       Etag:
       - W/"daf85afdb45f3c2713bc7e75916ba82a"
       Server:
@@ -45,18 +45,20 @@ http_interactions:
       X-Powered-By:
       - Phusion Passenger 5.1.2
       X-Request-Id:
-      - 3e24c85a-359a-4b38-be5e-6f16062a7630
+      - 65093119-4b6b-4b66-be31-ab7387fa5bbe
       X-Runtime:
-      - '0.722228'
+      - '0.139390'
       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: Thu, 20 Apr 2017 20:22:13 GMT
+  recorded_at: Sat, 06 May 2017 11:43:11 GMT
 - request:
     method: get
     uri: http://www.crossref.org/openurl/?format=unixref&id=doi:10.7554/elife.01567&noredirect=true&pid=tech@datacite.org
@@ -82,7 +84,7 @@ http_interactions:
       Content-Language:
       - en-US
       Date:
-      - Thu, 20 Apr 2017 20:22:12 GMT
+      - Sat, 06 May 2017 11:43:11 GMT
       Connection:
       - close
     body:
@@ -725,5 +727,5 @@ http_interactions:
         aWNsZT4NCiAgICAgIDwvam91cm5hbD4NCiAgICA8L2Nyb3NzcmVmPg0KICA8
         L2RvaV9yZWNvcmQ+DQo8L2RvaV9yZWNvcmRzPg==
     http_version: 
-  recorded_at: Thu, 20 Apr 2017 20:22:13 GMT
+  recorded_at: Sat, 06 May 2017 11:43:12 GMT
 recorded_with: VCR 3.0.3

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

@@ -29,7 +29,7 @@ http_interactions:
       Content-Type:
       - application/vnd.api+json; charset=utf-8
       Date:
-      - Thu, 20 Apr 2017 20:22:06 GMT
+      - Sat, 06 May 2017 11:43:18 GMT
       Etag:
       - W/"1eb3f4f371821b1becc6cd25a71755ce"
       Server:
@@ -45,18 +45,20 @@ http_interactions:
       X-Powered-By:
       - Phusion Passenger 5.1.2
       X-Request-Id:
-      - 1ae55dac-6983-4143-926a-88748029030d
+      - d018cf85-2872-4d5a-be20-b67d421b6534
       X-Runtime:
-      - '0.211438'
+      - '0.552813'
       X-Xss-Protection:
       - 1; mode=block
+      Content-Length:
+      - '124'
       Connection:
       - keep-alive
     body:
       encoding: UTF-8
       string: '{"data":{"id":"10.5061","type":"prefixes","attributes":{"registration-agency":"DataCite","updated":"2016-09-21T20:27:07Z"}}}'
     http_version: 
-  recorded_at: Thu, 20 Apr 2017 20:22:06 GMT
+  recorded_at: Sat, 06 May 2017 11:43:18 GMT
 - request:
     method: get
     uri: https://search.datacite.org/api?fl=doi,xml,media,minted,updated&q=doi:10.5061/dryad.8515&wt=json
@@ -80,9 +82,11 @@ http_interactions:
       Content-Type:
       - application/json;charset=UTF-8
       Date:
-      - Thu, 20 Apr 2017 20:22:06 GMT
+      - Sat, 06 May 2017 11:43:18 GMT
       Server:
       - openresty/1.11.2.2
+      Content-Length:
+      - '3658'
       Connection:
       - keep-alive
     body:
@@ -91,5 +95,5 @@ http_interactions:
 
 '
     http_version: 
-  recorded_at: Thu, 20 Apr 2017 20:22:06 GMT
+  recorded_at: Sat, 06 May 2017 11:43:18 GMT
 recorded_with: VCR 3.0.3

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

@@ -29,7 +29,7 @@ http_interactions:
       Content-Type:
       - application/vnd.api+json; charset=utf-8
       Date:
-      - Thu, 20 Apr 2017 20:22:05 GMT
+      - Sat, 06 May 2017 11:43:16 GMT
       Etag:
       - W/"1eb3f4f371821b1becc6cd25a71755ce"
       Server:
@@ -45,9 +45,9 @@ http_interactions:
       X-Powered-By:
       - Phusion Passenger 5.1.2
       X-Request-Id:
-      - 1279841c-e3f3-4635-99c3-a8ab96d9723d
+      - b9216e90-a26f-4ab9-846c-d733f7999e96
       X-Runtime:
-      - '0.647161'
+      - '0.110987'
       X-Xss-Protection:
       - 1; mode=block
       Connection:
@@ -56,7 +56,7 @@ http_interactions:
       encoding: UTF-8
       string: '{"data":{"id":"10.5061","type":"prefixes","attributes":{"registration-agency":"DataCite","updated":"2016-09-21T20:27:07Z"}}}'
     http_version: 
-  recorded_at: Thu, 20 Apr 2017 20:22:05 GMT
+  recorded_at: Sat, 06 May 2017 11:43:16 GMT
 - request:
     method: get
     uri: https://search.datacite.org/api?fl=doi,xml,media,minted,updated&q=doi:10.5061/dryad.8515&wt=json
@@ -80,9 +80,11 @@ http_interactions:
       Content-Type:
       - application/json;charset=UTF-8
       Date:
-      - Thu, 20 Apr 2017 20:22:05 GMT
+      - Sat, 06 May 2017 11:43:16 GMT
       Server:
       - openresty/1.11.2.2
+      Content-Length:
+      - '3658'
       Connection:
       - keep-alive
     body:
@@ -91,5 +93,5 @@ http_interactions:
 
 '
     http_version: 
-  recorded_at: Thu, 20 Apr 2017 20:22:05 GMT
+  recorded_at: Sat, 06 May 2017 11:43:16 GMT
 recorded_with: VCR 3.0.3