bolognese 0.9.11 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0276dc8cca601488c3abcf88faf4375b19ca9697
-  data.tar.gz: 770cd88d5571911799e99bb52426784a552cacc6
+  metadata.gz: aaee569568f76b04f3c5707cb20c7c3b91b5c42b
+  data.tar.gz: d267f2d4b97689676b9986b698ea47b628ad07d2
 SHA512:
-  metadata.gz: 071c0ea2fac32b1094792db83c30015a36bb93bd676478892733d14c696577f3aa77f29afc9aaaefca1ed721014dcbe5aa76091fa2b5d922de097846b50a6ef8
-  data.tar.gz: 3897826b1cdcc2a106393224793ce9220cb1317bfc5cc637b7b1324be94c8ca9d888c62b2d282d195d0161e3ab437c2cafd933c01c2a3743f7de93ac4bebede6
+  metadata.gz: f9a881f202c52634a6e3e0d8d5fc033b337a507fe6755104e6602631407772add424670d12fde54e406e15941a4a9fb3cc63640f0bce16f180fba6b28501ff31
+  data.tar.gz: 9b91e62983d77e603a29cd9d458fbc95adddcaa18f27792397b1eca213daea240beab70511aed08a3d8258d2c8ed2a30536d9103963ebb1e8bd98e0b911c2680

data/Gemfile.lock

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

data/lib/bolognese/datacite_utils.rb

@@ -167,7 +167,8 @@ module Bolognese
         { "__content__" => r["id"] || r["issn"],
           "related_identifier_type" => r["issn"].present? ? "ISSN" : validate_url(r["id"]),
           "relation_type" => r["relationType"],
-          "resource_type_general" => r["resourceTypeGeneral"] }.compact
+          "resource_type_general" => r["resourceTypeGeneral"] || "Other",
+          "title" => r["title"] }.compact
       end
     end
 
@@ -179,7 +180,8 @@ module Bolognese
           attributes = {
             'relatedIdentifierType' => related_identifier["related_identifier_type"],
             'relationType' => related_identifier["relation_type"],
-            'resourceTypeGeneral' => related_identifier["resource_type_general"] }.compact
+            'resourceTypeGeneral' => related_identifier["resource_type_general"],
+            'title' => related_identifier["title"] }.compact
           xml.relatedIdentifier(related_identifier["__content__"], attributes)
         end
       end

data/lib/bolognese/metadata.rb

@@ -320,7 +320,7 @@ module Bolognese
     end
 
     def container_title
-      is_part_of.to_h.fetch("name", nil)
+      is_part_of.to_h.fetch("title", nil)
     end
 
     def descriptions

data/lib/bolognese/readers/bibtex_reader.rb

@@ -37,7 +37,7 @@ module Bolognese
 
         is_part_of = if meta.journal.present?
                   { "type" => "Periodical",
-                    "name" => meta.journal.to_s,
+                    "title" => meta.journal.to_s,
                     "issn" => meta.issn.to_s.presence }.compact
                 else
                   nil

data/lib/bolognese/readers/citeproc_reader.rb

@@ -38,7 +38,7 @@ module Bolognese
         container_title = meta.fetch("container-title", nil)
         is_part_of = if container_title.present?
                        { "type" => "Periodical",
-                         "name" => container_title,
+                         "title" => container_title,
                          "issn" => meta.fetch("ISSN", nil) }.compact
                      else
                        nil

data/lib/bolognese/readers/crossref_reader.rb

@@ -190,7 +190,7 @@ module Bolognese
       def crossref_is_part_of(journal_metadata)
         if journal_metadata.present?
           { "type" => "Periodical",
-            "name" => journal_metadata["full_title"],
+            "title" => journal_metadata["full_title"],
             "issn" => parse_attributes(journal_metadata.fetch("issn", nil)) }.compact
         else
           nil
@@ -201,7 +201,8 @@ module Bolognese
          refs = bibliographic_metadata.dig("citation_list", "citation")
          Array.wrap(refs).select { |a| a["doi"].present? }.map do |c|
            { "id" => normalize_id(c["doi"]),
-             "type" => "CreativeWork" }.compact
+             "type" => "CreativeWork",
+             "title" => c["article_title"] }.compact
          end.unwrap
       end
     end

data/lib/bolognese/readers/ris_reader.rb

@@ -41,7 +41,7 @@ module Bolognese
         container_title = meta.fetch("T2", nil)
         is_part_of = if container_title.present?
                        { "type" => "Periodical",
-                         "name" => container_title,
+                         "title" => container_title,
                          "issn" => meta.fetch("SN", nil) }.compact
                      else
                        nil

data/lib/bolognese/readers/schema_org_reader.rb

@@ -21,12 +21,11 @@ module Bolognese
         resource_type_general = Bolognese::Utils::SO_TO_DC_TRANSLATIONS[type]
         author = get_authors(from_schema_org(Array.wrap(meta.fetch("author", nil))))
         editor = get_authors(from_schema_org(Array.wrap(meta.fetch("editor", nil))))
-        publisher = meta.dig("publisher", "name")
-        container_title = if publisher.is_a?(Hash)
-                            publisher.fetch("name", nil)
-                          elsif publisher.is_a?(String)
-                            publisher
-                          end
+        publisher = if meta.dig("publisher").is_a?(Hash)
+                      meta.dig("publisher", "name")
+                    elsif publisher.is_a?(String)
+                      meta.dig("publisher")
+                    end
         date_published = meta.fetch("datePublished", nil)
 
         { "id" => id,
@@ -41,7 +40,6 @@ module Bolognese
           "title" => meta.fetch("name", nil),
           "alternate_name" => meta.fetch("alternateName", nil),
           "author" => author,
-          "container_title" => container_title,
           "publisher" => meta.dig("publisher", "name"),
           "provider" => meta.fetch("provider", nil),
           "is_identical_to" => schema_org_is_identical_to(meta),

data/lib/bolognese/utils.rb

@@ -321,7 +321,7 @@ module Bolognese
       Array.wrap(ids).map do |id|
         { "id" => normalize_id(id["@id"]),
           "type" => id["@type"] || Metadata::DC_TO_SO_TRANSLATIONS[id["resourceTypeGeneral"]] || "CreativeWork",
-          "name" => id["name"] }.compact
+          "title" => id["title"] || id["name"] }.compact
       end.unwrap
     end
 

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.11"
+  VERSION = "0.9.13"
 end

data/lib/bolognese/writers/schema_org_writer.rb

@@ -24,7 +24,7 @@ module Bolognese
           "pagination" => pagination,
           "spatialCoverage" => spatial_coverage,
           "sameAs" => same_as,
-          "isPartOf" => is_part_of,
+          "isPartOf" => is_part_of.present? ? is_part_of.merge("name" => is_part_of["title"]) : nil,
           "hasPart" => has_part,
           "predecessor_of" => is_previous_version_of,
           "successor_of" => is_new_version_of,

data/spec/datacite_utils_spec.rb

@@ -123,12 +123,15 @@ describe Bolognese::Metadata, vcr: true do
       response = Maremma.from_xml(xml)
       expect(response.dig("relatedIdentifiers", "relatedIdentifier")).to eq([{"relatedIdentifierType"=>"DOI",
                                                                               "relationType"=>"HasPart",
+                                                                              "resourceTypeGeneral"=>"Other",
                                                                               "__content__"=>"https://doi.org/10.5061/dryad.8515/1"},
                                                                              {"relatedIdentifierType"=>"DOI",
                                                                               "relationType"=>"HasPart",
+                                                                              "resourceTypeGeneral"=>"Other",
                                                                               "__content__"=>"https://doi.org/10.5061/dryad.8515/2"},
                                                                              {"relatedIdentifierType"=>"DOI",
                                                                               "relationType"=>"IsReferencedBy",
+                                                                              "resourceTypeGeneral"=>"Other",
                                                                               "__content__"=>"https://doi.org/10.1371/journal.ppat.1000446"}])
     end
   end

data/spec/readers/bibtex_reader_spec.rb

@@ -24,7 +24,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.description["text"]).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
       expect(subject.license["id"]).to eq("http://creativecommons.org/licenses/by/3.0/")
       expect(subject.date_published).to eq("2014")
-      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"eLife", "issn"=>"2050-084X")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"eLife", "issn"=>"2050-084X")
     end
   end
 end

data/spec/readers/citeproc_reader_spec.rb

@@ -22,7 +22,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.title).to eq("Eating your own Dog Food")
       expect(subject.description["text"]).to start_with("Eating your own dog food")
       expect(subject.date_published).to eq("2016-12-20")
-      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"DataCite Blog")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"DataCite Blog")
     end
   end
 end

data/spec/readers/crossref_reader_spec.rb

@@ -26,7 +26,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.title).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
       expect(subject.date_published).to eq("2014-02-11")
       expect(subject.date_modified).to eq("2015-08-11T05:35:02Z")
-      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"eLife", "issn"=>"2050-084X")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"eLife", "issn"=>"2050-084X")
       expect(subject.references.count).to eq(25)
       expect(subject.references[19]).to eq("id"=>"https://doi.org/10.5061/dryad.b835k", "type"=>"CreativeWork")
       expect(subject.funder).to eq([{"name"=>"SystemsX"},
@@ -55,7 +55,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_published).to eq("2006-12-20")
       expect(subject.date_modified).to eq("2016-12-31T21:37:08Z")
       expect(subject.pagination).to eq("e30")
-      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"PLoS ONE", "issn"=>"1932-6203")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"PLoS ONE", "issn"=>"1932-6203")
       expect(subject.provider).to eq("Crossref")
     end
 
@@ -92,7 +92,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_published).to eq("2006-11")
       expect(subject.date_modified).to eq("2017-04-01T00:47:57Z")
       expect(subject.pagination).to eq("2832-2841")
-      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"Ecology", "issn"=>"0012-9658")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"Ecology", "issn"=>"0012-9658")
       expect(subject.provider).to eq("Crossref")
     end
 
@@ -111,7 +111,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.date_published).to eq("2012")
       expect(subject.date_modified).to eq("2016-08-02T12:42:41Z")
       expect(subject.pagination).to eq("1-7")
-      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"Pulmonary Medicine", "issn"=>["2090-1836", "2090-1844"])
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"Pulmonary Medicine", "issn"=>["2090-1836", "2090-1844"])
       expect(subject.provider).to eq("Crossref")
     end
 
@@ -128,7 +128,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.title).to eq("Paving the path to HIV neurotherapy: Predicting SIV CNS disease")
       expect(subject.date_published).to eq("2015-07")
       expect(subject.date_modified).to eq("2016-08-20T02:19:38Z")
-      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"European Journal of Pharmacology", "issn"=>"00142999")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"European Journal of Pharmacology", "issn"=>"00142999")
       expect(subject.provider).to eq("Crossref")
     end
 

data/spec/readers/ris_reader_spec.rb

@@ -26,7 +26,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.title).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
       expect(subject.description["text"]).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
       expect(subject.date_published).to eq("2014")
-      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"eLife")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "title"=>"eLife")
     end
   end
 end

data/spec/readers/schema_org_reader_spec.rb

@@ -27,7 +27,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.keywords).to eq("datacite, doi, metadata, featured")
       expect(subject.date_published).to eq("2016-12-20")
       expect(subject.date_modified).to eq("2016-12-20")
-      expect(subject.is_part_of).to eq("id"=>"https://doi.org/10.5438/0000-00ss", "type"=>"Blog", "name"=>"DataCite Blog")
+      expect(subject.is_part_of).to eq("id"=>"https://doi.org/10.5438/0000-00ss", "type"=>"Blog", "title"=>"DataCite Blog")
       expect(subject.references).to eq([{"id"=>"https://doi.org/10.5438/0012", "type"=>"CreativeWork"}, {"id"=>"https://doi.org/10.5438/55e5-t5c0", "type"=>"CreativeWork"}])
       expect(subject.publisher).to eq("DataCite")
     end
@@ -55,7 +55,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.keywords).to eq("datacite, doi, metadata, featured")
       expect(subject.date_published).to eq("2016-12-20")
       expect(subject.date_modified).to eq("2016-12-20")
-      expect(subject.is_part_of).to eq("id"=>"https://doi.org/10.5438/0000-00ss", "type"=>"Blog", "name"=>"DataCite Blog")
+      expect(subject.is_part_of).to eq("id"=>"https://doi.org/10.5438/0000-00ss", "type"=>"Blog", "title"=>"DataCite Blog")
       expect(subject.references).to eq([{"id"=>"https://doi.org/10.5438/0012", "type"=>"CreativeWork"}, {"id"=>"https://doi.org/10.5438/55e5-t5c0", "type"=>"CreativeWork"}])
       expect(subject.publisher).to eq("DataCite")
     end

data/spec/writers/datacite_writer_spec.rb

@@ -9,8 +9,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.dig("resourceType", "resourceTypeGeneral")).to eq("Text")
       expect(datacite.dig("titles", "title")).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").length).to eq(26)
-      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "__content__"=>"2050-084X")
-      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier")[1]).to eq("relatedIdentifierType"=>"DOI", "relationType"=>"References", "__content__"=>"https://doi.org/10.1038/nature02100")
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "resourceTypeGeneral" => "Other", "title"=>"eLife", "__content__"=>"2050-084X")
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier")[1]).to eq("relatedIdentifierType"=>"DOI", "relationType"=>"References", "resourceTypeGeneral" => "Other", "__content__"=>"https://doi.org/10.1038/nature02100")
       expect(datacite.dig("rightsList")).to eq("rights"=>{"rightsURI"=>"http://creativecommons.org/licenses/by/3.0"})
       expect(datacite.dig("fundingReferences", "fundingReference").count).to eq(4)
       expect(datacite.dig("fundingReferences", "fundingReference").last).to eq("funderName"=>"University of Lausanne", "funderIdentifier"=>{"funderIdentifierType"=>"Crossref Funder ID", "__content__"=>"https://doi.org/10.13039/501100006390"})
@@ -119,7 +119,7 @@ describe Bolognese::Metadata, vcr: true do
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("titles", "title")).to eq("Eating your own Dog Food")
       expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").count).to eq(3)
-      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "__content__"=>"https://doi.org/10.5438/0000-00ss")
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "title" => "DataCite Blog", "resourceTypeGeneral" => "Other", "__content__"=>"https://doi.org/10.5438/0000-00ss")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.13
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-06 00:00:00.000000000 Z
+date: 2017-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma