bolognese 0.9.87 → 0.9.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f20ecd6f9a84ab76a03a3d5212ef7ac0bffb521d145d1d8ffa9479c10e4854a3
-  data.tar.gz: 82b57cee93effb06e3407ca0b420d674f885967e6338e5b34a04c7d2227a8fce
+  metadata.gz: 7e74e3f9f166b02c9587e2c665b0db28263c348e9029a4f40c6be1cddfc6f7c0
+  data.tar.gz: 7ce0a967fdc05d92aeba5d7b583c0f13a1d72d4978d0720957577745fe73da85
 SHA512:
-  metadata.gz: dd5375d60a2bdf32783db1c6799f4c40fba651429e19f4525e9dc55f5d02bebf662a26a11f68efdc516c6e6aa57706fdef761a24707a519517b08e45f5d4fe65
-  data.tar.gz: e4752b5b7dab18663d67e23108fd34ef0894fea9b4846b9c5f8651faa12b2b24869dd3c6aecf2dab9459e8bbe0f798c2bc64ff31acc4bc94c72c526b7d3eb9cb
+  metadata.gz: a7c157e267e030cc5a836c8a59f345ba1dee0360cd3482c97d99388b01568c6a553e753eb9f06ad6d51816d32b75cd3ef03f85dab463dda873edb237c5cedd28
+  data.tar.gz: f67704d4887a0465763ff5366be2f6174229eb7377043039e7fa2f158bec2a4f1dff285d54176146481475bdc38511f5213f8b52f925085c1be5fa48549d9b63

data/Gemfile.lock

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

data/lib/bolognese/metadata.rb

@@ -76,7 +76,7 @@ module Bolognese
       :is_derived_from, :is_source_of, :format, :funding, :type, :bibtex_type,
       :citeproc_type, :ris_type, :style, :locale, :state
 
-    attr_reader :id, :from, :raw, :metadata, :doc, :provider,
+    attr_reader :id, :from, :raw, :metadata, :doc, :service_provider,
       :page_start, :page_end, :should_passthru, :errors,
       :related_identifier, :reverse, :name_detector
 
@@ -229,8 +229,8 @@ module Bolognese
       @publisher ||= metadata.fetch("publisher", nil)
     end
 
-    def provider
-      @provider ||= metadata.fetch("provider", nil)
+    def service_provider
+      @service_provider ||= metadata.fetch("service_provider", nil)
     end
 
     def date_created

data/lib/bolognese/readers/crossref_reader.rb

@@ -151,7 +151,7 @@ module Bolognese
           "editor" => crossref_people(bibliographic_metadata, "editor"),
           "funding" => crossref_funding_reference(program_metadata),
           "publisher" => publisher,
-          "provider" => "Crossref",
+          "service_provider" => "Crossref",
           "is_part_of" => crossref_is_part_of(journal_metadata),
           "references" => crossref_references(bibliographic_metadata),
           "date_published" => crossref_date_published(bibliographic_metadata),

data/lib/bolognese/readers/datacite_json_reader.rb

@@ -25,7 +25,7 @@ module Bolognese
           "author" => meta.fetch("creator", nil),
           "editor" => meta.fetch("contributor", nil),
           "publisher" => meta.fetch("publisher", nil),
-          "provider" => "DataCite",
+          "service_provider" => "DataCite",
           "is_part_of" => meta.fetch("is_part_of", nil),
           "has_part" => meta.fetch("has_part", nil),
           "references" => meta.fetch("references", nil),

data/lib/bolognese/readers/datacite_reader.rb

@@ -107,7 +107,7 @@ module Bolognese
           "author" => get_authors(meta.dig("creators", "creator")),
           "editor" => get_authors(Array.wrap(meta.dig("contributors", "contributor")).select { |r| r["contributorType"] == "Editor" }),
           "publisher" => meta.fetch("publisher", nil),
-          "provider" => "DataCite",
+          "service_provider" => "DataCite",
           "funding" => funding,
           "is_identical_to" => datacite_is_identical_to(meta),
           "is_part_of" => datacite_is_part_of(meta),

data/lib/bolognese/readers/schema_org_reader.rb

