bolognese 0.9.37 → 0.9.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4c14e423a53deb412218f3c855ee1f593296d98
-  data.tar.gz: d05e58c1dbcb061bdc4d468f048a02cd238036a5
+  metadata.gz: 80ad59a9eaf459f05bae83efd342c5cc721f3e5c
+  data.tar.gz: c885491d1dcd4cd1cd3fcb6d3f4f0271f8d2cfef
 SHA512:
-  metadata.gz: 24551c9b762c597fc87407e926a510c873d42e6650f83e76e9081d8b43d92e4e06067aa18a8f30aca41bacc39a98fa7fda1b6d4ea1dc5c785aa7c971785c95fe
-  data.tar.gz: a66e615373cf75d9fee848a017db2966722fb2754b5985bf58f8cf45b43d3be4c243f25d4ac7377ee26d722fc0b682f02fb1ae308c584f6db5a3b74badfbc3ed
+  metadata.gz: 9d891ad14ccc2638da17285fedf24158c2ec1eea28f0429c8c385ae67323163e2e66aee5766be2dc3332c0df8fa523c8372053dd0e75388d28c179456b995515
+  data.tar.gz: ca06b12617aaede3c471c3f82c6f633847508bf7beaf1d148a7d8c8affcdad4cffd1427b656d6cfaf242c7fd86d786cb9fc3c46c35b9f479fc3a46fbe71c5593

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.9.37)
+    bolognese (0.9.38)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)
@@ -106,13 +106,13 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (2.2.0)
       rdf (~> 2.0)
-    rdf-rdfa (2.2.2)
+    rdf-rdfa (2.2.3)
       haml (~> 5.0)
       htmlentities (~> 4.3)
       rdf (~> 2.2)
       rdf-aggregate-repo (~> 2.2)
       rdf-xsd (~> 2.1)
-    rdf-rdfxml (2.0.0)
+    rdf-rdfxml (2.1.0)
       htmlentities (~> 4.3)
       rdf (~> 2.0)
       rdf-rdfa (~> 2.0)

data/lib/bolognese/readers/datacite_reader.rb

@@ -80,7 +80,7 @@ module Bolognese
           "type" => type,
           "additional_type" => meta.fetch("resourceType", {}).fetch("__content__", nil) ||
             meta.fetch("resourceType", {}).fetch("resourceTypeGeneral", nil),
-          "citeproc_type" => Bolognese::Utils::DC_TO_CP_TRANSLATIONS[resource_type_general.to_s.dasherize] || "other",
+          "citeproc_type" => Bolognese::Utils::DC_TO_CP_TRANSLATIONS[resource_type_general.to_s.dasherize] || "article",
           "bibtex_type" => Bolognese::Utils::SO_TO_BIB_TRANSLATIONS[type] || "misc",
           "ris_type" => Bolognese::Utils::DC_TO_RIS_TRANSLATIONS[resource_type_general.to_s.dasherize] || "GEN",
           "resource_type_general" => resource_type_general,

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.37"
+  VERSION = "0.9.38"
 end

data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/software.yml

@@ -0,0 +1,75 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://search.datacite.org/api?fl=doi,xml,allocator_symbol,datacentre_symbol,media,minted,updated&q=doi:10.6084/m9.figshare.4906367.v1&wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Maremma - https://github.com/datacite/maremma
+      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: OK
+    headers:
+      Access-Control-Allow-Methods:
+      - GET, POST, OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Content-Type:
+      - application/json;charset=UTF-8
+      Date:
+      - Tue, 25 Jul 2017 16:47:18 GMT
+      Server:
+      - openresty/1.11.2.2
+      Content-Length:
+      - '3255'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":7},"response":{"numFound":1,"start":0,"docs":[{"datacentre_symbol":"FIGSHARE.ARS","xml":"PHJlc291cmNlIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyIgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC0zL21ldGFkYXRhLnhzZCI+PGlkZW50aWZpZXIgaWRlbnRpZmllclR5cGU9IkRPSSI+MTAuNjA4NC9tOS5maWdzaGFyZS40OTA2MzY3LnYxPC9pZGVudGlmaWVyPjxjcmVhdG9ycz48Y3JlYXRvcj48Y3JlYXRvck5hbWU+R3VpbGxhdW1lIENhYmFuYWM8L2NyZWF0b3JOYW1lPjxuYW1lSWRlbnRpZmllciBuYW1lSWRlbnRpZmllclNjaGVtZT0iT1JDSUQiIHNjaGVtZVVSST0iaHR0cDovL29yY2lkLm9yZyI+MDAwMC0wMDAzLTMwNjAtNjI0MTwvbmFtZUlkZW50aWZpZXI+PC9jcmVhdG9yPjwvY3JlYXRvcnM+PHRpdGxlcz48dGl0bGU+U2NpbWFnIGNhdGFsb2d1ZSBvZiBMaWJHZW4gYXMgb2YgSmFudWFyeSAxc3QsIDIwMTQ8L3RpdGxlPjwvdGl0bGVzPjxkZXNjcmlwdGlvbnM+PGRlc2NyaXB0aW9uIGRlc2NyaXB0aW9uVHlwZT0iQWJzdHJhY3QiPlRoaXMgTXlTcWwgZGF0YWJhc2UgZHVtcCBvZiBMaWJHZW4ncyBTY2ltYWcgY2F0YWxvZ3VlIHdhcyBkb3dubG9hZGVkIGZyb20gJmx0O2EgaHJlZj0iaHR0cDovL2dlbi5saWIucnVzLmVjL2RiZHVtcHMvIiZndDtodHRwOi8vZ2VuLmxpYi5ydXMuZWMvZGJkdW1wcy8mbHQ7L2EmZ3Q7LiBJdCBpcyBkYXRlZCBKYW51YXJ5IDFzdCwgMjAxNC4mbHQ7ZGl2Jmd0OyZsdDticiZndDsmbHQ7L2RpdiZndDsmbHQ7ZGl2Jmd0O1RoaXMgZGF0YWJhc2Ugd2FzIHVzZWQgaW4gdGhlIGZvbGxvd2luZyBwYXBlcjombHQ7L2RpdiZndDsmbHQ7ZGl2Jmd0OyZsdDtwJmd0O0NhYmFuYWMsIEcuICgyMDE2KS4gQmlibGlvZ2lmdHMgaW4gTGliR2VuPyBBIHN0dWR5IG9mIGEgdGV4dC1zaGFyaW5nIHBsYXRmb3JtIGRyaXZlbiBieSBiaWJsaW9sZWFrcyBhbmQgY3Jvd2Rzb3VyY2luZy4gJmx0O2kmZ3Q7Sm91cm5hbCBvZiB0aGUgQXNzb2NpYXRpb24gZm9yIEluZm9ybWF0aW9uIFNjaWVuY2UgYW5kIFRlY2hub2xvZ3kmbHQ7L2kmZ3Q7LCA2Nyg0KSwgODc04oCTODg0LiBkb2k6Jmx0O2EgaHJlZj0iaHR0cHM6Ly9kb2kub3JnLzEwLjEwMDIvYXNpLjIzNDQ1IiZndDsxMC4xMDAyL2FzaS4yMzQ0NSZsdDsvYSZndDsmbHQ7L3AmZ3Q7Jmx0Oy9kaXYmZ3Q7PC9kZXNjcmlwdGlvbj48L2Rlc2NyaXB0aW9ucz48c3ViamVjdHM+PHN1YmplY3Qgc2NoZW1lVVJJPSJodHRwOi8vd3d3LmFicy5nb3YuYXUvYXVzc3RhdHMvYWJzQC5uc2YvMC82QkI0MjdBQjk2OTZDMjI1Q0EyNTc0MTgwMDA0NDYzRSIgc3ViamVjdFNjaGVtZT0iRk9SIj44MDcwNCBJbmZvcm1hdGlvbiBSZXRyaWV2YWwgYW5kIFdlYiBTZWFyY2g8L3N1YmplY3Q+PHN1YmplY3Qgc2NoZW1lVVJJPSJodHRwOi8vd3d3LmFicy5nb3YuYXUvYXVzc3RhdHMvYWJzQC5uc2YvMC82QkI0MjdBQjk2OTZDMjI1Q0EyNTc0MTgwMDA0NDYzRSIgc3ViamVjdFNjaGVtZT0iRk9SIj44MDcwNSBJbmZvcm1ldHJpY3M8L3N1YmplY3Q+PHN1YmplY3Q+TGlicmFyeSBhbmQgSW5mb3JtYXRpb24gU3R1ZGllczwvc3ViamVjdD48L3N1YmplY3RzPjxwdWJsaXNoZXI+Rmlnc2hhcmU8L3B1Ymxpc2hlcj48cHVibGljYXRpb25ZZWFyPjIwMTc8L3B1YmxpY2F0aW9uWWVhcj48ZGF0ZXM+PGRhdGUgZGF0ZVR5cGU9IkNyZWF0ZWQiPjIwMTctMDQtMjg8L2RhdGU+PGRhdGUgZGF0ZVR5cGU9IlVwZGF0ZWQiPjIwMTctMDQtMjg8L2RhdGU+PC9kYXRlcz48cmVzb3VyY2VUeXBlIHJlc291cmNlVHlwZUdlbmVyYWw9IlNvZnR3YXJlIj5Db2RlPC9yZXNvdXJjZVR5cGU+PHNpemVzPjxzaXplPjI1NzgxMjUxOTcgQnl0ZXM8L3NpemU+PC9zaXplcz48cmVsYXRlZElkZW50aWZpZXJzPjxyZWxhdGVkSWRlbnRpZmllciByZWxhdGVkSWRlbnRpZmllclR5cGU9IkRPSSIgcmVsYXRpb25UeXBlPSJJc0lkZW50aWNhbFRvIj4xMC42MDg0L205LmZpZ3NoYXJlLjQ5MDYzNjc8L3JlbGF0ZWRJZGVudGlmaWVyPjwvcmVsYXRlZElkZW50aWZpZXJzPjxyaWdodHNMaXN0PjxyaWdodHMgcmlnaHRzVVJJPSJodHRwczovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wLyI+Q0MtMDwvcmlnaHRzPjwvcmlnaHRzTGlzdD48L3Jlc291cmNlPg==","allocator_symbol":"FIGSHARE","minted":"2017-04-28T13:11:46Z","updated":"2017-04-28T13:11:47Z","doi":"10.6084/M9.FIGSHARE.4906367.V1"}]}}
+
+'
+    http_version: 
+  recorded_at: Tue, 25 Jul 2017 16:47:16 GMT
+- request:
+    method: head
+    uri: https://doi.org/10.6084/m9.figshare.4906367.v1
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Maremma - https://github.com/datacite/maremma
+      Accept:
+      - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
+  response:
+    status:
+      code: 303
+      message: See Other
+    headers:
+      Server:
+      - Apache-Coyote/1.1
+      Vary:
+      - Accept
+      Location:
+      - https://figshare.com/articles/Scimag_catalogue_of_LibGen_as_of_January_1st_2014/4906367/1
+      Expires:
+      - Tue, 25 Jul 2017 17:27:53 GMT
+      Content-Type:
+      - text/html;charset=utf-8
+      Content-Length:
+      - '263'
+      Date:
+      - Tue, 25 Jul 2017 16:47:19 GMT
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Tue, 25 Jul 2017 16:47:17 GMT
+recorded_with: VCR 3.0.3

data/spec/writers/citeproc_writer_spec.rb

@@ -82,6 +82,15 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["issued"]).to eq("date-parts" => [[2014, 2, 11]])
     end
 
+    it "software" do
+      input = "https://doi.org/10.6084/m9.figshare.4906367.v1"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite")
+      json = JSON.parse(subject.citeproc)
+      expect(json["type"]).to eq("article")
+      expect(json["DOI"]).to eq("10.6084/m9.figshare.4906367.v1")
+      expect(json["title"]).to eq("Scimag catalogue of LibGen as of January 1st, 2014")
+    end
+
     it "multiple abstracts" do
       input = "https://doi.org/10.12763/ona1045"
       subject = Bolognese::Metadata.new(input: input, from: "datacite")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.37
+  version: 0.9.38
 platform: ruby
 authors:
 - Martin Fenner
@@ -737,6 +737,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/journal_article.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/maremma.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/multiple_abstracts.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/software.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citeproc/with_pages.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_codemeta/SoftwareSourceCode_DataCite.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_crosscite/datacite_database_attributes.yml