bolognese 0.9.27 → 0.9.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cdd174ccc29708dbf4316c8f70a659ecd9240a4
-  data.tar.gz: cd64d7fcfc6e67b3eac91d3f4287c4edfc7d55b1
+  metadata.gz: c0c56ee5d9e7e6c6b05cf7dc7fa782bc332aaac1
+  data.tar.gz: a49d7460ee9d3fba26acc953df4e7a9d8c053a32
 SHA512:
-  metadata.gz: e300a595aa5e7d82e865269d8a07d7cc2ed1215e15e1444ff75f1c04e58fc94931665f38bfaa501836cf1144ba13ce59e9aceb92ea95022598f99e169ef9b780
-  data.tar.gz: c13719adb731b9aa0b9fd5b12c08d1ef57c865ee2292faf6938fc7e8024e77d12309d9b4f71d4fa73915a9cb34ebde60fc37f23150c4dd8fabb2b876866e369a
+  metadata.gz: 82bf48a194cdd0d9bc38cdb5e530ac8482a64ff0aae041274577555211e2444887a426dcb198a76efe3896098cb8130265f280c67a358023c3497fa71c84c3c7
+  data.tar.gz: a38601783170cc7d9782dbfea068297f04288b8866511bfdbec151156a434d40cf44e07ab744c7d8b61b1c84e4509600aa7650b43beba13dedef845aabcd230e

data/Gemfile.lock

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

data/lib/bolognese/metadata.rb

@@ -72,14 +72,14 @@ module Bolognese
       :related_identifier, :reverse, :citeproc_type, :ris_type, :volume, :issue,
       :name_detector
 
-    def initialize(input: nil, from: nil, regenerate: false)
+    def initialize(input: nil, from: nil, regenerate: false, **options)
       id = normalize_id(input)
 
       if id.present?
         @from = from || find_from_format(id: id)
 
         # generate name for method to call dynamically
-        string = @from.present? ? send("get_" + @from, id: id) : nil
+        string = @from.present? ? send("get_" + @from, id: id, search_url: options[:search_url]) : nil
       elsif File.exist?(input)
         ext = File.extname(input)
         if %w(.bib .ris .xml .json).include?(ext)

data/lib/bolognese/readers/codemeta_reader.rb

@@ -1,7 +1,7 @@
 module Bolognese
   module Readers
     module CodemetaReader
-      def get_codemeta(id: nil)
+      def get_codemeta(id: nil, **options)
         return nil unless id.present?
         id = normalize_id(id)
         response = Maremma.get(github_as_codemeta_url(id), accept: "json", raw: true)

data/lib/bolognese/readers/crossref_reader.rb

@@ -62,7 +62,7 @@ module Bolognese
 
       CONTACT_EMAIL = "tech@datacite.org"
 
-      def get_crossref(id: nil)
+      def get_crossref(id: nil, **options)
         return nil unless id.present?
 
         doi = doi_from_url(id)

data/lib/bolognese/readers/datacite_reader.rb

@@ -1,12 +1,12 @@
 module Bolognese
   module Readers
     module DataciteReader
-      def get_datacite(id: nil)
+      def get_datacite(id: nil, **options)
         return nil unless id.present?
 
         doi = doi_from_url(id)
-        url = ENV['SEARCH_URL'].presence || "https://search.datacite.org"
-        url += "/api?q=doi:#{doi}&fl=doi,xml,media,minted,updated&wt=json"
+        url = options.fetch(:search_url, nil).presence || "https://search.datacite.org/api"
+        url += "?q=doi:#{doi}&fl=doi,xml,media,minted,updated&wt=json"
 
         response = Maremma.get url
         attributes = response.body.dig("data", "response", "docs").first

data/lib/bolognese/readers/schema_org_reader.rb

@@ -59,7 +59,7 @@ module Bolognese
         }
       end
 
-      def get_schema_org(id: nil)
+      def get_schema_org(id: nil, **options)
         return nil unless id.present?
 
         id = normalize_id(id)

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.27"
+  VERSION = "0.9.28"
 end

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

@@ -0,0 +1,107 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.datacite.org/prefixes/10.5286
+    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:
+      - Sun, 25 Jun 2017 12:45:30 GMT
+      Etag:
+      - W/"be181a297e99f2daa28e8ee93e167f12"
+      Server:
+      - openresty/1.11.2.2
+      Status:
+      - 200 OK
+      Vary:
+      - Accept-Encoding
+      Via:
+      - kong/0.10.3
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Kong-Proxy-Latency:
+      - '1'
+      X-Kong-Upstream-Latency:
+      - '332'
+      X-Powered-By:
+      - Phusion Passenger 5.1.5
+      X-Ratelimit-Limit-Hour:
+      - '100000'
+      X-Ratelimit-Remaining-Hour:
+      - '99994'
+      X-Request-Id:
+      - e779f0c8-de88-4f60-aeee-6d3315faefd2
+      X-Runtime:
+      - '0.330449'
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '124'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"data":{"id":"10.5286","type":"prefixes","attributes":{"registration-agency":"DataCite","updated":"2016-09-21T20:27:14Z"}}}'
+    http_version: 
+  recorded_at: Sun, 25 Jun 2017 12:45:30 GMT
+- request:
+    method: get
+    uri: https://search.test.datacite.org/api?fl=doi,xml,media,minted,updated&q=doi:10.5286/topcat/isis/1/datacollection/84974338&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:
+      - Sun, 25 Jun 2017 12:45:30 GMT
+      Server:
+      - openresty/1.11.2.2
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":1},"response":{"numFound":1,"start":0,"docs":[{"xml":"PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHJlc291cmNlIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCIgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC00L21ldGFkYXRhLnhzZCI+PGlkZW50aWZpZXIgaWRlbnRpZmllclR5cGU9IkRPSSI+MTAuNTI4Ni90b3BjYXQvaXNpcy8xL0RhdGFDb2xsZWN0aW9uLzg0OTc0MzM4PC9pZGVudGlmaWVyPjx0aXRsZXM+PHRpdGxlIHhtbDpsYW5nPSJlbi1nYiI+RXhwbG9yaW5nIHRoZSBwb3RlbnRpYWwgb2YgZW5lcmd5LWRlcGVuZGVudCBuZXV0cm9uIGltYWdpbmcgPC90aXRsZT48L3RpdGxlcz48ZGVzY3JpcHRpb25zPjxkZXNjcmlwdGlvbiBkZXNjcmlwdGlvblR5cGU9IkFic3RyYWN0IiB4bWw6bGFuZz0iZW4tZ2IiPldlIHdvdWxkIGxpa2UgdG8gZXhwbG9yZSB0aGUgcG90ZW50aWFsIG9mIGVuZXJneS1kZXBlbmRlbnQgbmV1dHJvbiBpbWFnaW5nLCBpbiB2aWV3IG9mIHRoZSBmdXR1cmUgQnJhZ2cgZWRnZSB0cmFuc21pc3Npb24gYW5hbHlzaXMgb3B0aW9ucyBvbiBJTUFUIGFuZCBMQVJNT1IuIFRoZSBleHBlcmltZW50cyB3aWxsIHVzZSB0aGUgbGF0ZXN0IG5ldXRyb24gc2Vuc2l0aXZlIG1pY3JvY2hhbm5lbCBwbGF0ZSAoTUNQKSBkZXRlY3Rpb24gc3lzdGVtLCBjaGFyYWN0ZXJpemUgaXRzIHBlcmZvcm1hbmNlIG9uIGEgVFMtMiBuZXV0cm9uIGJlYW0gYW5kIHByb2R1Y2UgZGF0YSBzZXRzIGZvciBkZXZlbG9waW5nIGRhdGEgcHJvY2Vzc2luZyBhbmQgY29ycmVjdGlvbnMgcHJvY2VkdXJlcyBmb3IgZW5lcmd5LXJlc29sdmVkIG5ldXRyb24gcmFkaW9ncmFwaHkgYW5kIHRvbW9ncmFwaHkuIERhdGEgc2V0cyB3aWxsIGJlIGNvbGxlY3RlZCBvbiBhIHJhbmdlIG9mIHN0YW5kYXJkIHNhbXBsZXMgYW5kIGVuZ2luZWVyaW5nIGFsbG95cyBvZiB2YXJ5aW5nIGNvbXBvc2l0aW9uIGFuZCBnZW9tZXRyeSwgdG8gdmVyaWZ5IHRoZSB1c2VmdWxuZXNzIG9mIG5ldXRyb24gaW1hZ2luZyBmb3IgcGhhc2UsIGdyYWluIGFuZCBzdHJhaW4gbWFwcGluZyBpbiBlbmdpbmVlcmluZyBhbGxveXMuIFdlIGFzayBmb3IgYSB0b3RhbCBvZiAxMiBkYXlzIG9uIExBUk1PUi48L2Rlc2NyaXB0aW9uPjwvZGVzY3JpcHRpb25zPjxjcmVhdG9ycz48Y3JlYXRvcj48Y3JlYXRvck5hbWU+RHIgV2luZnJpZWQgS29ja2VsbWFubjwvY3JlYXRvck5hbWU+PC9jcmVhdG9yPjxjcmVhdG9yPjxjcmVhdG9yTmFtZT5EciBSb2JlcnQgRGFsZ2xpZXNoPC9jcmVhdG9yTmFtZT48L2NyZWF0b3I+PGNyZWF0b3I+PGNyZWF0b3JOYW1lPkRyIFRyaWVzdGlubyBNaW5uaXRpPC9jcmVhdG9yTmFtZT48L2NyZWF0b3I+PGNyZWF0b3I+PGNyZWF0b3JOYW1lPlByb2Zlc3NvciBLZW5pY2hpIFdhdGFuYWJlPC9jcmVhdG9yTmFtZT48L2NyZWF0b3I+PGNyZWF0b3I+PGNyZWF0b3JOYW1lPk1yIFJhbmdnaSBSYW1hZGhhbjwvY3JlYXRvck5hbWU+PC9jcmVhdG9yPjxjcmVhdG9yPjxjcmVhdG9yTmFtZT5NciBUb20gR293bGFuZDwvY3JlYXRvck5hbWU+PC9jcmVhdG9yPjwvY3JlYXRvcnM+PGRhdGVzPjxkYXRlIGRhdGVUeXBlPSJBdmFpbGFibGUiPjIwMTctMDYtMjM8L2RhdGU+PC9kYXRlcz48cHVibGlzaGVyPklTSVM8L3B1Ymxpc2hlcj48cHVibGljYXRpb25ZZWFyPjIwMTc8L3B1YmxpY2F0aW9uWWVhcj48cmVzb3VyY2VUeXBlIHJlc291cmNlVHlwZUdlbmVyYWw9IkRhdGFzZXQiPkV4cGVyaW1lbnQgRGF0YTwvcmVzb3VyY2VUeXBlPjxyaWdodHNMaXN0PjxyaWdodHMgcmlnaHRzVVJJPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9saWNlbnNlcy9ieS80LjAvIj5DcmVhdGl2ZSBDb21tb25zIC0gQXR0cmlidXRpb24gNC4wIEludGVybmF0aW9uYWw8L3JpZ2h0cz48L3JpZ2h0c0xpc3Q+PC9yZXNvdXJjZT4=","minted":"2017-06-23T14:30:35Z","updated":"2017-06-23T14:30:35Z","doi":"10.5286/TOPCAT/ISIS/1/DATACOLLECTION/84974338"}]}}
+
+'
+    http_version: 
+  recorded_at: Sun, 25 Jun 2017 12:45:30 GMT
+recorded_with: VCR 3.0.3

data/spec/readers/datacite_reader_spec.rb

@@ -259,6 +259,28 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be false
     end
 
+    it "DOI in test system" do
+      input = "https://doi.org/10.5286/TOPCAT/ISIS/1/DATACOLLECTION/84974338"
+      search_url = "https://search.test.datacite.org/api"
+      subject = Bolognese::Metadata.new(input: input, search_url: search_url)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5286/topcat/isis/1/datacollection/84974338")
+      expect(subject.type).to eq("Dataset")
+      expect(subject.additional_type).to eq("Experiment Data")
+      expect(subject.resource_type_general).to eq("Dataset")
+      expect(subject.author).to eq([{"name"=>"Dr Winfried Kockelmann"},
+                                    {"name"=>"Dr Robert Dalgliesh"},
+                                    {"name"=>"Dr Triestino Minniti"},
+                                    {"name"=>"Professor Kenichi Watanabe"},
+                                    {"name"=>"Mr Ranggi Ramadhan"},
+                                    {"name"=>"Mr Tom Gowland"}])
+      expect(subject.title["text"]).to eq("Exploring the potential of energy-dependent neutron imaging")
+      expect(subject.date_published).to eq("2017")
+      expect(subject.publisher).to eq("ISIS")
+      expect(subject.provider).to eq("DataCite")
+      expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
+    end
+
     # it "missing creator" do
     #   string = IO.read(fixture_path + "datacite_missing_creator.xml")
     #   subject = Bolognese::Metadata.new(string: string, regenerate: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: 0.9.28
 platform: ruby
 authors:
 - Martin Fenner
@@ -590,6 +590,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/not_found_error.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/posted_content.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/BlogPosting.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/DOI_in_test_system.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/DOI_not_found.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/Dataset.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/Funding.yml