@@ -56,7 +56,7 @@ module Bolognese
           "alternate_name" => meta.fetch("alternateName", nil),
           "author" => author,
           "publisher" => meta.dig("publisher", "name"),
-          "provider" => meta.fetch("provider", nil),
+          "service_provider" => meta.fetch("provider", nil),
           "is_identical_to" => schema_org_is_identical_to(meta),
           "is_part_of" => schema_org_is_part_of(meta),
           "has_part" => schema_org_has_part(meta),

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.87"
+  VERSION = "0.9.88"
 end

data/lib/bolognese/writers/crosscite_writer.rb

@@ -46,7 +46,7 @@ module Bolognese
           "schema_version" => schema_version,
           "provider_id" => provider_id,
           "client_id" => client_id,
-          "provider" => provider,
+          "provider" => service_provider,
           "state" => state
         }.compact
         JSON.pretty_generate hsh.presence

data/lib/bolognese/writers/datacite_json_writer.rb

@@ -3,7 +3,7 @@ module Bolognese
     module DataciteJsonWriter
       def datacite_json
         hsh = {
-          "id" => id,
+          "id" => identifier,
           "doi" => doi,
           "url" => url,
           "creator" => author,
@@ -40,7 +40,7 @@ module Bolognese
           "schemaVersion" => schema_version,
           "provider_id" => provider_id,
           "client_id" => client_id,
-          "provider" => provider
+          "provider" => service_provider
         }.compact
         JSON.pretty_generate hsh.presence
       end

data/lib/bolognese/writers/schema_org_writer.rb

@@ -34,7 +34,7 @@ module Bolognese
           "schemaVersion" => schema_version,
           "publisher" => publisher.present? ? { "@type" => "Organization", "name" => publisher } : nil,
           "funding" => to_schema_org(funding),
-          "provider" => provider.present? ? { "@type" => "Organization", "name" => provider } : nil
+          "provider" => service_provider.present? ? { "@type" => "Organization", "name" => service_provider } : nil
         }.compact.presence
       end
 

data/spec/readers/crossref_reader_spec.rb

@@ -42,7 +42,7 @@ describe Bolognese::Metadata, vcr: true do
                                      {"type"=>"Organization",
                                       "id"=>"https://doi.org/10.13039/501100006390",
                                       "name"=>"University of Lausanne"}])
-      expect(subject.provider).to eq("Crossref")
+      expect(subject.service_provider).to eq("Crossref")
     end
 
     it "journal article" do
@@ -65,7 +65,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.first_page).to eq("e30")
       expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"PLoS ONE", "issn"=>"1932-6203")
       expect(subject.container_title).to eq("PLoS ONE")
-      expect(subject.provider).to eq("Crossref")
+      expect(subject.service_provider).to eq("Crossref")
     end
 
     it "posted_content" do
@@ -86,7 +86,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_modified).to eq("2017-10-10T05:10:49Z")
       expect(subject.is_part_of).to be_nil
       expect(subject.publisher).to eq("bioRxiv")
-      expect(subject.provider).to eq("Crossref")
+      expect(subject.service_provider).to eq("Crossref")
     end
 
     it "DOI with SICI DOI" do
@@ -107,7 +107,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.last_page).to eq("2841")
       expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"Ecology", "issn"=>"0012-9658")
       expect(subject.container_title).to eq("Ecology")
-      expect(subject.provider).to eq("Crossref")
+      expect(subject.service_provider).to eq("Crossref")
     end
 
     it "DOI with ORCID ID" do
@@ -129,7 +129,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.last_page).to eq("7")
       expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"Pulmonary Medicine", "issn"=>"2090-1836")
       expect(subject.container_title).to eq("Pulmonary Medicine")
-      expect(subject.provider).to eq("Crossref")
+      expect(subject.service_provider).to eq("Crossref")
     end
 
     it "date in future" do
@@ -148,7 +148,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_modified).to eq("2017-06-23T08:44:48Z")
       expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"European Journal of Pharmacology", "issn"=>"00142999")
       expect(subject.container_title).to eq("European Journal of Pharmacology")
-      expect(subject.provider).to eq("Crossref")
+      expect(subject.service_provider).to eq("Crossref")
     end
 
     it "dataset" do
@@ -168,7 +168,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq(1984)
       expect(subject.date_modified).to eq("2014-05-27T16:45:59Z")
       expect(subject.publisher).to eq("(:unav)")
-      expect(subject.provider).to eq("Crossref")
+      expect(subject.service_provider).to eq("Crossref")
     end
 
     it "book chapter" do
@@ -186,7 +186,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_published).to eq("2015")
       expect(subject.date_modified).to eq("2015-04-14T02:31:13Z")
       expect(subject.publisher).to eq("Springer Berlin Heidelberg")
-      expect(subject.provider).to eq("Crossref")
+      expect(subject.service_provider).to eq("Crossref")
     end
 
     it "journal article with" do
@@ -206,7 +206,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_modified).to eq("2017-06-05T10:56:59Z")
       expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"New Phytologist", "issn"=>"0028646X")
       expect(subject.container_title).to eq("New Phytologist")
-      expect(subject.provider).to eq("Crossref")
+      expect(subject.service_provider).to eq("Crossref")
     end
 
     it "not found error" do
@@ -215,7 +215,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be false
       expect(subject.id).to eq("https://doi.org/10.7554/elife.01567x")
       expect(subject.doi).to eq("10.7554/elife.01567x")
-      expect(subject.provider).to eq("Crossref")
+      expect(subject.service_provider).to eq("Crossref")
       expect(subject.state).to eq("not_found")
     end
   end

data/spec/readers/datacite_json_reader_spec.rb

@@ -24,7 +24,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_published).to eq("2016-12-20")
       expect(subject.is_part_of).to eq("id"=>"https://doi.org/10.5438/0000-00ss")
       expect(subject.references).to eq([{"id"=>"https://doi.org/10.5438/0012"}, {"id"=>"https://doi.org/10.5438/55e5-t5c0"}])
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
     end
 
     it "SoftwareSourceCode missing_comma" do

data/spec/readers/datacite_reader_spec.rb

@@ -30,7 +30,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.has_part).to eq([{"type"=>"CreativeWork", "id"=>"https://doi.org/10.5061/dryad.8515/1"}, {"type"=>"CreativeWork", "id"=>"https://doi.org/10.5061/dryad.8515/2"}])
       expect(subject.is_referenced_by).to eq("type"=>"CreativeWork", "id"=>"https://doi.org/10.1371/journal.ppat.1000446")
       expect(subject.publisher).to eq("Dryad Digital Repository")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -51,7 +51,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.is_part_of).to eq("type"=>"CreativeWork", "id"=>"https://doi.org/10.5438/0000-00ss")
       expect(subject.references).to eq([{"type"=>"CreativeWork", "id"=>"https://doi.org/10.5438/0012"}, {"type"=>"CreativeWork", "id"=>"https://doi.org/10.5438/55e5-t5c0"}])
       expect(subject.publisher).to eq("DataCite")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -68,7 +68,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.description["text"]).to start_with("We investigate the problem of constructing unextendible product bases in the qubit case")
       expect(subject.date_published).to eq("2013")
       expect(subject.publisher).to eq("Schloss Dagstuhl - Leibniz-Zentrum fuer Informatik GmbH, Wadern/Saarbruecken, Germany")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-2.1")
     end
 
