bolognese 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44ef0d823038f4256509d1215ce8fae2ca6d62f4
-  data.tar.gz: a4a9ad1a9530c9e4e96566c6e1c349205d2dd7e0
+  metadata.gz: 347331c05f3f9fcf8370202734e301b5147ab529
+  data.tar.gz: 9cdde1c401c80afc37c5caef0c21b7b43ccce10b
 SHA512:
-  metadata.gz: 347c241f0201e837225394d7bec559fa0675696edd725df6a635f5ddf4b6975fe5194fa2fc25c7ba97069272e4440e1660ea0d2a2eb0dbf312a4d3370a49d970
-  data.tar.gz: a7906e3128cc090e14017716a3534c444ff18a9f209083f9e1d64a833f27fb7d01720fe07a2895c87af65bb1656b94716fe6e55dbd596f5056d5c8027653aed4
+  metadata.gz: dc95897ac4cb7c133a523e0ccf96c1be564a1e3ebe8c17349579d389953947a580329db91222720af96851fb392c2b3406c0825630a29c744b1363d4ff72fff6
+  data.tar.gz: 487ad70193f3e026691f57ce73a5a99ba1ee023235be1ef1a65698ae0bdba3c0d99c43265f1dbaf64c42374828b247d508379683023d13853999d92c03214bf9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.8.1)
+    bolognese (0.8.2)
       activesupport (~> 4.2, >= 4.2.5)
       bibtex-ruby (~> 4.1)
       builder (~> 3.2, >= 3.2.2)
@@ -64,7 +64,7 @@ GEM
     namae (0.10.2)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    oj (2.18.1)
+    oj (2.18.2)
     postrank-uri (1.0.18)
       addressable (~> 2.3.0)
       nokogiri (~> 1.6.1)

data/lib/bolognese/codemeta.rb

@@ -103,7 +103,7 @@ module Bolognese
     end
 
     def related_identifiers(relation_type)
-      normalize_ids(metadata.fetch(relation_type, nil))
+      normalize_ids(ids: metadata.fetch(relation_type, nil), relation_type: relation_type)
     end
 
     def same_as

data/lib/bolognese/crossref.rb

@@ -157,7 +157,7 @@ module Bolognese
     def license
       access_indicator = Array.wrap(program_metadata).find { |m| m["name"] == "AccessIndicators" }
       if access_indicator.present?
-        parse_attributes(access_indicator["license_ref"])
+        { "url" => parse_attributes(access_indicator["license_ref"]) }
       else
         nil
       end

data/lib/bolognese/datacite_utils.rb

@@ -1,27 +1,5 @@
 module Bolognese
   module DataciteUtils
-
-    SO_TO_DC_TRANSLATIONS = {
-      "Article" => "Text",
-      "AudioObject" => "Sound",
-      "Blog" => "Text",
-      "BlogPosting" => "Text",
-      "Collection" => "Collection",
-      "CreativeWork" => "Other",
-      "DataCatalog" => "Dataset",
-      "Dataset" => "Dataset",
-      "Event" => "Event",
-      "ImageObject" => "Image",
-      "Movie" => "Audiovisual",
-      "PublicationIssue" => "Text",
-      "ScholarlyArticle" => "Text",
-      "Service" => "Service",
-      "SoftwareSourceCode" => "Software",
-      "VideoObject" => "Audiovisual",
-      "WebPage" => "Text",
-      "WebSite" => "Text"
-    }
-
     SCHEMA = File.expand_path("../../../resources/kernel-4.0/metadata.xsd", __FILE__)
 
     def schema
@@ -116,7 +94,7 @@ module Bolognese
     end
 
     def resource_type
-      { "resource_type_general" => SO_TO_DC_TRANSLATIONS[type] || "Other",
+      { "resource_type_general" => Metadata::SO_TO_DC_TRANSLATIONS[type] || "Other",
         "__content__" => additional_type || type }
     end
 
@@ -186,7 +164,8 @@ module Bolognese
       Array.wrap(related_identifier).map do |r|
         { "__content__" => r["id"],
           "related_identifier_type" => validate_url(r["id"]),
-          "relation_type" => r["relationType"] }
+          "relation_type" => r["relationType"],
+          "resource_type_general" => r["resourceTypeGeneral"] }
       end
     end
 
