bolognese 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d95db6e5bbb36dfe35b17b59d550c461313081f73d53e905ab2b3ef8ca51406
-  data.tar.gz: 12c67ecc1909f2b666cbc39a939bbfeba069e720c459edac0261b7da85bd8830
+  metadata.gz: 101b83ceef5cc504cac6e51becd5840d9c27e78a7247033d61183ce7958d5e08
+  data.tar.gz: 9409014f1925750a0795f8cc90607b8fdef63a23d9a8b4ce23fd7c16c7ea19a3
 SHA512:
-  metadata.gz: 7b312da3d75d11246151383fe98c220c507d35a3de421d0241ef21c2c8a77fff95d16554a8e815cf95ed62e1489fc0b9eae737d656215432cc7f818476de4de8
-  data.tar.gz: adfd9ce65312058e16341122109bc0636ad73048ca96577e1013c8628ca14b539447edbc141434c887be45a42cb256898df74df582d7b02958fa81a116f6cf8d
+  metadata.gz: b88362a0aa9c1661fcef16b3886964ec4c214a468310f8df40e9ae50be18657a4f7aae999674a1c3109d65f9f503c3f3830bc5c77597817d0a57d0cec73f45c3
+  data.tar.gz: 250e6261325c0b745d783b865d53d7b9c9d0726fec30b5cc02afeaa1961453f8d5f3afcf1ace249f26b60d9eb1f40d20e041fb10d9fbbbacbdf806012090f81e

data/Gemfile.lock

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

data/lib/bolognese/author_utils.rb

@@ -35,13 +35,15 @@ module Bolognese
       family_name = parse_attributes(author.fetch("familyName", nil))
       name = cleanup_author(name)
       name = [family_name, given_name].join(", ") if name.blank? && family_name.present?
+      contributor_type = parse_attributes(author.fetch("contributorType", nil))
 
       author = { "type" => type || "Person",
                  "id" => id,
                  "name" => name,
                  "givenName" => given_name,
                  "familyName" => family_name,
-                 "identifier" => identifier }.compact
+                 "identifier" => identifier,
+                 "contributorType" => contributor_type }.compact
 
       return author if family_name.present?
 
@@ -63,7 +65,8 @@ module Bolognese
           "name" => name,
           "givenName" => given_name,
           "familyName" => family_name,
-          "identifier" => identifier }.compact
+          "identifier" => identifier,
+          "contributorType" => contributor_type }.compact
       else
         { "type" => type, "name" => name }.compact
       end

data/lib/bolognese/datacite_utils.rb

@@ -54,12 +54,12 @@ module Bolognese
     end
 
     def insert_contributors(xml)
-      return xml unless editor.present?
+      return xml unless contributor.present?
 
       xml.contributors do
-        Array.wrap(editor).each do |contributor|
-          xml.contributor("contributorType" => "Editor") do
-            insert_person(xml, contributor, "contributor")
+        Array.wrap(contributor).each do |con|
+          xml.contributor("contributorType" => con["contributorType"] || "Other") do
+            insert_person(xml, con, "contributor")
           end
         end
       end

data/lib/bolognese/metadata.rb

@@ -6,11 +6,11 @@ module Bolognese
   class Metadata
     include Bolognese::MetadataUtils
 
-    attr_writer :id, :provider_id, :client_id, :doi, :identifier, :creator, :title, :publisher, :rights, :dates, :publication_year,
-                :volume, :first_page, :last_page, :url, :version,
-                :keywords, :editor, :description, :alternate_identifiers, :language, :size,
+    attr_writer :id, :provider_id, :client_id, :doi, :identifier, :creator, :contributor, :title, :publisher, 
+                :rights, :dates, :publication_year, :volume, :first_page, :last_page, :url, :version,
+                :keywords, :contributor, :description, :alternate_identifiers, :language, :size,
                 :formats, :schema_version, :meta, :periodical,
-                :format, :funding_references, :style, :locale, :state, :geo_location,
+                :format, :funding_references, :state, :geo_location,
                 :types, :content_url, :related_identifiers
 
     def initialize(input: nil, from: nil, **options)
@@ -195,5 +195,9 @@ module Bolognese
     def creator
       @creator ||= meta.fetch("creator", nil)
     end
+
+    def contributor
+      @contributor ||= meta.fetch("contributor", nil)
+    end
   end
 end

data/lib/bolognese/metadata_utils.rb

@@ -61,8 +61,9 @@ module Bolognese
     include Bolognese::Writers::SchemaOrgWriter
     include Bolognese::Writers::TurtleWriter
 
-    attr_accessor :string, :from, :sandbox, :meta, :regenerate, :issue, :contributor
+    attr_accessor :string, :from, :sandbox, :meta, :regenerate, :issue
     attr_reader :doc, :service_provider, :page_start, :page_end, :reverse, :name_detector
+    attr_writer :style, :locale
 
     # replace DOI in XML if provided in options
     def raw
@@ -79,10 +80,6 @@ module Bolognese
       (from == "datacite") && regenerate.blank? && raw.present?
     end
 
-    def editor
-      @editor ||= meta.fetch("editor", nil)
-    end
-
     def service_provider
       @service_provider ||= meta.fetch("service_provider", nil)
     end
@@ -128,7 +125,7 @@ module Bolognese
         "categories" => Array.wrap(keywords).map { |k| parse_attributes(k, content: "text", first: true) }.presence,
         "language" => language,
         "author" => to_citeproc(creator),
-        "editor" => to_citeproc(editor),
+        "contributor" => to_citeproc(contributor),
         "issued" => get_date(dates, "Issued") ? get_date_parts(get_date(dates, "Issued")) : nil,
         "submitted" => Array.wrap(dates).find { |d| d["type"] == "Submitted" }.to_h.fetch("__content__", nil),
         "abstract" => parse_attributes(description, content: "text", first: true),

data/lib/bolognese/readers/citeproc_reader.rb

@@ -45,7 +45,7 @@ module Bolognese
         }.compact
         doi = normalize_doi(meta.fetch("DOI", nil))
         creator = get_authors(from_citeproc(Array.wrap(meta.fetch("author", nil))))
-        editor = get_authors(from_citeproc(Array.wrap(meta.fetch("editor", nil))))
+        contributor = get_authors(from_citeproc(Array.wrap(meta.fetch("editor", nil))))
         dates = if meta.fetch("issued", nil).present?
           [{ "date" => get_date_from_date_parts(meta.fetch("issued", nil)),
              "date_type" => "Issued" }]
@@ -83,6 +83,7 @@ module Bolognese
           "url" => normalize_id(meta.fetch("URL", nil)),
           "title" => [{ "text" => meta.fetch("title", nil) }],
           "creator" => creator,
+          "contributor" => contributor,
           "periodical" => periodical,
           "publisher" => meta.fetch("publisher", nil),
           "related_identifiers" => related_identifiers,

data/lib/bolognese/readers/codemeta_reader.rb

@@ -22,7 +22,7 @@ module Bolognese
         identifier = meta.fetch("identifier", nil)
         id = normalize_id(meta.fetch("@id", nil) || identifier)
         author = get_authors(from_schema_org(Array.wrap(meta.fetch("agents", nil))))
-        editor = get_authors(from_schema_org(Array.wrap(meta.fetch("editor", nil))))
+        contributor = get_authors(from_schema_org(Array.wrap(meta.fetch("editor", nil))))
         dates = []
         dates << { "date" => meta.fetch("datePublished"), "date_type" => "Issued" } if meta.fetch("datePublished", nil).present?
         dates << { "date" => meta.fetch("dateCreated"), "date_type" => "Created" } if meta.fetch("dateCreated", nil).present?
@@ -47,7 +47,7 @@ module Bolognese
           "url" => normalize_id(meta.fetch("codeRepository", nil)),
           "title" => [{ "text" => meta.fetch("title", nil) }],
           "creator" => author,
-          "editor" => editor,
+          "contributor" => contributor,
           "publisher" => publisher,
           #{}"is_part_of" => is_part_of,
           "dates" => dates,

data/lib/bolognese/readers/crossref_reader.rb

@@ -109,7 +109,7 @@ module Bolognese
           "title" => [{ "text" => parse_attributes(bibliographic_metadata.dig("titles", "title")) }],
           "alternate_identifiers" => crossref_alternate_identifiers(bibliographic_metadata),
           "creator" => crossref_people(bibliographic_metadata, "author"),
-          "editor" => crossref_people(bibliographic_metadata, "editor"),
+          "contributor" => crossref_people(bibliographic_metadata, "editor"),
           "funding_references" => crossref_funding_reference(program_metadata),
           "publisher" => publisher,
           "periodical" => periodical,
@@ -170,7 +170,8 @@ module Bolognese
             "id" => parse_attributes(a["ORCID"]),
             "name" => [a["given_name"], a["surname"]].join(" "),
             "givenName" => a["given_name"],
-            "familyName" => a["surname"] }.compact
+            "familyName" => a["surname"],
+            "contributorType" => contributor_role == "editor" ? "Editor" : nil }.compact
         end.unwrap
       end
 

data/lib/bolognese/readers/datacite_json_reader.rb

@@ -40,7 +40,7 @@ module Bolognese
           "title" => meta.fetch("title", nil),
           "alternate_identifiers" => meta.fetch("alternate-identifiers", nil),
           "creator" => meta.fetch("creator", nil),
-          "editor" => meta.fetch("contributor", nil),
+          "contributor" => meta.fetch("contributor", nil),
           "publisher" => meta.fetch("publisher", nil),
           "periodical" => meta.fetch("periodical", nil),
           "service_provider" => "DataCite",

data/lib/bolognese/readers/datacite_reader.rb

@@ -105,7 +105,7 @@ module Bolognese
           if k.nil?
             nil
           elsif k.is_a?(String)