@@ -86,7 +86,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_published).to eq("2016-03-27")
       expect(subject.is_supplement_to).to eq("type"=>"CreativeWork", "id"=>"https://github.com/kjgarza/frame_experiment_analysis/tree/v1.0")
       expect(subject.publisher).to eq("Zenodo")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -106,7 +106,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_published).to eq("2016")
       expect(subject.is_identical_to).to eq("type"=>"CreativeWork", "id"=>"https://doi.org/10.6084/m9.figshare.4234751")
       expect(subject.publisher).to eq("Figshare")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -124,7 +124,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_published).to eq("2013-04-03")
       expect(subject.publisher).to eq("OpenAIRE Orphan Record Repository")
       expect(subject.funding).to eq("type"=>"Award", "identifier"=>"246686", "funder"=>{"type"=>"Organization", "id"=>"https://doi.org/10.13039/501100000780", "name"=>"European Commission"})
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -191,7 +191,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publisher).to eq("University of Bath")
       expect(subject.funding.length).to eq(5)
       expect(subject.funding.first).to eq("type"=>"Award", "name"=>"SUPERGEN Hub Funding", "identifier"=>"EP/J016454/1", "funder" => {"type"=>"Organization", "id"=>"https://doi.org/10.13039/501100000266", "name"=>"Engineering and Physical Sciences Research Council (EPSRC)"})
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -214,7 +214,7 @@ describe Bolognese::Metadata, vcr: true do
                                     "identifier" => "654039",
                                     "name" => "THOR – Technical and Human Infrastructure for Open Research",
                                     "url" => "http://cordis.europa.eu/project/rcn/194927_en.html")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -233,7 +233,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq(2016)
       expect(subject.is_part_of).to eq("type"=>"CreativeWork", "id"=>"https://doi.org/10.5438/0000-00ss")
       expect(subject.references).to eq([{"type"=>"CreativeWork", "id"=>"https://doi.org/10.5438/0012"}, {"type"=>"CreativeWork", "id"=>"https://doi.org/10.5438/55e5-t5c0"}])
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
     end
 
     it "Schema 4.1 from string" do
@@ -252,7 +252,7 @@ describe Bolognese::Metadata, vcr: true do
       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")
+      expect(subject.service_provider).to eq("DataCite")
     end
 
     it "Schema 4.1 from string with doi in options" do
@@ -271,7 +271,7 @@ describe Bolognese::Metadata, vcr: true do
       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")
+      expect(subject.service_provider).to eq("DataCite")
     end
 
     it "empty subject" do
@@ -286,7 +286,7 @@ describe Bolognese::Metadata, vcr: true do
       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.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 
@@ -316,7 +316,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.version).to eq("2")
       expect(subject.date_published).to eq("2015")
       expect(subject.publisher).to eq("Royal Netherlands Meteorological Institute (KNMI)")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
@@ -326,7 +326,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be false
       expect(subject.id).to eq("https://doi.org/10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
       expect(subject.doi).to eq("10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.state).to eq("not_found")
     end
 
@@ -342,7 +342,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_published).to eq("2018-01-12")
       expect(subject.publication_year).to eq(2018)
       expect(subject.publisher).to eq("CaltechDATA")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
       expect(subject.state).to eq("findable")
     end
@@ -359,7 +359,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.title).to eq("Referee report. For: Gates - add article keywords to the metatags [version 2; referees: 1 approved]")
       expect(subject.date_published).to eq("2018")
       expect(subject.publisher).to eq("Gates Open Research")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
     end
 

data/spec/writers/datacite_writer_spec.rb

@@ -108,7 +108,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.license).to eq("id"=>"https://creativecommons.org/publicdomain/zero/1.0", "name"=>"CC-0")
       expect(subject.date_published).to eq("2017")
       expect(subject.publisher).to eq("Figshare")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
       expect(subject.datacite).to end_with("</resource>")
     end
@@ -127,7 +127,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.license).to eq("id"=>"https://creativecommons.org/publicdomain/zero/1.0", "name"=>"CC-0")
       expect(subject.date_published).to eq("2017")
       expect(subject.publisher).to eq("Figshare")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
       expect(subject.datacite).to end_with("</resource>")
     end
@@ -150,7 +150,7 @@ describe Bolognese::Metadata, vcr: true do
                                       {"type"=>"CreativeWork", "id"=>"https://doi.org/10.5061/dryad.8515/2"}])
       expect(subject.is_referenced_by).to eq("type"=>"CreativeWork", "id"=>"https://doi.org/10.1371/journal.ppat.1000446")
       expect(subject.publisher).to eq("Dryad Digital Repository")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
 
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
@@ -173,7 +173,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be false
       expect(subject.id).to eq("https://doi.org/10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
       expect(subject.doi).to eq("10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
-      expect(subject.provider).to eq("DataCite")
+      expect(subject.service_provider).to eq("DataCite")
       expect(subject.state).to eq("not_found")
       expect(subject.datacite).to be_nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.87
+  version: 0.9.88
 platform: ruby
 authors:
 - Martin Fenner