@@ -195,7 +174,11 @@ module Bolognese
 
       xml.relatedIdentifiers do
         rel_identifier.each do |related_identifier|
-          xml.relatedIdentifier(related_identifier["__content__"], 'relatedIdentifierType' => related_identifier["related_identifier_type"], 'relationType' => related_identifier["relation_type"])
+          attributes = {
+            'relatedIdentifierType' => related_identifier["related_identifier_type"],
+            'relationType' => related_identifier["relation_type"],
+            'resourceTypeGeneral' => related_identifier["resource_type_general"] }.compact
+          xml.relatedIdentifier(related_identifier["__content__"], attributes)
         end
       end
     end

data/lib/bolognese/metadata.rb

@@ -29,6 +29,27 @@ module Bolognese
       "Other" => "CreativeWork"
     }
 
+    SO_TO_DC_TRANSLATIONS = {
+      "Article" => "Text",
+      "AudioObject" => "Sound",
+      "Blog" => "Text",
+      "BlogPosting" => "Text",
+      "Collection" => "Collection",
+      "CreativeWork" => "Other",
+      "DataCatalog" => "Dataset",
+      "Dataset" => "Dataset",
+      "Event" => "Event",
+      "ImageObject" => "Image",
+      "Movie" => "Audiovisual",
+      "PublicationIssue" => "Text",
+      "ScholarlyArticle" => "Text",
+      "Service" => "Service",
+      "SoftwareSourceCode" => "Software",
+      "VideoObject" => "Audiovisual",
+      "WebPage" => "Text",
+      "WebSite" => "Text"
+    }
+
     attr_reader :id, :raw, :provider, :schema_version, :license, :citation,
       :additional_type, :alternate_name, :url, :version, :keywords, :editor,
       :page_start, :page_end, :date_modified, :language, :spatial_coverage,
@@ -88,7 +109,7 @@ module Bolognese
         "hasPart" => has_part,
         "predecessor_of" => is_previous_version_of,
         "successor_of" => is_new_version_of,
-        "citation" => references,
+        "citation" => Array.wrap(references).map { |r| r.except("relationType").merge("@type" => "CreativeWork") }.unwrap,
         "@reverse" => reverse,
         "schemaVersion" => schema_version,
         "publisher" => { "@type" => "Organization", "name" => publisher },

data/lib/bolognese/schema_org.rb

@@ -119,11 +119,13 @@ module Bolognese
     end
 
     def get_related_identifier(relation_type: nil)
-      normalize_ids(metadata.fetch(relation_type, nil), SO_TO_DC_RELATION_TYPES[relation_type])
+      normalize_ids(ids: metadata.fetch(relation_type, nil),
+                    relation_type: SO_TO_DC_RELATION_TYPES[relation_type])
     end
 
     def get_reverse_related_identifier(relation_type: nil)
-      normalize_ids(metadata.dig("@reverse", relation_type), SO_TO_DC_RELATION_TYPES[relation_type])
+      normalize_ids(ids: metadata.dig("@reverse", relation_type),
+                    relation_type: SO_TO_DC_RELATION_TYPES[relation_type])
     end
 
     def is_identical_to

data/lib/bolognese/utils.rb

@@ -114,12 +114,13 @@ module Bolognese
       "http://orcid.org/" + Addressable::URI.encode(orcid)
     end
 
-    def normalize_ids(list, relation_type = "References")
-      Array.wrap(list).map do |url|
-        { "id" => normalize_id(url["@id"]),
-          "type" => url["@type"],
-          "name" => url["name"],
-          "relationType" => relation_type }.compact
+    def normalize_ids(ids: nil, relation_type: "References")
+      Array.wrap(ids).map do |id|
+        { "id" => normalize_id(id["@id"]),
+          "type" => id["@type"],
+          "name" => id["name"],
+          "relationType" => relation_type,
+          "resourceTypeGeneral" => id["resourceTypeGeneral"] || Metadata::SO_TO_DC_TRANSLATIONS[id["@type"]] }.compact
       end.unwrap
     end
 

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/spec/crossref_spec.rb