-            sanitize(k)
+            { "text" => sanitize(k) }
           else
             { "subject_scheme" => k["subjectScheme"], "scheme_uri" => k["schemeURI"], "text" => sanitize(k["__content__"]) }.compact
           end
@@ -171,6 +171,7 @@ module Bolognese
           "url" => options.fetch(:url, nil),
           "title" => title,
           "creator" => get_authors(Array.wrap(meta.dig("creators", "creator"))),
+          "contributor" => get_authors(Array.wrap(meta.dig("contributors", "contributor"))),
           "periodical" => periodical,
           "publisher" => meta.fetch("publisher", "").strip.presence,
           "service_provider" => "DataCite",

data/lib/bolognese/readers/schema_org_reader.rb

@@ -62,7 +62,7 @@ module Bolognese
         }.compact
         authors = meta.fetch("author", nil) || meta.fetch("creator", nil)
         author = get_authors(from_schema_org(Array.wrap(authors)))
-        editor = get_authors(from_schema_org(Array.wrap(meta.fetch("editor", nil))))
+        contributor = get_authors(from_schema_org(Array.wrap(meta.fetch("editor", nil))))
         publisher = parse_attributes(meta.fetch("publisher", nil), content: "name", first: true)
 
         ct = (type == "Dataset") ? "includedInDataCatalog" : "Periodical"
@@ -136,7 +136,7 @@ module Bolognese
           "formats" => Array.wrap(meta.fetch("encodingFormat", nil) || meta.fetch("fileFormat", nil)).unwrap,
           "title" => meta.fetch("name", nil).present? ? [{ "text" => meta.fetch("name", nil) }] : nil,
           "creator" => author,
-          "editor" => editor,
+          "contributor" => contributor,
           "publisher" => publisher,
           "service_provider" => parse_attributes(meta.fetch("provider", nil), content: "name", first: true),
           "periodical" => periodical,

data/lib/bolognese/utils.rb

@@ -816,6 +816,10 @@ module Bolognese
       dd.fetch("date", nil)
     end
 
+    def get_contributor(contributor, contributor_type)
+      contributor.select { |c| c["contributor_type"] == contributor_type }
+    end
+
     def jsonlint(json)
       return ["No JSON provided"] unless json.present?
 

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/bolognese/writers/jats_writer.rb

@@ -51,9 +51,9 @@ module Bolognese
       end
 
       def insert_editors(xml)
-        if editor.present?
+        if contributor.present?
           xml.send("person-group", "person-group-type" => "editor") do
-            Array.wrap(editor).each do |creator|
+            Array.wrap(contributor).each do |creator|
               xml.name do
                 insert_contributor(xml, creator)
               end

data/lib/bolognese/writers/schema_org_writer.rb

@@ -12,7 +12,7 @@ module Bolognese
           "additionalType" => types["resource_type"],
           "name" => parse_attributes(title, content: "text", first: true),
           "author" => to_schema_org(creator),
-          "editor" => to_schema_org(editor),
+          "editor" => to_schema_org(contributor),
           "description" => parse_attributes(description, content: "text", first: true),
           "license" => Array.wrap(rights).map { |l| l["id"] }.compact.unwrap,
           "version" => version,

data/spec/readers/crossref_reader_spec.rb

@@ -53,7 +53,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"JournalArticle", "resource_type_general"=>"Text", "ris"=>"JOUR", "type"=>"ScholarlyArticle")
       expect(subject.creator.length).to eq(5)
       expect(subject.creator.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.contributor).to eq("contributorType"=>"Editor", "familyName"=>"Janbon", "givenName"=>"Guilhem", "name"=>"Guilhem Janbon", "type"=>"Person")
       expect(subject.title).to eq([{"text"=>"Triose Phosphate Isomerase Deficiency Is Caused by Altered Dimerization–Not Catalytic Inactivity–of the Mutant Enzymes"}])
       expect(subject.rights).to eq([{"id"=>"http://creativecommons.org/licenses/by/4.0"}])
       expect(subject.dates).to eq([{"date"=>"2006-12-20", "date_type"=>"Issued"}, {"date"=>"2017-06-17T12:26:15Z", "date_type"=>"Updated"}])

data/spec/readers/datacite_reader_spec.rb

@@ -741,7 +741,7 @@ describe Bolognese::Metadata, vcr: true do
     expect(subject.types["resource_type"]).to eq("DroNc-seq data")
     expect(subject.creator).to eq("name"=>"The GTEx Consortium", "type"=>"Organization")
     expect(subject.title).to eq([{"text"=>"DroNc-seq data"}])
-    expect(subject.keywords).to eq(["gtex", "annotation", "phenotype", "gene regulation", "transcriptomics"])
+    expect(subject.keywords).to eq([{"text"=>"gtex"}, {"text"=>"annotation"}, {"text"=>"phenotype"}, {"text"=>"gene regulation"}, {"text"=>"transcriptomics"}])
     expect(subject.dates).to eq([{"date"=>"2017", "date_type"=>"Issued"}])
     expect(subject.publication_year).to eq("2017")
     expect(subject.related_identifiers.length).to eq(4)

metadata

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