bolognese 0.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f81c7d2d95a4c66adb94672309f22ffdae3f7c
-  data.tar.gz: 8c00d86fb7ee25359bbe568638674140d99a6d1d
+  metadata.gz: deb650206d9feee61ce70231a6e0d847dd7cb624
+  data.tar.gz: 129088964177fa28dd209875529bf3d502163bac
 SHA512:
-  metadata.gz: a64a2cc22e1be39d8e94aa94ef2cbc2ba35300d322c74043153a81c81589f99a6e0fe49922fa1dd493ba6bd9aeb7eee9e72f7edfc141bee13367b1359589035c
-  data.tar.gz: af27b299a2b95bf3250bc7dce7941898f69f17eb7c85dad303057926ec0e94245de4ee1f5b7c3b8ea902d388dcee706098b992ef94462feeb02bab7cf49aa16f
+  metadata.gz: 28d10eae1a9a8adc8c4e53f191d2f1cf8218327e6e144103d73cf9d4e38f2dff371d2f8a40ae6db9b40437ecc873fcce5054df05b155d297457dae2d2c4fe236
+  data.tar.gz: 6eb9ce2ba440d28822a4df0dccf9ade48d4bdee95d43dd034f1b2134e3ad8289b8998a49dd2a29189648e649e6d87894263e7a36377e256159a04811781a8db9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.5)
+    bolognese (0.5.1)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       dotenv (~> 2.1, >= 2.1.1)

data/lib/bolognese/author_utils.rb

@@ -12,7 +12,7 @@ module Bolognese
       author = cleanup_author(author)
       names = Namae.parse(author)
 
-      if names.blank? || is_personal_name?(author).blank?
+      if names.blank? || !is_personal_name?(author)
         { "@type" => "Agent",
           "@id" => orcid,
           "Name" => author }.compact
@@ -48,17 +48,15 @@ module Bolognese
       Array(authors).map { |author| get_one_author(author) }
     end
 
-    # pase nameIdentifier from DataCite
+    # parse nameIdentifier from DataCite
     def get_name_identifier(author)
       name_identifier = author.dig("nameIdentifier", "text")
       name_identifier = validate_orcid(name_identifier)
-
       name_identifier_scheme = author.dig("nameIdentifier", "nameIdentifierScheme") || "ORCID"
-      if name_identifier.present? && name_identifier_scheme.downcase == "orcid"
-        "http://orcid.org/#{name_identifier}"
-      else
-        nil
-      end
+
+      return nil if name_identifier.blank? || name_identifier_scheme.upcase != "ORCID"
+
+      "http://orcid.org/" + name_identifier
     end
   end
 end

data/lib/bolognese/crossref.rb

@@ -4,10 +4,10 @@ module Bolognese
     # CrossRef types from https://api.crossref.org/types
     CR_TO_SO_TRANSLATIONS = {
       "Proceedings" => nil,
-      "ReferenceBook" => nil,
-      "JournalIssue" => nil,
+      "ReferenceBook" => "Book",
+      "JournalIssue" => "PublicationIssue",
       "ProceedingsArticle" => nil,
-      "Other" => nil,
+      "Other" => "CreativeWork",
       "Dissertation" => "Thesis",
       "Dataset" => "Dataset",
       "EditedBook" => "Book",
@@ -24,11 +24,11 @@ module Bolognese
       "BookChapter" => "Chapter",
       "StandardSeries" => nil,
       "Monograph" => "Book",
-      "Component" => nil,
+      "Component" => "CreativeWork",
       "ReferenceEntry" => nil,
-      "JournalVolume" => nil,
+      "JournalVolume" => "PublicationVolume",
       "BookSet" => nil,
-      "PostedContent" => nil
+      "PostedContent" => "ScholarlyArticle"
     }
 
     def initialize(id: nil, string: nil)
@@ -80,6 +80,14 @@ module Bolognese
       bibliographic_metadata.dig("crossmark", "custom_metadata", "program") || {}
     end
 
+    def resource_type_general
+      SO_TO_DC_TRANSLATIONS[type]
+    end
+
+    def type
+      CR_TO_SO_TRANSLATIONS[additional_type] || "ScholarlyArticle"
+    end
+
     def additional_type
       if metadata.dig("crossref", "journal").present?
         metadata.dig("crossref", "journal").keys.last.camelize
@@ -88,10 +96,6 @@ module Bolognese
       end
     end
 
-    def type
-      CR_TO_SO_TRANSLATIONS[additional_type] || "CreativeWork"
-    end
-
     def name
       parse_attribute(bibliographic_metadata.dig("titles", "title"))
     end

data/lib/bolognese/datacite.rb

@@ -48,9 +48,12 @@ module Bolognese
       normalize_doi(doi)
     end
 
+    def resource_type_general
+      metadata.dig("resourceType", "resourceTypeGeneral")
+    end
+
     def type
-      k = metadata.dig("resourceType", "resourceTypeGeneral")
-      DC_TO_SO_TRANSLATIONS[k.to_s.dasherize] || "CreativeWork"
+      DC_TO_SO_TRANSLATIONS[resource_type_general.to_s.dasherize] || "CreativeWork"
     end
 
     def additional_type
@@ -103,6 +106,8 @@ module Bolognese
       Array.wrap(metadata.dig("dates", "date"))
     end
 
+    #Accepted Available Copyrighted Collected Created Issued Submitted Updated Valid
+
     def date(date_type)
       dd = dates.find { |d| d["dateType"] == date_type } || {}
       dd.fetch("text", nil)
@@ -120,6 +125,14 @@ module Bolognese
       date("Updated")
     end
 
+    def language
+      metadata.fetch("language", nil)
+    end
+
+    def spatial_coverage
+
+    end
+
     def related_identifiers(relation_type)
       Array(metadata.dig("relatedIdentifiers", "relatedIdentifier"))
         .select { |r| relation_type.split(" ").include?(r["relationType"]) && %w(DOI URL).include?(r["relatedIdentifierType"]) }

data/lib/bolognese/datacite_utils.rb

@@ -28,7 +28,7 @@ module Bolognese
       "http://creativecommons.org/licenses/by/4.0/" => "Creative Commons Attribution 4.0 (CC-BY 4.0)",
       "http://creativecommons.org/licenses/by-nc/4.0/" => "Creative Commons Attribution Noncommercial 4.0 (CC-BY-NC 4.0)",
       "http://creativecommons.org/licenses/by-sa/4.0/" => "Creative Commons Attribution Share Alike 4.0 (CC-BY-SA 4.0)",
-      "http://creativecommons.org/licenses/by-nc-nd/4.0/" => "Creative Commons Attribution Noncommercial No Derivaties 4.0 (CC-BY-NC-ND 4.0)"
+      "http://creativecommons.org/licenses/by-nc-nd/4.0/" => "Creative Commons Attribution Noncommercial No Derivatives 4.0 (CC-BY-NC-ND 4.0)"
     }
 
     SCHEMA = File.expand_path("../../../resources/kernel-4.0/metadata.xsd", __FILE__)
@@ -230,4 +230,3 @@ module Bolognese
     end
   end
 end
-

data/lib/bolognese/metadata.rb

@@ -48,6 +48,18 @@ module Bolognese
 
     end
 
+    def contributor
+
+    end
+
+    def language
+
+    end
+
+    def spatial_coverage
+
+    end
+
     def as_schema_org
       { "@context" => "http://schema.org",
         "@type" => type,
@@ -62,11 +74,13 @@ module Bolognese
         "license" => license,
         "version" => version,
         "keywords" => keywords,
+        "language" => language,
         "dateCreated" => date_created,
         "datePublished" => date_published,
         "dateModified" => date_modified,
         "pageStart" => page_start,
         "pageEnd" => page_end,
+        "spatialCoverage" => spatial_coverage,
         "isPartOf" => is_part_of,
         "hasPart" => has_part,
         "citation" => citation,

data/lib/bolognese/schema_org.rb

@@ -35,6 +35,10 @@ module Bolognese
       normalize_id(metadata.fetch("url", nil))
     end
 
+    def resource_type_general
+      SO_TO_DC_TRANSLATIONS[type]
+    end
+
     def type
       metadata.fetch("@type", nil)
     end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.5"
+  VERSION = "0.5.1"
 end

data/spec/crossref_spec.rb

@@ -10,6 +10,7 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
+      expect(subject.resource_type_general).to eq("Text")
       expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Martial", "familyName"=>"Sankar"},
                                     {"@type"=>"Person", "givenName"=>"Kaisa", "familyName"=>"Nieminen"},
                                     {"@type"=>"Person", "givenName"=>"Laura", "familyName"=>"Ragni"},
@@ -31,6 +32,7 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.id).to eq(id)
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
+      expect(subject.resource_type_general).to eq("Text")
       expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Markus", "familyName"=>"Ralser"},
                                     {"@type"=>"Person", "givenName"=>"Gino", "familyName"=>"Heeren"},
                                     {"@type"=>"Person", "givenName"=>"Michael", "familyName"=>"Breitenbach"},
@@ -50,8 +52,9 @@ describe Bolognese::Crossref, vcr: true do
       id = "https://doi.org/10.1101/097196"
       subject = Bolognese::Crossref.new(id: id)
       expect(subject.id).to eq(id)
-      expect(subject.type).to eq("CreativeWork")
+      expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("PostedContent")
+      expect(subject.resource_type_general).to eq("Text")
       expect(subject.author.count).to eq(10)
       expect(subject.author.last).to eq("@type"=>"Person", "@id"=>"http://orcid.org/0000-0003-4060-7360", "givenName"=>"Timothy", "familyName"=>"Clark")
       expect(subject.name).to eq("A Data Citation Roadmap for Scholarly Data Repositories")
@@ -69,6 +72,7 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.1890/0012-9658(2006)87%5B2832:tiopma%5D2.0.co;2")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
+      expect(subject.resource_type_general).to eq("Text")
       expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"A.", "familyName"=>"Fenton"}, {"@type"=>"Person", "givenName"=>"S. A.", "familyName"=>"Rands"}])
       expect(subject.license).to eq("http://doi.wiley.com/10.1002/tdm_license_1")
       expect(subject.name).to eq("THE IMPACT OF PARASITE MANIPULATION AND PREDATOR FORAGING BEHAVIOR ON PREDATOR–PREY COMMUNITIES")
@@ -86,6 +90,7 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.1155/2012/291294")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
+      expect(subject.resource_type_general).to eq("Text")
       expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Wendy", "familyName"=>"Thanassi"},
                                     {"@type"=>"Person", "givenName"=>"Art", "familyName"=>"Noda"},
                                     {"@type"=>"Person",
@@ -112,6 +117,7 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.id).to eq(id)
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
+      expect(subject.resource_type_general).to eq("Text")
       expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Sarah E.", "familyName"=>"Beck"},
                                     {"@type"=>"Person", "givenName"=>"Suzanne E.", "familyName"=>"Queen"},
                                     {"@type"=>"Person", "givenName"=>"Kenneth W.", "familyName"=>"Witwer"},
@@ -151,6 +157,7 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
+      expect(subject.resource_type_general).to eq("Text")
       expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Martial", "familyName"=>"Sankar"},
                                     {"@type"=>"Person", "givenName"=>"Kaisa", "familyName"=>"Nieminen"},
                                     {"@type"=>"Person", "givenName"=>"Laura", "familyName"=>"Ragni"},
@@ -171,6 +178,7 @@ describe Bolognese::Crossref, vcr: true do
     it "with data citation" do
       expect(subject.validation_errors).to be_empty
       datacite = Maremma.from_xml(subject.as_datacite).fetch("resource", {})
+      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(25)
     end
@@ -180,6 +188,7 @@ describe Bolognese::Crossref, vcr: true do
       subject = Bolognese::Crossref.new(id: id)
       expect(subject.validation_errors).to be_empty
       datacite = Maremma.from_xml(subject.as_datacite).fetch("resource", {})
+      expect(datacite.dig("resourceType", "resourceTypeGeneral")).to eq("Text")
       expect(datacite.dig("creators", "creator").count).to eq(7)
       expect(datacite.dig("creators", "creator").first).to eq("creatorName"=>"Thanassi, Wendy", "givenName"=>"Wendy", "familyName"=>"Thanassi")
     end

data/spec/datacite_spec.rb

@@ -10,6 +10,7 @@ describe Bolognese::Datacite, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.5061/dryad.8515")
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("DataPackage")
+      expect(subject.resource_type_general).to eq("Dataset")
       expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Benjamin", "familyName"=>"Ollomo"},
                                     {"@type"=>"Person", "givenName"=>"Patrick", "familyName"=>"Durand"},
                                     {"@type"=>"Person", "givenName"=>"Franck", "familyName"=>"Prugnolle"},
@@ -35,6 +36,7 @@ describe Bolognese::Datacite, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("BlogPosting")
+      expect(subject.resource_type_general).to eq("Text")
       expect(subject.author).to eq([{"@type"=>"Person", "@id"=>"http://orcid.org/0000-0003-1419-2405", "givenName"=>"Martin", "familyName"=>"Fenner"}])
       expect(subject.name).to eq("Eating your own Dog Food")
       expect(subject.alternate_name).to eq("MS-49-3632-5083")
@@ -54,6 +56,7 @@ describe Bolognese::Datacite, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.4230/lipics.tqc.2013.93")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("ConferencePaper")
+      expect(subject.resource_type_general).to eq("Text")
       expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Nathaniel", "familyName"=>"Johnston"}])
       expect(subject.name).to eq("The Minimum Size of Qubit Unextendible Product Bases")
       expect(subject.description).to start_with("We investigate the problem of constructing unextendible product bases in the qubit case")
@@ -77,6 +80,7 @@ describe Bolognese::Datacite, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.5061/dryad.8515")
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("DataPackage")
+      expect(subject.resource_type_general).to eq("Dataset")
       expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Benjamin", "familyName"=>"Ollomo"},
                                     {"@type"=>"Person", "givenName"=>"Patrick", "familyName"=>"Durand"},
                                     {"@type"=>"Person", "givenName"=>"Franck", "familyName"=>"Prugnolle"},

metadata

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