commonmeta-ruby 3.4.5 → 3.5.1

data/lib/commonmeta/readers/crossref_reader.rb

@@ -4,19 +4,19 @@ module Commonmeta
   module Readers
     module CrossrefReader
       def get_crossref(id: nil, **options)
-        return { 'string' => nil, 'state' => 'not_found' } unless id.present?
+        return { "string" => nil, "state" => "not_found" } unless id.present?
 
         api_url = crossref_api_url(id, options)
         response = HTTP.get(api_url)
-        return { 'string' => nil, 'state' => 'not_found' } unless response.status.success?
+        return { "string" => nil, "state" => "not_found" } unless response.status.success?
 
-        { 'string' => response.body.to_s }
+        { "string" => response.body.to_s }
       end
 
       def read_crossref(string: nil, **options)
         if string.present?
           errors = jsonlint(string)
-          return { 'errors' => errors } if errors.present?
+          return { "errors" => errors } if errors.present?
         end
 
         read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url,
@@ -24,161 +24,168 @@ module Commonmeta
         meta = string.present? ? JSON.parse(string) : {}
 
         # optionally strip out the message wrapper from API
-        meta = meta.dig('message') if meta.dig('message').present?
+        meta = meta.dig("message") if meta.dig("message").present?
 
-        resource_type = meta.fetch('type', nil)
+        resource_type = meta.fetch("type", nil)
         resource_type = resource_type.present? ? resource_type.underscore.camelcase : nil
-        type = Commonmeta::Utils::CR_TO_CM_TRANSLATIONS.fetch(resource_type, 'Other')
+        type = Commonmeta::Utils::CR_TO_CM_TRANSLATIONS.fetch(resource_type, "Other")
 
-        member_id = meta.fetch('member', nil)
+        member_id = meta.fetch("member", nil)
         # TODO: get publisher from member_id almost always return publisher name, but sometimes does not
         publisher = if member_id.present?
-                      get_crossref_member(member_id)
-                    else
-                      meta.fetch('publisher', nil)
-                    end
-
-        creators = 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))
+            get_crossref_member(member_id)
+          else
+            meta.fetch("publisher", nil)
+          end
+
+        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))
 
         date = {}
-        date['submitted'] = nil
-        date['accepted'] = meta.dig('accepted', 'date-time')
-        date['published'] =
-          meta.dig('issued',
-                   'date-time') || get_date_from_date_parts(meta.fetch('issued',
+        date["submitted"] = nil
+        date["accepted"] = meta.dig("accepted", "date-time")
+        date["published"] =
+          meta.dig("issued",
+                   "date-time") || get_date_from_date_parts(meta.fetch("issued",
                                                                        nil)) || get_date_from_date_parts(meta.fetch(
-                                                                                                           'created', nil
-                                                                                                         ))
-        date['updated'] =
-          meta.dig('updated',
-                   'date-time') || meta.dig('deposited',
-                                            'date-time') || get_date_from_date_parts(meta.fetch(
-                                                                                       'deposited', nil
-                                                                                     ))
+            "created", nil
+          ))
+        date["updated"] =
+          meta.dig("updated",
+                   "date-time") || meta.dig("deposited",
+                                            "date-time") || get_date_from_date_parts(meta.fetch(
+            "deposited", nil
+          ))
 
         # TODO: fix timestamp. Until then, remove time as this is not always stable with Crossref (different server timezones)
-        date['published'] = get_iso8601_date(date['published']) if date['published'].present?
-        date['updated'] = get_iso8601_date(date['updated']) if date['updated'].present?
+        date["published"] = get_iso8601_date(date["published"]) if date["published"].present?
+        date["updated"] = get_iso8601_date(date["updated"]) if date["updated"].present?
 
-        license = if meta.fetch('license', nil)
-                    hsh_to_spdx('rightsURI' => meta.dig('license', 0, 'URL'))
-                  end
-        issn = Array.wrap(meta.fetch('issn-type', nil)).find { |i| i['type'] == 'electronic' } ||
-               Array.wrap(meta.fetch('issn-type', nil)).find { |i| i['type'] == 'print' } || {}
-        issn = issn.fetch('value', nil) if issn.present?
+        license = if meta.fetch("license", nil)
+            hsh_to_spdx("rightsURI" => meta.dig("license", 0, "URL"))
+          end
+        issn = Array.wrap(meta.fetch("issn-type", nil)).find { |i| i["type"] == "electronic" } ||
+               Array.wrap(meta.fetch("issn-type", nil)).find { |i| i["type"] == "print" } || {}
+        issn = issn.fetch("value", nil) if issn.present?
 
-        references = Array.wrap(meta.fetch('reference', nil)).map { |r| get_reference(r) }
+        references = Array.wrap(meta.fetch("reference", nil)).map { |r| get_reference(r) }
 
-        funding_references = Array.wrap(meta.fetch('funder', nil)).reduce([]) do |sum, funding|
+        funding_references = Array.wrap(meta.fetch("funder", nil)).reduce([]) do |sum, funding|
           funding_reference = {
-            'funderName' => funding['name'],
-            'funderIdentifier' => funding['DOI'] ? doi_as_url(funding['DOI']) : nil,
-            'funderIdentifierType' => funding['DOI'].to_s.starts_with?('10.13039') ? 'Crossref Funder ID' : nil
+            "funderName" => funding["name"],
+            "funderIdentifier" => funding["DOI"] ? doi_as_url(funding["DOI"]) : nil,
+            "funderIdentifierType" => funding["DOI"].to_s.starts_with?("10.13039") ? "Crossref Funder ID" : nil,
           }.compact
-          if funding['name'].present? && funding['award'].present?
-            Array.wrap(funding['award']).each do |award|
-              funding_reference['awardNumber'] = award
+          if funding["name"].present? && funding["award"].present?
+            Array.wrap(funding["award"]).each do |award|
+              funding_reference["awardNumber"] = award
             end
           end
 
           sum += [funding_reference] if funding_reference.present?
           sum
         end
+        files = Array.wrap(meta.fetch("link", nil)).reduce([]) do |sum, file|
+          if file["content-type"] != "unspecified"
+            file = { "url" => file.fetch("URL", nil), "mimeType" => file.fetch("content-type", nil) }
+            sum += [file]
+          end
+          sum
+        end
+        
         container_type = case resource_type
-                         when 'JournalArticle', 'JournalIssue'
-                           'Journal'
-                         when 'BookChapter'
-                           'Book'
-                         when 'Monograph'
-                           'BookSeries'
-                         end
-
-        first_page = if meta.fetch('page', nil).present?
-                       meta.fetch('page').split('-').map(&:strip)[0]
-                     end
-        last_page = if meta.fetch('page', nil).present?
-                      meta.fetch('page').split('-').map(&:strip)[1]
-                    end
-
-        container = { 'type' => container_type,
-                      'title' => parse_attributes(meta.fetch('container-title', nil),
+          when "JournalArticle", "JournalIssue"
+            "Journal"
+          when "BookChapter"
+            "Book"
+          when "Monograph"
+            "BookSeries"
+          end
+
+        first_page = if meta.fetch("page", nil).present?
+            meta.fetch("page").split("-").map(&:strip)[0]
+          end
+        last_page = if meta.fetch("page", nil).present?
+            meta.fetch("page").split("-").map(&:strip)[1]
+          end
+
+        container = { "type" => container_type,
+                      "title" => parse_attributes(meta.fetch("container-title", nil),
                                                   first: true).to_s.squish.presence,
-                      'identifier' => issn.present? ? issn : nil,
-                      'identifierType' => issn.present? ? 'ISSN' : nil,
-                      'volume' => meta.fetch('volume', nil),
-                      'issue' => meta.fetch('issue', nil),
-                      'firstPage' => first_page,
-                      'lastPage' => last_page }.compact
-
-        id = normalize_id(meta.fetch('id', nil) || meta.fetch('DOI', nil))
-
-        id = normalize_doi(options[:doi] || options[:id] || meta.fetch('DOI', nil))
-        title = if meta.fetch('title', nil).is_a?(Array)
-                  meta.fetch('title', nil)[0]
-                else
-                  meta.fetch('title', nil)
-                end
-        title = title.blank? ? ':(unav)' : title.squish
-        state = meta.present? || read_options.present? ? 'findable' : 'not_found'
-        subjects = Array.wrap(meta.fetch('categories', nil)).reduce([]) do |sum, subject|
+                      "identifier" => issn.present? ? issn : nil,
+                      "identifierType" => issn.present? ? "ISSN" : nil,
+                      "volume" => meta.fetch("volume", nil),
+                      "issue" => meta.fetch("issue", nil),
+                      "firstPage" => first_page,
+                      "lastPage" => last_page }.compact
+
+        id = normalize_id(meta.fetch("id", nil) || meta.fetch("DOI", nil))
+
+        id = normalize_doi(options[:doi] || options[:id] || meta.fetch("DOI", nil))
+        title = if meta.fetch("title", nil).is_a?(Array)
+            meta.fetch("title", nil)[0]
+          else
+            meta.fetch("title", nil)
+          end
+        title = title.blank? ? ":(unav)" : title.squish
+        state = meta.present? || read_options.present? ? "findable" : "not_found"
+        subjects = Array.wrap(meta.fetch("categories", nil)).reduce([]) do |sum, subject|
           sum += name_to_fos(subject)
 
           sum
         end
-        abstract = meta.fetch('abstract', nil)
+        abstract = meta.fetch("abstract", nil)
         provider = get_doi_ra(id)
 
-        { 'id' => id,
-          'type' => type,
-          'url' => normalize_id(meta.dig('resource', 'primary', 'URL')),
-          'titles' => [{ 'title' => title }],
-          'creators' => creators,
-          'contributors' => contributors,
-          'container' => container,
-          'publisher' => publisher,
-          'references' => references,
-          'date' => date.compact,
-          'descriptions' => if abstract.present?
-                              [{ 'description' => sanitize(abstract),
-                                 'descriptionType' => 'Abstract' }]
-                            else
-                              []
-                            end,
-          'license' => license,
-          'alternate_identifiers' => [],
-          'funding_references' => funding_references,
-          'version' => meta.fetch('version', nil),
-          'subjects' => subjects,
-          'provider' => provider,
-          'schema_version' => 'http://datacite.org/schema/kernel-4',
-          'state' => state }.compact.merge(read_options)
+        { "id" => id,
+          "type" => type,
+          "url" => normalize_id(meta.dig("resource", "primary", "URL")),
+          "titles" => [{ "title" => title }],
+          "contributors" => contributors,
+          "container" => container,
+          "publisher" => publisher,
+          "references" => references,
+          "date" => date.compact,
+          "descriptions" => if abstract.present?
+          [{ "description" => sanitize(abstract),
+             "descriptionType" => "Abstract" }]
+        else
+          []
+        end,
+          "license" => license,
+          "alternate_identifiers" => [],
+          "funding_references" => funding_references,
+          "files" => files.presence,
+          "version" => meta.fetch("version", nil),
+          "subjects" => subjects,
+          "provider" => provider,
+          "schema_version" => "http://datacite.org/schema/kernel-4",
+          "state" => state }.compact.merge(read_options)
       end
 
       def get_reference(reference)
         return nil unless reference.present? || !reference.is_a?(Hash)
 
-        doi = reference.dig('DOI')
+        doi = reference.dig("DOI")
         {
-          'key' => reference.dig('key'),
-          'doi' => doi ? normalize_doi(doi) : nil,
-          'creator' => reference.dig('author'),
-          'title' => reference.dig('article-title'),
-          'publisher' => reference.dig('publisher'),
-          'publicationYear' => reference.dig('year'),
-          'volume' => reference.dig('volume'),
-          'issue' => reference.dig('issue'),
-          'firstPage' => reference.dig('first-page'),
-          'lastPage' => reference.dig('last-page'),
-          'containerTitle' => reference.dig('journal-title'),
-          'edition' => nil,
-          'contributor' => nil,
-          'unstructured' => doi.nil? ? reference.dig('unstructured') : nil
+          "key" => reference.dig("key"),
+          "doi" => doi ? normalize_doi(doi) : nil,
+          "contributor" => reference.dig("author"),
+          "title" => reference.dig("article-title"),
+          "publisher" => reference.dig("publisher"),
+          "publicationYear" => reference.dig("year"),
+          "volume" => reference.dig("volume"),
+          "issue" => reference.dig("issue"),
+          "firstPage" => reference.dig("first-page"),
+          "lastPage" => reference.dig("last-page"),
+          "containerTitle" => reference.dig("journal-title"),
+          "edition" => nil,
+          "unstructured" => doi.nil? ? reference.dig("unstructured") : nil,
         }.compact
       end
     end

data/lib/commonmeta/readers/crossref_xml_reader.rb

@@ -101,6 +101,9 @@ module Commonmeta
         resource_type = resource_type.present? ? resource_type.underscore.camelcase : nil
         type = Commonmeta::Utils::CR_TO_CM_TRANSLATIONS.fetch(resource_type, 'Other')
 
+        contributors = crossref_people(bibmeta, 'author')
+        contributors += crossref_people(bibmeta, 'editor')
+
         titles = if bibmeta['titles'].present?
                    Array.wrap(bibmeta['titles']).map do |r|
                      if r.blank? || (r['title'].blank? && r['original_language_title'].blank?)
@@ -192,8 +195,7 @@ module Commonmeta
           'url' => url,
           'titles' => titles,
           'alternate_identifiers' => alternate_identifiers,
-          'creators' => crossref_people(bibmeta, 'author'),
-          'contributors' => crossref_people(bibmeta, 'editor'),
+          'contributors' =>  contributors,
           'funding_references' => crossref_funding_reference(program_metadata),
           'publisher' => { 'name' => publisher },
           'container' => container,
@@ -296,11 +298,11 @@ module Commonmeta
               'givenName' => given_name,
               'familyName' => family_name,
               'affiliation' => affiliation.presence,
-              'contributorType' => contributor_role == 'editor' ? 'Editor' : nil }.compact
+              'contributorRoles' => contributor_role == 'editor' ? ['Editor'] : ['Author'] }.compact
           else
             { 'type' => 'Organization',
               'name' => a['name'] || a['__content__'],
-              'contributorType' => contributor_role == 'editor' ? 'Editor' : nil }.compact
+              'contributorRoles' => contributor_role == 'editor' ? ['Editor'] : ['Author'] }.compact
           end
         end
       end
@@ -359,7 +361,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('cYear'),
@@ -369,7 +371,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.unwrap

data/lib/commonmeta/readers/csl_reader.rb

@@ -17,12 +17,12 @@ module Commonmeta
         citeproc_type = meta.fetch('type', nil)
         type = Commonmeta::Utils::CSL_TO_CM_TRANSLATIONS.fetch(citeproc_type, 'Other')
 
-        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
-                     [{ 'type' => 'Organization', 'name' => ':(unav)' }]
+                     [{ 'type' => 'Organization', 'name' => ':(unav)', 'contributorRoles' => ['Author'] }]
                    end
-        contributors = get_authors(from_csl(Array.wrap(meta.fetch('editor', nil))))
+        contributors += get_authors(from_csl(Array.wrap(meta.fetch('editor', nil))))
 
         date = {}
         d = get_date_from_date_parts(meta.fetch('issued', nil))
@@ -62,7 +62,6 @@ module Commonmeta
           'type' => type,
           'url' => normalize_id(meta.fetch('URL', nil)),
           'titles' => [{ 'title' => meta.fetch('title', nil) }],
-          'creators' => creators,
           'contributors' => contributors,
           'container' => container,
           'publisher' => if meta.fetch('publisher', nil)

data/lib/commonmeta/readers/datacite_reader.rb

@@ -53,10 +53,10 @@ module Commonmeta
         titles = Array.wrap(meta.fetch('titles', nil)).map do |title|
           title.compact
         end
-        creators = get_authors(from_datacite(meta.fetch('creators', nil)))
+        contributors = get_authors(from_datacite(meta.fetch('creators', nil)))
+        contributors += get_authors(from_datacite(meta.fetch('contributors', nil)))
         publisher = { 'name' => meta.fetch('publisher', nil) }
 
-        contributors = get_authors(from_datacite(meta.fetch('contributors', nil)))
         container = meta.fetch('container', nil)
         funding_references = meta.fetch('funding_references', nil)
 
@@ -88,6 +88,7 @@ module Commonmeta
                      end.map do |reference|
           get_datacite_reference(reference)
         end
+        files = Array.wrap(meta.fetch("content_url", nil)).map { |file| { "url" => file } }    
         formats = meta.fetch('formats', nil)
         sizes = meta.fetch('sizes', nil)
         schema_version = meta.fetch('schema_version', nil) || 'http://datacite.org/schema/kernel-4'
@@ -98,7 +99,6 @@ module Commonmeta
           'additional_type' => resource_type == type ? nil : resource_type,
           'url' => url,
           'titles' => titles,
-          'creators' => creators,
           'contributors' => contributors,
           'container' => container,
           'publisher' => publisher,
@@ -106,6 +106,7 @@ module Commonmeta
           'alternate_identifiers' => alternate_identifiers.presence,
           'references' => references,
           'funding_references' => funding_references,
+          'files' => files.presence,
           'date' => date.compact,
           'descriptions' => descriptions,
           'license' => license,
@@ -150,7 +151,7 @@ module Commonmeta
           'key' => key,
           'doi' => doi,
           'url' => url,
-          'creator' => reference.dig('author'),
+          'contributor' => reference.dig('author'),
           'title' => reference.dig('article-title'),
           'publisher' => reference.dig('publisher'),
           'publicationYear' => reference.dig('year'),
@@ -160,7 +161,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/json_feed_reader.rb

@@ -20,12 +20,16 @@ module Commonmeta
 
         meta = string.present? ? JSON.parse(string) : {}
 
-        url = normalize_url(meta.fetch("url", nil))
+        if (meta.dig("blog", "status") == "archived")
+          url = normalize_url(meta.fetch("archive_url", nil))
+        else
+          url = normalize_url(meta.fetch("url", nil))
+        end
         id = options[:doi] ? normalize_doi(options[:doi]) : normalize_id(meta.fetch("doi", nil))
-        id = url if id.blank? && url.present?
+        id = normalize_url(meta.fetch("url", nil)) if id.blank?
 
         type = "Article"
-        creators = if meta.fetch("authors", nil).present?
+        contributors = if meta.fetch("authors", nil).present?
             get_authors(from_json_feed(Array.wrap(meta.fetch("authors"))))
           else
             [{ "type" => "Organization", "name" => ":(unav)" }]
@@ -70,7 +74,7 @@ module Commonmeta
           "type" => type,
           "url" => url,
           "titles" => titles,
-          "creators" => creators,
+          "contributors" => contributors,
           "publisher" => publisher,
           "container" => container,
           "date" => date,

data/lib/commonmeta/readers/npm_reader.rb

@@ -26,7 +26,7 @@ module Commonmeta
 
         type = 'Software'
 
-        creators = get_authors(Array.wrap(meta.fetch('author', nil)))
+        contributors = get_authors(Array.wrap(meta.fetch('author', nil)))
         license = hsh_to_spdx('rightsIdentifier' => meta.fetch('license', nil))
 
         # container = if meta.fetch("container-title", nil).present?
@@ -71,7 +71,7 @@ module Commonmeta
           # "doi" => doi_from_url(doi),
           # "url" => normalize_id(meta.fetch("URL", nil)),
           'titles' => [{ 'title' => meta.fetch('name', nil) }],
-          'creators' => creators,
+          'contributors' => contributors,
           # "contributors" => contributors,
           # "container" => container,
           # "publisher" => meta.fetch("publisher", nil),

data/lib/commonmeta/readers/ris_reader.rb

@@ -41,7 +41,7 @@ module Commonmeta
           'type' => type,
           'url' => meta.fetch('UR', nil),
           'titles' => meta.fetch('T1', nil).present? ? [{ 'title' => meta.fetch('T1', nil) }] : nil,
-          'creators' => get_authors(author),
+          'contributors' => get_authors(author),
           'publisher' => { 'name' => meta.fetch('PB', '(:unav)') },
           'container' => container,
           'date' => date,

data/lib/commonmeta/readers/schema_org_reader.rb

@@ -106,8 +106,9 @@ module Commonmeta
         additional_type = meta.fetch('additionalType', nil)
         authors = meta.fetch('author', nil) || meta.fetch('creator', nil)
         # Authors should be an object, if it's just a plain string don't try and parse it.
-        creators = get_authors(from_schema_org(Array.wrap(authors))) unless authors.is_a?(String)
-        contributors = get_authors(from_schema_org(Array.wrap(meta.fetch('editor', nil))))
+        contributors = get_authors(from_schema_org(Array.wrap(authors))) unless authors.is_a?(String)
+        contributors = [] if contributors.nil?
+        contributors += get_authors(from_schema_org(Array.wrap(meta.fetch('editor', nil))))
         publisher = parse_attributes(meta.fetch('publisher', nil), content: 'name', first: true)
 
         ct = schema_org == 'Dataset' ? 'includedInDataCatalog' : 'Periodical'
@@ -206,6 +207,8 @@ module Commonmeta
           }.compact
         end
 
+        files = Array.wrap(meta.fetch("contentUrl", nil)).map { |file| { "url" => file } }    
+        
         # handle keywords as array and as comma-separated string
         subjects = meta.fetch('keywords', nil)
         subjects = subjects.to_s.split(', ') if subjects.is_a?(String)
@@ -221,7 +224,7 @@ module Commonmeta
           'additional_type' => additional_type,
           'alternate_identifiers' => alternate_identifiers.presence,
           'url' => normalize_id(meta.fetch('url', nil)),
-          'content_url' => Array.wrap(meta.fetch('contentUrl', nil)),
+          'files' => files.presence,
           'sizes' => Array.wrap(meta.fetch('contenSize', nil)),
           'formats' => Array.wrap(meta.fetch('encodingFormat',
                                              nil) || meta.fetch('fileFormat', nil)),
@@ -230,7 +233,6 @@ module Commonmeta
                       else
                         [{ 'title' => meta.fetch('headline', nil) }]
                       end,
-          'creators' => creators,
           'contributors' => contributors,
           'publisher' => { 'name' => publisher },
           'provider' => parse_attributes(meta.fetch('provider', nil), content: 'name', first: true),

data/lib/commonmeta/schema_utils.rb

@@ -5,7 +5,7 @@ require "pathname"
 
 module Commonmeta
   module SchemaUtils
-    COMMONMETA = File.read(File.expand_path("../../resources/commonmeta_v0.9.3.json",
+    COMMONMETA = File.read(File.expand_path("../../resources/commonmeta_v0.10.3.json",
                                             __dir__))
 
     def json_schema_errors

data/lib/commonmeta/utils.rb

@@ -869,7 +869,7 @@ module Commonmeta
     end
 
     def map_hash_keys(element: nil, mapping: nil)
-      Array.wrap(element).map do |a|
+      a = Array.wrap(element).map do |a|
         a.map { |k, v| [mapping.fetch(k, k), v] }.reduce({}) do |hsh, (k, v)|
           if k == "affiliation" && v.is_a?(Array)
             hsh[k] = v.map do |affiliation|
@@ -883,6 +883,8 @@ module Commonmeta
           elsif k == "type" && v.is_a?(String)
             hsh[k] = v.capitalize
             hsh
+          elsif k == "contributorRoles"
+            hsh
           elsif v.is_a?(Hash)
             hsh[k] = to_schema_org(v)
             hsh
@@ -930,7 +932,7 @@ module Commonmeta
         a["given"] = a["givenName"]
         a["literal"] = a["name"] unless a["familyName"].present?
         a.except("nameType", "type", "@type", "id", "@id", "name", "familyName", "givenName",
-                 "affiliation", "contributorType").compact
+                 "affiliation", "contributorRoles").compact
       end.presence
     end
 

data/lib/commonmeta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Commonmeta
-  VERSION = '3.4.5'
+  VERSION = '3.5.1'
 end

data/lib/commonmeta/writers/bibtex_writer.rb

@@ -13,7 +13,7 @@ module Commonmeta
           bibtex_key: normalize_id(id),
           doi: doi_from_url(id),
           url: url,
-          author: authors_as_string(creators),
+          author: authors_as_string(contributors),
           keywords: if subjects.present?
                       Array.wrap(subjects).map do |k|
                         parse_attributes(k, content: 'subject', first: true)

data/lib/commonmeta/writers/cff_writer.rb

@@ -10,14 +10,15 @@ module Commonmeta
         return nil unless %w[Software Collection].include?(type)
 
         title = parse_attributes(titles, content: 'title', first: true)
-
+        authors = Array.wrap(contributors).select { |c| c['contributorRoles'] == ['Author'] }
+      
         hsh = {
           'cff-version' => '1.2.0',
           'message' => "If you use #{title} in your research, please cite it using the following metadata",
           'doi' => normalize_doi(id),
           'repository-code' => url,
           'title' => title,
-          'authors' => write_cff_creators(creators),
+          'authors' => write_cff_contributors(authors),
           'abstract' => parse_attributes(descriptions, content: 'description', first: true),
           'version' => version,
           'keywords' => if subjects.present?
@@ -34,8 +35,8 @@ module Commonmeta
         hsh.to_yaml
       end
 
-      def write_cff_creators(creators)
-        Array.wrap(creators).map do |a|
+      def write_cff_contributors(contributors)
+        Array.wrap(contributors).map do |a|
           if a['givenName'].present? || a['id'].present?
             { 'given-names' => a['givenName'],
               'family-names' => a['familyName'],