@@ -14,7 +14,7 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.resource_type_general).to eq("Text")
       expect(subject.author.length).to eq(5)
       expect(subject.author.first).to eq("type"=>"Person", "name"=>"Martial Sankar", "givenName"=>"Martial", "familyName"=>"Sankar")
-      expect(subject.license).to eq("http://creativecommons.org/licenses/by/3.0/")
+      expect(subject.license).to eq("url"=>"http://creativecommons.org/licenses/by/3.0/")
       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")
@@ -43,7 +43,7 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.author.first).to eq("type"=>"Person", "name"=>"Markus Ralser", "givenName"=>"Markus", "familyName"=>"Ralser")
       expect(subject.editor).to eq("type"=>"Person", "name"=>"Guilhem Janbon", "givenName"=>"Guilhem", "familyName"=>"Janbon")
       expect(subject.title).to eq("Triose Phosphate Isomerase Deficiency Is Caused by Altered Dimerization–Not Catalytic Inactivity–of the Mutant Enzymes")
-      expect(subject.license).to eq("http://creativecommons.org/licenses/by/4.0/")
+      expect(subject.license).to eq("url"=>"http://creativecommons.org/licenses/by/4.0/")
       expect(subject.date_published).to eq("2006-12-20")
       expect(subject.date_modified).to eq("2016-12-31T21:37:08Z")
       expect(subject.page_start).to eq("e30")
@@ -79,7 +79,7 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.additional_type).to eq("JournalArticle")
       expect(subject.resource_type_general).to eq("Text")
       expect(subject.author).to eq([{"type"=>"Person", "name"=>"A. Fenton", "givenName"=>"A.", "familyName"=>"Fenton"}, {"type"=>"Person", "name"=>"S. A. Rands", "givenName"=>"S. A.", "familyName"=>"Rands"}])
-      expect(subject.license).to eq("http://doi.wiley.com/10.1002/tdm_license_1")
+      expect(subject.license).to eq("url"=>"http://doi.wiley.com/10.1002/tdm_license_1")
       expect(subject.title).to eq("THE IMPACT OF PARASITE MANIPULATION AND PREDATOR FORAGING BEHAVIOR ON PREDATOR–PREY COMMUNITIES")
       expect(subject.date_published).to eq("2006-11")
       expect(subject.date_modified).to eq("2016-10-04T17:20:17Z")
@@ -99,7 +99,7 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.resource_type_general).to eq("Text")
       expect(subject.author.length).to eq(7)
       expect(subject.author[2]).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-2043-4925", "name"=>"Beatriz Hernandez", "givenName"=>"Beatriz", "familyName"=>"Hernandez")
-      expect(subject.license).to eq("http://creativecommons.org/licenses/by/3.0/")
+      expect(subject.license).to eq("url"=>"http://creativecommons.org/licenses/by/3.0/")
       expect(subject.title).to eq("Delineating a Retesting Zone Using Receiver Operating Characteristic Analysis on Serial QuantiFERON Tuberculosis Test Results in US Healthcare Workers")
       expect(subject.date_published).to eq("2012")
       expect(subject.date_modified).to eq("2016-08-02T12:42:41Z")
@@ -152,7 +152,7 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.resource_type_general).to eq("Text")
       expect(subject.author.length).to eq(5)
       expect(subject.author.last).to eq("type"=>"Person", "name"=>"Christian S Hardtke", "givenName"=>"Christian S", "familyName"=>"Hardtke")
-      expect(subject.license).to eq("http://creativecommons.org/licenses/by/3.0/")
+      expect(subject.license).to eq("url"=>"http://creativecommons.org/licenses/by/3.0/")
       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")
@@ -169,6 +169,8 @@ describe Bolognese::Crossref, 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").count).to eq(27)
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").first).to eq("relatedIdentifierType"=>"DOI", "relationType"=>"Cites", "__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"})
     end

data/spec/schema_org_spec.rb

