bolognese 0.9.54 → 0.9.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 729c31ad551095ba9799875c7331b41b0ab431be
-  data.tar.gz: 49d6ff32d87b910bb8ee9e3470a1d389cd4e49b1
+  metadata.gz: 8483d1f8e557767fec495dcfaf83da4d2bfcd750
+  data.tar.gz: 8a05b19f4d418fcfa3b771d0e0b2e69de4b3a3a3
 SHA512:
-  metadata.gz: dfae9a90f8ae8107d1952844b1f08e89d05d80ba0bd25625153d65ad524d407731a36c3475dadd1b19d11c6eef8dfc2e8e71f12818fe70bd1d9b10d49e6fb9d5
-  data.tar.gz: c3fd0ebb7bdcfc3219f911db026c2692f6122d190059c2597b7c450c0229898dbb811a719f204f1815d93539488f0f4fb0b8d1d179dc16f59f3c304f99648842
+  metadata.gz: eb28085d5f306cf6b0774477380c147f7ef700049df2a49d153b2e613130e0a2d96ffce55f27e224e9f44356bf2ae8ba5372f610b204720da6c71499bb74959e
+  data.tar.gz: ef141c6d4ac0709ef609937d44680e763a21a7b49ba53cbfdfc10eb28610edf4bbffe4b4d8c91dbb0726eac0453a7ed5642cf0efbc822ee76f8dcfe1d9ce1e64

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.9.54)
+    bolognese (0.9.55)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)
@@ -60,13 +60,13 @@ GEM
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashdiff (0.3.6)
+    hashdiff (0.3.7)
     htmlentities (4.3.4)
     i18n (0.8.6)
     json (2.1.0)
-    json-ld (2.1.5)
+    json-ld (2.1.7)
       multi_json (~> 1.12)
-      rdf (~> 2.2)
+      rdf (~> 2.2, >= 2.2.8)
     jsonlint (0.2.0)
       oj (~> 2)
       trollop (~> 2)
@@ -104,7 +104,7 @@ GEM
     rack-test (0.7.0)
       rack (>= 1.0, < 3)
     rake (12.1.0)
-    rdf (2.2.9)
+    rdf (2.2.11)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (2.2.0)
@@ -120,7 +120,7 @@ GEM
       rdf (~> 2.0)
       rdf-rdfa (~> 2.0)
       rdf-xsd (~> 2.0)
-    rdf-turtle (2.2.0)
+    rdf-turtle (2.2.1)
       ebnf (~> 1.1)
       rdf (~> 2.2)
     rdf-xsd (2.2.0)
@@ -159,7 +159,7 @@ GEM
     unicode (0.4.4.4)
     unicode_utils (1.4.0)
     vcr (3.0.3)
-    webmock (3.0.1)
+    webmock (3.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

data/lib/bolognese/metadata.rb

@@ -106,7 +106,7 @@ module Bolognese
       end
 
       # generate name for method to call dynamically
-      @metadata = @from.present? ? send("read_" + @from, string: string, sandbox: options[:sandbox], url: options[:url]) : {}
+      @metadata = @from.present? ? send("read_" + @from, string: string, sandbox: options[:sandbox], doi: options[:doi], url: options[:url]) : {}
       @raw = string.present? ? string.strip : nil
 
       @should_passthru = (@from == "datacite") && !regenerate

data/lib/bolognese/readers/datacite_reader.rb

@@ -49,7 +49,12 @@ module Bolognese
           return { "errors" => errors } if errors.present?
         end
 
-        id = normalize_doi(meta.dig("identifier", "__content__"), sandbox: options[:sandbox])
+        if options[:doi]
+          id = normalize_doi(options[:doi], sandbox: options[:sandbox])
+        else
+          id = normalize_doi(meta.dig("identifier", "__content__"), sandbox: options[:sandbox])
+        end
+
         doi = doi_from_url(id)
 
         if options[:url]

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.54"
+  VERSION = "0.9.55"
 end

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

@@ -0,0 +1,38 @@
+---
+http_interactions:
+- request:
+    method: head
+    uri: https://doi.org/10.5072/testpub2
+    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:
+      - http://www.datacite.org/testprefix
+      Expires:
+      - Mon, 09 Oct 2017 00:17:32 GMT
+      Content-Type:
+      - text/html;charset=utf-8
+      Content-Length:
+      - '153'
+      Date:
+      - Sun, 08 Oct 2017 23:20:48 GMT
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Sun, 08 Oct 2017 23:20:48 GMT
+recorded_with: VCR 3.0.3

data/spec/readers/datacite_reader_spec.rb

@@ -260,6 +260,24 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.provider).to eq("DataCite")
     end
 
+    it "Schema 4.1 from string with doi in options" do
+      input = fixture_path + "datacite-example-complicated-v4.1.xml"
+      subject = Bolognese::Metadata.new(input: input, doi: "10.5072/testpub2")
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5072/testpub2")
+      expect(subject.type).to eq("ScholarlyArticle")
+      expect(subject.additional_type).to eq("Monograph")
+      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.author).to eq([{"type"=>"Person", "name"=>"John Smith", "givenName"=>"John", "familyName"=>"Smith"}, {"name"=>"つまらないものですが"}])
+      expect(subject.title).to eq(["Właściwości rzutowań podprzestrzeniowych", {"title_type"=>"TranslatedTitle", "text"=>"Translation of Polish titles"}])
+      expect(subject.alternate_name).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
+      expect(subject.date_published).to eq("2010")
+      expect(subject.is_part_of).to eq("type"=>"CreativeWork", "id"=>"https://doi.org/10.5272/oldertestpub")
+      expect(subject.license).to eq("id"=>"http://creativecommons.org/licenses/by-nd/2.0", "name"=>"Creative Commons Attribution-NoDerivs 2.0 Generic")
+      expect(subject.publisher).to eq("Springer")
+      expect(subject.provider).to eq("DataCite")
+    end
+
     it "empty subject" do
       input = "https://doi.org/10.18169/PAPDEOTTX00502"
       subject = Bolognese::Metadata.new(input: input)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.54
+  version: 0.9.55
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -649,6 +649,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/Funding.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/Funding_schema_version_4.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/Schema_4_1_from_string.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_datacite_metadata/Schema_4_1_from_string_with_doi_in_options.yml
 - 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/author_with_wrong_orcid_scheme.yml