commonmeta-ruby 3.4.4 → 3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5c580fb509592f279c823dff8e3706420d08af27e2fbf34eae997ab27138b35
-  data.tar.gz: 44ac2df8b90492d35c45d125f4b9d4c5800827a17acde4c50453af49e5b04160
+  metadata.gz: eff7462ec031d3c8ad11d8f684738711c0464cee5644028d8d805ff36f09058f
+  data.tar.gz: 8fda70b594d569ffe432f6071c85f9009d8e83434bd3f079a6ea7d312e57f3bd
 SHA512:
-  metadata.gz: ece0ebc5a0e2028704029c9eb97318721d532b2f9eb580c9dbf5419784e10a34176925517790c0bd6819e7f9d5dfd807f8f97afb9ec5722f4255c0c4065724e1
-  data.tar.gz: a12d1a02e8ce66d1f3c6ed4ca7672b9dbf54413f1e3c336fed6a7fa6f3f53a73e2bdf937f8d4d32faf2c4e40fd41357b043813adde42c5387bb528d1fb6c86fa
+  metadata.gz: 69b5c2c59cb28d2d4615ec21c10f760efa504aa1c33fda841327900f61367a71e1a51accce0a5c643fd2b4bd066ebaf34e67a616de01a147bc1140f3fed8f442
+  data.tar.gz: 005a9c7e7b1fee2e452d6683e9952cbf778817cb19c0a62fa1b83f805e22ba435e1f64bfcfb1e217aec2c1112ea83cb9321f3f1a743d478161fe1a100f65a9c8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    commonmeta-ruby (3.4.4)
+    commonmeta-ruby (3.5)
       activesupport (>= 4.2.5, < 8.0)
       addressable (~> 2.8.1, < 2.8.2)
       base32-url (>= 0.7.0, < 1)
@@ -202,7 +202,7 @@ GEM
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.23.2)
+    rubocop-rspec (2.24.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

data/lib/commonmeta/author_utils.rb

@@ -1,77 +1,106 @@
 # frozen_string_literal: true
 
-require 'namae'
+require "namae"
 
 module Commonmeta
   module AuthorUtils
+    # mapping of DataCite contributorType to commonmeta contributorRoles
+    def datacite_contributor_roles = {
+      "ContactPerson" => "ContactPerson",
+      "DataCurator" => "DataCuration",
+      "DataManager" => "Other",
+      "Distributor" => "Other",
+      "Editor" => "Editor",
+      "HostingInstitution" => "Other",
+      "Other" => "Other",
+      "Producer" => "Other",
+      "ProjectLeader" => "Other",
+      "ProjectManager" => "Other",
+      "ProjectMember" => "Other",
+      "RegistrationAgency" => "Other",
+      "RegistrationAuthority" => "Other",
+      "RelatedPerson" => "Other",
+      "ResearchGroup" => "Other",
+      "RightsHolder" => "Other",
+      "Researcher" => "Other",
+      "Sponsor" => "Other",
+      "Supervisor" => "Supervision",
+      "WorkPackageLeader" => "Other"
+    }
+
     def get_one_author(author)
       # basic sanity checks
       return nil if author.blank?
 
       # author is a string
-      author = { 'name' => author } if author.is_a?(String)
+      author = { "name" => author } if author.is_a?(String)
 
       # malformed XML
-      return nil if author.fetch('name', nil).is_a?(Array)
+      return nil if author.fetch("name", nil).is_a?(Array)
 
       # parse author name attributes
-      name = parse_attributes(author.fetch('name', nil)) ||
-             parse_attributes(author.fetch('creatorName', nil)) ||
-             parse_attributes(author.fetch('contributorName', nil))
+      name = parse_attributes(author.fetch("name", nil)) ||
+             parse_attributes(author.fetch("creatorName", nil)) ||
+             parse_attributes(author.fetch("contributorName", nil))
 
-      given_name = parse_attributes(author.fetch('givenName', nil)) ||
-                   parse_attributes(author.fetch('given', nil))
-      family_name = parse_attributes(author.fetch('familyName', nil)) ||
-                    parse_attributes(author.fetch('family', nil))
+      given_name = parse_attributes(author.fetch("givenName", nil)) ||
+                   parse_attributes(author.fetch("given", nil))
+      family_name = parse_attributes(author.fetch("familyName", nil)) ||
+                    parse_attributes(author.fetch("family", nil))
 
       name = cleanup_author(name)
 
       # parse author identifier
-      id = parse_attributes(author.fetch('id', nil), first: true) ||
-           parse_attributes(author.fetch('identifier', nil), first: true) ||
-           parse_attributes(author.fetch('sameAs', nil), first: true)
+      id = parse_attributes(author.fetch("id", nil), first: true) ||
+           parse_attributes(author.fetch("identifier", nil), first: true) ||
+           parse_attributes(author.fetch("sameAs", nil), first: true)
 
       # DataCite metadata
-      if id.nil? && author['nameIdentifiers'].present?
-        id = Array.wrap(author.dig('nameIdentifiers')).find do |ni|
-          ni['nameIdentifierScheme'] == 'ORCID'
+      if id.nil? && author["nameIdentifiers"].present?
+        id = Array.wrap(author.dig("nameIdentifiers")).find do |ni|
+          ni["nameIdentifierScheme"] == "ORCID"
         end
-        id = id['nameIdentifier'] if id.present?
-      # Crossref metadata
-      elsif id.nil? && author['ORCID'].present?
-        id = author.fetch('ORCID')
+        id = id["nameIdentifier"] if id.present?
+        # Crossref metadata
+      elsif id.nil? && author["ORCID"].present?
+        id = author.fetch("ORCID")
       end
       id = normalize_orcid(id) || normalize_ror(id)
 
       # parse author type, i.e. "Person", "Organization" or not specified
-      type = author.fetch('type', nil)
+      type = author.fetch("type", nil)
       type = type.first if type.is_a?(Array)
       # DataCite metadata
-      type = type[0..-3] if type.is_a?(String) && type.end_with?('al')
+      type = type[0..-3] if type.is_a?(String) && type.end_with?("al")
 
-      if type.blank? && name.blank? && id.is_a?(String) && URI.parse(id).host == 'ror.org'
-        type = 'Person'
-        author['affiliation'] = { 'affiliationIdentifier' => id }
+      if type.blank? && name.blank? && id.is_a?(String) && URI.parse(id).host == "ror.org"
+        type = "Person"
+        author["affiliation"] = { "affiliationIdentifier" => id }
         id = nil
-      elsif type.blank? && id.is_a?(String) && URI.parse(id).host == 'ror.org'
-        type = 'Organization'
-      elsif type.blank? && author['type'] == 'Organization'
-        type = 'Organization'
-      elsif type.blank? && id.is_a?(String) && URI.parse(id).host == 'orcid.org'
-        type = 'Person'
+      elsif type.blank? && id.is_a?(String) && URI.parse(id).host == "ror.org"
+        type = "Organization"
+      elsif type.blank? && author["type"] == "Organization"
+        type = "Organization"
+      elsif type.blank? && id.is_a?(String) && URI.parse(id).host == "orcid.org"
+        type = "Person"
       elsif type.blank? && (given_name.present? || family_name.present?)
-        type = 'Person'
-      elsif type.blank? && is_personal_name?(name: name) && name.to_s.exclude?(';')
-        type = 'Person'
+        type = "Person"
+      elsif type.blank? && is_personal_name?(name: name) && name.to_s.exclude?(";")
+        type = "Person"
       elsif type.blank? && name.present? && !is_personal_name?(name: name)
-        type = 'Organization'
+        type = "Organization"
       end
 
       # parse author contributor role
-      contributor_type = parse_attributes(author.fetch('contributorType', nil))
+      contributor_roles = parse_attributes(author.fetch("contributorType", nil))
+      if contributor_roles
+        contributor_roles = [datacite_contributor_roles[contributor_roles]]
+      else
+        contributor_roles = ["Author"]
+      end
 
       # split name for type Person into given/family name if not already provided
-      if type == 'Person' && name.present? && given_name.blank? && family_name.blank?
+      if type == "Person" && name.present? && given_name.blank? && family_name.blank?
         Namae.options[:include_particle_in_family] = true
         names = Namae.parse(name)
         parsed_name = names.first
@@ -87,53 +116,56 @@ module Commonmeta
 
       # return author in commonmeta format, using name vs. given/family name
       # depending on type
-      { 'id' => id,
-        'type' => type,
-        'name' => type == 'Person' ? nil : name,
-        'givenName' => type == 'Organization' ? nil : given_name,
-        'familyName' => type == 'Organization' ? nil : family_name,
-        'affiliation' => get_affiliations(author.fetch('affiliation', nil)),
-        'contributorType' => contributor_type }.compact
+      { "id" => id,
+        "type" => type,
+        "name" => type == "Person" ? nil : name,
+        "contributorRoles" => contributor_roles,
+        "givenName" => type == "Organization" ? nil : given_name,
+        "familyName" => type == "Organization" ? nil : family_name,
+        "affiliation" => get_affiliations(author.fetch("affiliation", nil)) }.compact
     end
 
     def cleanup_author(author)
       return nil unless author.present?
 
       # detect pattern "Smith J.", but not "Smith, John K."
-      unless author.include?(',')
+      unless author.include?(",")
         author = author.gsub(/[[:space:]]([A-Z]\.)?(-?[A-Z]\.)$/, ', \1\2')
       end
 
       # strip suffixes, e.g. "John Smith, MD" as the named parser doesn't handle them
-      author = author.split(',').first if %w[MD PhD].include? author.split(', ').last
+      author = author.split(",").first if %w[MD PhD].include? author.split(", ").last
 
       # remove email addresses
       email = validate_email(author)
-      author = author.gsub(email, '') if email.present?
+      author = author.gsub(email, "") if email.present?
 
       # strip spaces at the beginning and end of string
       author = author.strip
 
       # remove parentheses around names
-      author = author[1..-2] if author[0] == '(' && author[-1] == ')'
+      author = author[1..-2] if author[0] == "(" && author[-1] == ")"
 
       # remove spaces around hyphens
-      author = author.gsub(' - ', '-')
+      author = author.gsub(" - ", "-")
 
       # remove non-standard space characters
-      author.gsub(/[[:space:]]/, ' ')
+      author.gsub(/[[:space:]]/, " ")
     end
 
     # check if given name is in the database of known given names:
     # https://github.com/bmuller/gender_detector
     def is_personal_name?(name: nil)
-      return true if name_exists?(name.to_s.split.first) || name_exists?(name.to_s.split(', ').last)
+      # personal names are not allowed to contain semicolons
+      return false if name.to_s.include?(";")
+
+      return true if name_exists?(name.to_s.split.first) || name_exists?(name.to_s.split(", ").last)
 
       # check if a name has only one word, e.g. "FamousOrganization", not including commas
-      return false if name.to_s.split(' ').size == 1 && name.to_s.exclude?(',')
+      return false if name.to_s.split(" ").size == 1 && name.to_s.exclude?(",")
 
       # check for suffixes, e.g. "John Smith, MD"
-      return true if %w[MD PhD].include? name.split(', ').last
+      return true if %w[MD PhD].include? name.split(", ").last
 
       # check of name can be parsed into given/family name
       Namae.options[:include_particle_in_family] = true
@@ -141,7 +173,7 @@ module Commonmeta
 
       parsed_name = names.first
       return true if parsed_name && parsed_name.given
-      
+
       false
     end
 
@@ -159,14 +191,14 @@ module Commonmeta
 
     def authors_as_string(authors)
       Array.wrap(authors).map do |a|
-        if a['familyName'].present?
-          [a['familyName'], a['givenName']].join(', ')
-        elsif a['type'] == 'Person'
-          a['name']
-        elsif a['name'].present?
-          "{#{a['name']}}"
+        if a["familyName"].present?
+          [a["familyName"], a["givenName"]].join(", ")
+        elsif a["type"] == "Person"
+          a["name"]
+        elsif a["name"].present?
+          "{#{a["name"]}}"
         end
-      end.join(' and ').presence
+      end.join(" and ").presence
     end
 
     def get_affiliations(affiliations)
@@ -177,17 +209,17 @@ module Commonmeta
         if a.is_a?(String)
           name = a.squish
         elsif a.is_a?(Hash)
-          if a['affiliationIdentifier'].present?
-            affiliation_identifier = a['affiliationIdentifier']
-            if a['schemeURI'].present?
-              schemeURI = a['schemeURI'].end_with?('/') ? a['schemeURI'] : "#{a['schemeURI']}/"
+          if a["affiliationIdentifier"].present?
+            affiliation_identifier = a["affiliationIdentifier"]
+            if a["schemeURI"].present?
+              schemeURI = a["schemeURI"].end_with?("/") ? a["schemeURI"] : "#{a["schemeURI"]}/"
             end
-            affiliation_identifier = !affiliation_identifier.to_s.start_with?('https://') && schemeURI.present? ? normalize_id(schemeURI + affiliation_identifier) : normalize_id(affiliation_identifier)
+            affiliation_identifier = !affiliation_identifier.to_s.start_with?("https://") && schemeURI.present? ? normalize_id(schemeURI + affiliation_identifier) : normalize_id(affiliation_identifier)
           end
-          name = (a['name'] || a['__content__']).to_s.squish.presence
+          name = (a["name"] || a["__content__"]).to_s.squish.presence
         end
 
-        { 'id' => affiliation_identifier, 'name' => name }.compact.presence
+        { "id" => affiliation_identifier, "name" => name }.compact.presence
       end.compact.presence
     end
 
@@ -195,9 +227,9 @@ module Commonmeta
       return nil unless id.present?
 
       Array.wrap(id).map do |i|
-        { 'nameIdentifier' => i,
-          'nameIdentifierScheme' => 'ORCID',
-          'schemeUri' => 'https://orcid.org' }.compact
+        { "nameIdentifier" => i,
+          "nameIdentifierScheme" => "ORCID",
+          "schemeUri" => "https://orcid.org" }.compact
       end.compact.presence
     end
   end

data/lib/commonmeta/crossref_utils.rb

@@ -57,7 +57,7 @@ module Commonmeta
         end
         xml.journal_article("publication_type" => "full_text") do
           insert_crossref_titles(xml)
-          insert_crossref_creators(xml)
+          insert_crossref_contributors(xml)
           insert_crossref_publication_date(xml)
           insert_crossref_abstract(xml)
           insert_crossref_issn(xml)
@@ -76,7 +76,7 @@ module Commonmeta
 
       xml.posted_content(posted_content) do
         insert_group_title(xml)
-        insert_crossref_creators(xml)
+        insert_crossref_contributors(xml)
         insert_crossref_titles(xml)
         insert_posted_date(xml)
         insert_institution(xml)
@@ -96,51 +96,57 @@ module Commonmeta
       xml.group_title(subjects.first["subject"])
     end
 
-    def insert_crossref_creators(xml)
+    def insert_crossref_contributors(xml)
+      return xml if contributors.blank?
+
+      con = Array.wrap(contributors).select { |c| c["contributorRoles"] == ["Author"] || c["contributorRoles"] == ["Editor"] }
+
       xml.contributors do
-        Array.wrap(creators).each_with_index do |creator, index|
-          if creator["type"] == "Organization" && creator["name"].present?
-            xml.organization(creator["name"], "contributor_role" => "author",
-                                              "sequence" => index.zero? ? "first" : "additional")
-          elsif creator["givenName"].present? || creator["familyName"].present?
-            xml.person_name("contributor_role" => "author",
+        Array.wrap(con).each_with_index do |contributor, index|
+          contributor_role = contributor["contributorRoles"] == ["Author"] ? "author" : "editor"
+
+          if contributor["type"] == "Organization" && contributor["name"].present?
+            xml.organization(contributor["name"], "contributor_role" => contributor_role,
+                                                  "sequence" => index.zero? ? "first" : "additional")
+          elsif contributor["givenName"].present? || contributor["familyName"].present?
+            xml.person_name("contributor_role" => contributor_role,
                             "sequence" => index.zero? ? "first" : "additional") do
-              insert_crossref_person(xml, creator)
+              insert_crossref_person(xml, contributor)
             end
-          elsif creator["affiliation"].present?
-            xml.anonymous("contributor_role" => "author",
+          elsif contributor["affiliation"].present?
+            xml.anonymous("contributor_role" => contributor_role,
                           "sequence" => index.zero? ? "first" : "additional") do
-              insert_crossref_anonymous(xml, creator)
+              insert_crossref_anonymous(xml, contributor)
             end
           else
-            xml.anonymous("contributor_role" => "author",
+            xml.anonymous("contributor_role" => contributor_role,
                           "sequence" => index.zero? ? "first" : "additional")
           end
         end
       end
     end
 
-    def insert_crossref_person(xml, creator)
-      xml.given_name(creator["givenName"]) if creator["givenName"].present?
-      xml.surname(creator["familyName"]) if creator["familyName"].present?
-      if creator.dig("id") && URI.parse(creator.dig("id")).host == "orcid.org"
-        xml.ORCID(creator.dig("id"))
+    def insert_crossref_person(xml, contributor)
+      xml.given_name(contributor["givenName"]) if contributor["givenName"].present?
+      xml.surname(contributor["familyName"]) if contributor["familyName"].present?
+      if contributor.dig("id") && URI.parse(contributor.dig("id")).host == "orcid.org"
+        xml.ORCID(contributor.dig("id"))
       end
-      if creator["affiliation"].present?
+      if contributor["affiliation"].present?
         xml.affiliations do
           xml.institution do
-            xml.institution_name(creator.dig("affiliation", 0, "name")) if creator.dig("affiliation", 0, "name").present?
-            xml.institution_id(creator.dig("affiliation", 0, "id"), "type" => "ror") if creator.dig("affiliation", 0, "id").present?
+            xml.institution_name(contributor.dig("affiliation", 0, "name")) if contributor.dig("affiliation", 0, "name").present?
+            xml.institution_id(contributor.dig("affiliation", 0, "id"), "type" => "ror") if contributor.dig("affiliation", 0, "id").present?
           end
         end
       end
     end
 
-    def insert_crossref_anonymous(xml, creator)
+    def insert_crossref_anonymous(xml, contributor)
       xml.affiliations do
         xml.institution do
-          xml.institution_name(creator.dig("affiliation", 0, "name")) if creator.dig("affiliation", 0, "name").present?
-          xml.institution_id(creator.dig("affiliation", 0, "id"), "type" => "ror") if creator.dig("affiliation", 0, "id").present?
+          xml.institution_name(contributor.dig("affiliation", 0, "name")) if contributor.dig("affiliation", 0, "name").present?
+          xml.institution_id(contributor.dig("affiliation", 0, "id"), "type" => "ror") if contributor.dig("affiliation", 0, "id").present?
         end
       end
     end

data/lib/commonmeta/metadata.rb

@@ -9,8 +9,8 @@ module Commonmeta
     attr_accessor :string, :from, :sandbox, :meta, :regenerate, :issue, :show_errors, :depositor,
                   :email, :registrant
     attr_reader :doc, :page_start, :page_end
-    attr_writer :id, :provider_id, :client_id, :doi, :alternate_identifiers, :creators, :contributors,
-                :titles, :publisher, :license, :date, :volume, :url, :version, :subjects, :contributor, :descriptions, :language, :sizes, :formats, :schema_version, :meta, :container, :provider, :format, :funding_references, :state, :geo_locations, :type, :additional_type, :content_url, :references, :related_identifiers, :related_items, :style, :locale
+    attr_writer :id, :provider_id, :client_id, :doi, :alternate_identifiers, :contributors,
+                :titles, :publisher, :license, :date, :volume, :url, :version, :subjects, :descriptions, :language, :sizes, :formats, :schema_version, :meta, :container, :provider, :format, :funding_references, :state, :geo_locations, :type, :additional_type, :content_url, :references, :related_identifiers, :related_items, :style, :locale
 
     def initialize(options = {})
       options.symbolize_keys!
@@ -60,7 +60,6 @@ module Commonmeta
           'provider_id' => options[:provider_id],
           'client_id' => options[:client_id],
           'content_url' => options[:content_url],
-          'creators' => options[:creators],
           'contributors' => options[:contributors],
           'titles' => options[:titles],
           'publisher' => options[:publisher]
@@ -96,7 +95,6 @@ module Commonmeta
 
       # set attributes directly
       read_options = options.slice(
-        :creators,
         :contributors,
         :titles,
         :type,
@@ -252,10 +250,6 @@ module Commonmeta
       @titles ||= meta.fetch('titles', nil)
     end
 
-    def creators
-      @creators ||= meta.fetch('creators', nil)
-    end
-
     def contributors
       @contributors ||= meta.fetch('contributors', nil)
     end

data/lib/commonmeta/metadata_utils.rb

@@ -132,14 +132,16 @@ module Commonmeta
     end
 
     def csl_hsh
+      authors = Array.wrap(contributors).select { |c| c['contributorRoles'] == ['Author'] }
+  
       page = if container.to_h['firstPage'].present?
                [container['firstPage'], container['lastPage']].compact.join('-')
              end
-      author = if Array.wrap(creators).size == 1 && Array.wrap(creators).first.fetch('name',
+      author = if Array.wrap(authors).size == 1 && Array.wrap(authors).first.fetch('name',
                                                                                      nil) == ':(unav)'
                  nil
                else
-                 to_csl(creators)
+                 to_csl(authors)
                end
 
       type_ = if type == 'Software' && version.present?
@@ -158,7 +160,6 @@ module Commonmeta
         'categories' => categories,
         'language' => language,
         'author' => author,
-        'contributor' => to_csl(contributors),
         'issued' => get_date_parts(date['published']),
         'submitted' => date['submitted'] ? get_date_parts(date['submitted']) : nil,
         'abstract' => parse_attributes(descriptions, content: 'description', first: true),

data/lib/commonmeta/readers/bibtex_reader.rb

@@ -14,8 +14,8 @@ module Commonmeta
 
         doi = meta.try(:doi).to_s.presence || options[:doi]
 
-        creators = Array(meta.try(:author)).map do |a|
-          { 'type' => 'Person', 'givenName' => a.first, 'familyName' => a.last }.compact
+        contributors = Array(meta.try(:author)).map do |a|
+          { 'type' => 'Person', 'contributorRoles' => ['Author'], 'givenName' => a.first, 'familyName' => a.last }.compact
         end
 
         container = if meta.try(:journal).present?
@@ -43,7 +43,7 @@ module Commonmeta
           'type' => type,
           'url' => meta.try(:url).to_s.presence,
           'titles' => meta.try(:title).present? ? [{ 'title' => meta.try(:title).to_s }] : [],
-          'creators' => creators,
+          'contributors' => contributors,
           'container' => container,
           'publisher' => meta.try(:publisher).to_s ? { 'name' => meta.publisher.to_s } : nil,
           'date' => date,

data/lib/commonmeta/readers/cff_reader.rb

@@ -34,7 +34,7 @@ module Commonmeta
                                                                 i['type'] == 'doi'
                                                               end.to_h.fetch('value', nil))
         url = normalize_id(meta.fetch('repository-code', nil))
-        creators = cff_creators(Array.wrap(meta.fetch('authors', nil)))
+        contributors = cff_contributors(Array.wrap(meta.fetch('authors', nil)))
 
         date = {}
         if meta.fetch('date-released', nil).present?
@@ -66,7 +66,7 @@ module Commonmeta
           'identifiers' => identifiers,
           'url' => url,
           'titles' => titles,
-          'creators' => creators,
+          'contributors' => contributors,
           'publisher' => publisher,
           'references' => references,
           'date' => date,
@@ -80,8 +80,8 @@ module Commonmeta
           'state' => state }.compact.merge(read_options)
       end
 
-      def cff_creators(creators)
-        Array.wrap(creators).map do |a|
+      def cff_contributors(contributors)
+        Array.wrap(contributors).map do |a|
           id = normalize_orcid(parse_attributes(a['orcid']))
           if a['given-names'].present? || a['family-names'].present? || id.present?
             given_name = parse_attributes(a['given-names'])
@@ -101,12 +101,14 @@ module Commonmeta
             end.compact
 
             { 'type' => 'Person',
+              'contributorRoles' => ['Author'],
               'id' => id,
               'givenName' => given_name,
               'familyName' => family_name,
               'affiliation' => affiliation.presence }.compact
           else
             { 'type' => 'Organization',
+              'contributorRoles' => ['Author'],
               'name' => a['name'] || a['__content__'] }
           end
         end
@@ -127,7 +129,7 @@ module Commonmeta
           'key' => doi || url,
           'doi' => doi,
           'url' => url,
-          'creator' => reference.dig('author'),
+          'contributor' => reference.dig('author'),
           'title' => reference.dig('article-title'),
           'publisher' => reference.dig('publisher'),
           'publicationYear' => date['published'] ? date['published'][0..3] : nil,
@@ -137,7 +139,6 @@ module Commonmeta
           'lastPage' => reference.dig('last-page'),
           'containerTitle' => reference.dig('journal-title'),
           'edition' => nil,
-          'contributor' => nil,
           'unstructured' => doi.nil? ? reference.dig('unstructured') : nil
         }.compact
       end

data/lib/commonmeta/readers/codemeta_reader.rb

@@ -34,8 +34,9 @@ module Commonmeta
 
         has_agents = meta.fetch('agents', nil)
         authors = has_agents.nil? ? meta.fetch('authors', nil) : has_agents
-        creators = get_authors(from_schema_org(Array.wrap(authors)))
-        contributors = get_authors(from_schema_org(Array.wrap(meta.fetch('editor', nil))))
+        contributors = get_authors(from_schema_org(Array.wrap(authors)))
+        contributors += get_authors(from_schema_org(Array.wrap(meta.fetch('editor', nil))))
+        
         # strip milliseconds from iso8601, as edtf library doesn't handle them
         date = {}
         if Date.edtf(strip_milliseconds(meta.fetch('datePublished', nil))).present?
@@ -71,7 +72,6 @@ module Commonmeta
           'type' => type,
           'url' => normalize_id(meta.fetch('codeRepository', nil)),
           'titles' => titles,
-          'creators' => creators,
           'contributors' => contributors,
           'publisher' => publisher,
           'date' => date,

data/lib/commonmeta/readers/crossref_reader.rb

@@ -38,13 +38,13 @@ module Commonmeta
                       meta.fetch('publisher', nil)
                     end
 
-        creators = if meta.fetch('author', nil).present?
+        contributors = if meta.fetch('author', nil).present?
                      get_authors(from_csl(Array.wrap(meta.fetch('author', nil))))
                    else
                      []
                    end
         editors = Array.wrap(meta.fetch('editor', nil)).each { |e| e['contributorType'] = 'Editor' }
-        contributors = get_authors(from_csl(editors))
+        contributors += get_authors(from_csl(editors))
 
         date = {}
         date['submitted'] = nil
@@ -138,7 +138,6 @@ module Commonmeta
           'type' => type,
           'url' => normalize_id(meta.dig('resource', 'primary', 'URL')),
           'titles' => [{ 'title' => title }],
-          'creators' => creators,
           'contributors' => contributors,
           'container' => container,
           'publisher' => publisher,
@@ -167,7 +166,7 @@ module Commonmeta
         {
           'key' => reference.dig('key'),
           'doi' => doi ? normalize_doi(doi) : nil,
-          'creator' => reference.dig('author'),
+          'contributor' => reference.dig('author'),
           'title' => reference.dig('article-title'),
           'publisher' => reference.dig('publisher'),
           'publicationYear' => reference.dig('year'),
@@ -177,7 +176,6 @@ module Commonmeta
           'lastPage' => reference.dig('last-page'),
           'containerTitle' => reference.dig('journal-title'),
           'edition' => nil,
-          'contributor' => nil,
           'unstructured' => doi.nil? ? reference.dig('unstructured') : nil
         }.compact
       end