@@ -18,8 +18,15 @@ describe Bolognese::SchemaOrg, 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", "relationType"=>"IsPartOf")
-      expect(subject.references).to eq([{"id"=>"https://doi.org/10.5438/0012", "type"=>"CreativeWork", "relationType"=>"References"}, {"id"=>"https://doi.org/10.5438/55e5-t5c0", "type"=>"CreativeWork", "relationType"=>"References"}])
+      expect(subject.is_part_of).to eq("id"=>"https://doi.org/10.5438/0000-00ss", "type"=>"Blog", "name"=>"DataCite Blog", "relationType"=>"IsPartOf", "resourceTypeGeneral" => "Text")
+      expect(subject.references).to eq([{"id"=>"https://doi.org/10.5438/0012",
+                                         "type"=>"CreativeWork",
+                                         "relationType"=>"References",
+                                         "resourceTypeGeneral"=>"Other"},
+                                        {"id"=>"https://doi.org/10.5438/55e5-t5c0",
+                                         "type"=>"CreativeWork",
+                                         "relationType"=>"References",
+                                         "resourceTypeGeneral"=>"Other"}])
       expect(subject.publisher).to eq("DataCite")
     end
 
@@ -51,13 +58,15 @@ describe Bolognese::SchemaOrg, 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", "relationType"=>"IsPartOf")
+      expect(subject.is_part_of).to eq("id"=>"https://doi.org/10.5438/0000-00ss", "type"=>"Blog", "name"=>"DataCite Blog", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
       expect(subject.references).to eq([{"id"=>"https://doi.org/10.5438/0012",
                                          "type"=>"CreativeWork",
-                                         "relationType"=>"References"},
+                                         "relationType"=>"References",
+                                         "resourceTypeGeneral"=>"Other"},
                                         {"id"=>"https://doi.org/10.5438/55e5-t5c0",
-                                         "type"=>"CreativeWork",
-                                         "relationType"=>"References"}])
+                                          "type"=>"CreativeWork",
+                                          "relationType"=>"References",
+                                          "resourceTypeGeneral"=>"Other"}])
       expect(subject.publisher).to eq("DataCite")
     end
   end
@@ -67,7 +76,7 @@ describe Bolognese::SchemaOrg, 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", "resourceTypeGeneral"=>"Text", "__content__"=>"https://doi.org/10.5438/0000-00ss")
     end
   end
 

data/spec/utils_spec.rb

@@ -68,14 +68,14 @@ describe Bolognese::Crossref, vcr: true do
   context "normalize ids" do
     it "doi" do
       ids = [{"@type"=>"CreativeWork", "@id"=>"https://doi.org/10.5438/0012"}, {"@type"=>"CreativeWork", "@id"=>"https://doi.org/10.5438/55E5-T5C0"}]
-      response = subject.normalize_ids(ids)
-      expect(response).to eq([{"id"=>"https://doi.org/10.5438/0012", "type"=>"CreativeWork", "relationType"=>"References"}, {"id"=>"https://doi.org/10.5438/55e5-t5c0", "type"=>"CreativeWork", "relationType"=>"References"}])
+      response = subject.normalize_ids(ids: ids)
+      expect(response).to eq([{"id"=>"https://doi.org/10.5438/0012", "type"=>"CreativeWork", "relationType"=>"References", "resourceTypeGeneral" => "Other"}, {"id"=>"https://doi.org/10.5438/55e5-t5c0", "type"=>"CreativeWork", "relationType"=>"References", "resourceTypeGeneral" => "Other"}])
     end
 
     it "url" do
       ids = [{"@type"=>"CreativeWork", "@id"=>"https://blog.datacite.org/eating-your-own-dog-food/"}]
-      response = subject.normalize_ids(ids)
-      expect(response).to eq("id"=>"https://blog.datacite.org/eating-your-own-dog-food", "type"=>"CreativeWork", "relationType"=>"References")
+      response = subject.normalize_ids(ids: ids)
+      expect(response).to eq("id"=>"https://blog.datacite.org/eating-your-own-dog-food", "resourceTypeGeneral" => "Other", "type"=>"CreativeWork", "relationType"=>"References")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma