bolognese 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e3b5dfcc9f59a35dc3787205cbc5d3acb1234fa
-  data.tar.gz: 8a5bd7038d69a484899b7c7a564dc2e51d647a2f
+  metadata.gz: c4bf575907432b4cceb0c59f18c11f46f8d8a048
+  data.tar.gz: 2688d21093927a3153ab67b8d492e18900b2d524
 SHA512:
-  metadata.gz: 12dbc8e38c850794aad9426e19df9bb34bb8856988080db7b63e437b245f3e154ca8c03beddef970fcb0600bf84d0b865b19e6b7121d9c86f0ab917eea5b5a41
-  data.tar.gz: 2b3681684f694194e60db100450d1d8df1e56149c7ca35460318761d284fa23616cdf3bd7fc44d1bbdb059bd24ee32f17dec75c486f93c3efcbfab93b0771120
+  metadata.gz: 5e8af10f8bd60543bff089d952d4325b78986d5d6240d5555b6fd820331074da0f575fc451b1aeab07658ad1f07ea649ac4a7cd704f8a2b063d50a0072c646f8
+  data.tar.gz: 552874744bd870c5a108593862bc9778bf80bd7c24673f2d62014685a5d01a135b41ca42fdf23025a749dae63bbc59ce523440f846bde7e0788cb4e3ef11f426

data/Gemfile.lock

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

data/lib/bolognese/readers/datacite_reader.rb

@@ -43,7 +43,7 @@ module Bolognese
           if k.is_a?(String)
             sanitize(k)
           else
-            k.fetch("__content__", nil)
+            k.to_h.fetch("__content__", nil)
           end
         end.compact.join(", ").presence
         dates = Array.wrap(meta.dig("dates", "date"))

data/lib/bolognese/utils.rb

@@ -420,7 +420,7 @@ module Bolognese
         a["given"] = a["givenName"]
         a["literal"] = a["name"] unless a["familyName"].present?
         a.except("type", "@type", "id", "@id", "name", "familyName", "givenName").compact
-      end.unwrap
+      end
     end
 
     def to_ris(element)

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.16"
+  VERSION = "0.9.17"
 end

data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/empty_subject.yml

@@ -0,0 +1,99 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.datacite.org/prefixes/10.18169
+    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: ''
+    headers:
+      Access-Control-Allow-Headers:
+      - Content-Type,Accept,Accept-Encoding,Origin,User-Agent,Cache-Control,Keep-Alive
+      Access-Control-Allow-Methods:
+      - GET, POST, OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Content-Type:
+      - application/vnd.api+json; charset=utf-8
+      Date:
+      - Mon, 08 May 2017 16:13:02 GMT
+      Etag:
+      - W/"b8e8c74c8d2edc7cfc1ceedfe0458b59"
+      Server:
+      - openresty/1.11.2.2
+      Status:
+      - 200 OK
+      Vary:
+      - Accept-Encoding
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Powered-By:
+      - Phusion Passenger 5.1.2
+      X-Request-Id:
+      - 45b80e41-aa23-4d99-82a8-3a4c1883a1ad
+      X-Runtime:
+      - '0.636173'
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '125'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"data":{"id":"10.18169","type":"prefixes","attributes":{"registration-agency":"DataCite","updated":"2016-09-21T20:25:36Z"}}}'
+    http_version: 
+  recorded_at: Mon, 08 May 2017 16:13:02 GMT
+- request:
+    method: get
+    uri: https://search.datacite.org/api?fl=doi,xml,media,minted,updated&q=doi:10.18169/papdeottx00502&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: ''
+    headers:
+      Access-Control-Allow-Methods:
+      - GET, POST, OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Content-Type:
+      - application/json;charset=UTF-8
+      Date:
+      - Mon, 08 May 2017 16:13:02 GMT
+      Server:
+      - openresty/1.11.2.2
+      Content-Length:
+      - '1759'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":1},"response":{"numFound":1,"start":0,"docs":[{"xml":"PHJlc291cmNlIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyIgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC0zL21ldGFkYXRhLnhzZCI+DTxpZGVudGlmaWVyIGlkZW50aWZpZXJUeXBlPSJET0kiPjEwLjE4MTY5L1BBUERFT1RUWDAwNTAyPC9pZGVudGlmaWVyPg08Y3JlYXRvcnM+DTxjcmVhdG9yPg08Y3JlYXRvck5hbWU+YW5vbnltb3VzPC9jcmVhdG9yTmFtZT4NPC9jcmVhdG9yPg08L2NyZWF0b3JzPg08dGl0bGVzPg08dGl0bGU+TWVzc3VuZyBkZXIgQmlsZHVuc2NoYWVyZmUgaW4gSC4yNjQtY29kaWVydGVuIEJpbGRlcm4gdW5kIFZpZGVvc2VxdWVuemVuPC90aXRsZT4NPC90aXRsZXM+DTxwdWJsaXNoZXI+U2llbWVucyBBRzwvcHVibGlzaGVyPg08cHVibGljYXRpb25ZZWFyPjIwMTc8L3B1YmxpY2F0aW9uWWVhcj4NPHN1YmplY3RzPg08c3ViamVjdD48L3N1YmplY3Q+DTxzdWJqZWN0Pjwvc3ViamVjdD4NPHN1YmplY3Q+PC9zdWJqZWN0Pg08L3N1YmplY3RzPg08ZGF0ZXM+DTxkYXRlIGRhdGVUeXBlPSJBdmFpbGFibGUiPjA3LjA0LjIwMTc8L2RhdGU+DTwvZGF0ZXM+DTxsYW5ndWFnZT5kZTwvbGFuZ3VhZ2U+DTxyZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlR2VuZXJhbD0iRGF0YXNldCI+RGlzY2xvc3VyZTwvcmVzb3VyY2VUeXBlPg08YWx0ZXJuYXRlSWRlbnRpZmllcnM+DTxhbHRlcm5hdGVJZGVudGlmaWVyIGFsdGVybmF0ZUlkZW50aWZpZXJUeXBlPSJVUkwiPg1odHRwOi8vd3d3LnByaW9yYXJ0cmVnaXN0ZXIuY29tL3Jlc29sdmUucGhwP2Rpc2Nsb3N1cmU9T1RUWDAwNTAyDTwvYWx0ZXJuYXRlSWRlbnRpZmllcj4NPC9hbHRlcm5hdGVJZGVudGlmaWVycz4NPHNpemVzPg08c2l6ZT48L3NpemU+DTwvc2l6ZXM+DTxmb3JtYXRzPg08Zm9ybWF0PlBERjwvZm9ybWF0Pg08L2Zvcm1hdHM+DTx2ZXJzaW9uPjE8L3ZlcnNpb24+DTxkZXNjcmlwdGlvbnM+DTxkZXNjcmlwdGlvbiBkZXNjcmlwdGlvblR5cGU9IkFic3RyYWN0Ij4NPC9kZXNjcmlwdGlvbj4NPC9kZXNjcmlwdGlvbnM+DTwvcmVzb3VyY2U+DQ==","minted":"2017-04-07T11:11:49Z","updated":"2017-04-07T11:11:49Z","doi":"10.18169/PAPDEOTTX00502"}]}}
+
+'
+    http_version: 
+  recorded_at: Mon, 08 May 2017 16:13:02 GMT
+recorded_with: VCR 3.0.3

data/spec/readers/datacite_reader_spec.rb

@@ -203,6 +203,22 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.provider).to eq("DataCite")
     end
 
+    it "empty subject" do
+      input = "https://doi.org/10.18169/PAPDEOTTX00502"
+      subject = Bolognese::Metadata.new(input: input)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.18169/papdeottx00502")
+      expect(subject.type).to eq("Dataset")
+      expect(subject.additional_type).to eq("Disclosure")
+      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.author).to eq("name"=>"Anonymous")
+      expect(subject.title).to eq( "Messung der Bildunschaerfe in H.264-codierten Bildern und Videosequenzen")
+      expect(subject.date_published).to eq("2017")
+      expect(subject.publisher).to eq("Siemens AG")
+      expect(subject.provider).to eq("DataCite")
+      expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
+    end
+
     # it "missing creator" do
     #   string = IO.read(fixture_path + "datacite_missing_creator.xml")
     #   subject = Bolognese::Metadata.new(string: string, regenerate: true)

data/spec/writers/citeproc_writer_spec.rb

@@ -32,7 +32,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["id"]).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(json["DOI"]).to eq("10.5438/4k3m-nyvg")
       expect(json["title"]).to eq("Eating your own Dog Food")
-      expect(json["author"]).to eq("family"=>"Fenner", "given"=>"Martin")
+      expect(json["author"]).to eq([{"family"=>"Fenner", "given"=>"Martin"}])
       expect(json["publisher"]).to eq("DataCite")
       expect(json["issued"]).to eq("date-parts"=>[[2016, 12, 20]])
     end
@@ -45,7 +45,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["id"]).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(json["DOI"]).to eq("10.5438/4K3M-NYVG")
       expect(json["title"]).to eq("Eating your own Dog Food")
-      expect(json["author"]).to eq("family" => "Fenner","given" => "Martin")
+      expect(json["author"]).to eq([{"family"=>"Fenner", "given"=>"Martin"}])
       expect(json["publisher"]).to eq("DataCite")
       expect(json["issued"]).to eq("date-parts" => [[2016, 12, 20]])
     end
@@ -58,7 +58,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["id"]).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(json["DOI"]).to eq("10.5438/4k3m-nyvg")
       expect(json["title"]).to eq("Eating your own Dog Food")
-      expect(json["author"]).to eq("family" => "Fenner","given" => "Martin")
+      expect(json["author"]).to eq([{"family"=>"Fenner", "given"=>"Martin"}])
       expect(json["publisher"]).to eq("DataCite")
       expect(json["issued"]).to eq("date-parts" => [[2016, 12, 20]])
     end
@@ -130,7 +130,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["id"]).to eq("https://doi.org/10.5438/qeg0-3gm3")
       expect(json["DOI"]).to eq("10.5438/qeg0-3gm3")
       expect(json["title"]).to eq("Maremma: a Ruby library for simplified network calls")
-      expect(json["author"]).to eq("family" => "Fenner", "given" => "Martin")
+      expect(json["author"]).to eq([{"family"=>"Fenner", "given"=>"Martin"}])
       expect(json["publisher"]).to eq("DataCite")
       expect(json["issued"]).to eq("date-parts" => [[2017, 2, 24]])
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors:
 - Martin Fenner
@@ -593,6 +593,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/author_only_full_name.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/author_with_scheme.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/date.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/empty_subject.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/funding_schema_version_3.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/is_identical_to.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/keywords_with_attributes.yml