briard 2.7.1 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d66bec4bcc510e9852889eac37463af37edd73517bd852afdaa77f4e9f06f9
-  data.tar.gz: 4d50717dbd4d1ff8944ffb94ed7a9396879cfa1b8b7fefaa8efb38f00a8c27ae
+  metadata.gz: debbaf7e340fa77df735b4443f7bf7120842908f9223250ce905e398c4754df5
+  data.tar.gz: fb782cc48aeaa3435ef4b9eb4004de44786ea3dbb257c653ce62213e55ab6612
 SHA512:
-  metadata.gz: 414c0b2dc8daa281d9b4611d4af896e510ebd878bc17128e9e08af78d12441cedfd7f30e2c81bdc34f3ecb91d455314e0979ec6b24f1fb6ee580895bb15436de
-  data.tar.gz: 042afdd61e0ba95031ae621fd4db19641091a44de66f1e201f32c5ca2ecd412622d0b546e60b9f541d6792af6a9e049c7f360f35ab6e3bc98d28bd17d2a1fda9
+  metadata.gz: dd60f155303d1e52ec8acf01ae8b648cc4625a10e52473f613a1aa34ed0b7f8b4f7af42dff2938f7b35bfdfd8c62bc0ae1e58e17a799d816470c0743df945118
+  data.tar.gz: 056d24ffef47ed0a3f04a5222464a507b18a00b1f573e437ac10c8de2dd89b581da7ae507528b23039f5c7a7ead79c042b566b9d37bf259482ac59f104cdcec3

data/.github/workflows/rubocop.yml

@@ -42,9 +42,9 @@ jobs:
           [[ $? -ne 2 ]]
         "
 
-    # - name: Upload Sarif output
-    #   if: steps.check_files.outputs.files_exists == 'true'
-    #   uses: github/codeql-action/upload-sarif@v2
-    #   with:
-    #     # Path to SARIF file relative to the root of the repository
-    #     sarif_file: rubocop.sarif
+    - name: Upload Sarif output
+      if: steps.check_files.outputs.files_exists == 'true'
+      uses: github/codeql-action/upload-sarif@v2
+      with:
+        # Path to SARIF file relative to the root of the repository
+        sarif_file: rubocop.sarif

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [v2.8.0](https://github.com/front-matter/briard/tree/v2.8.0) (2022-11-22)
+
+[Full Changelog](https://github.com/front-matter/briard/compare/v2.6.5...v2.8.0)
+
 ## [v2.6.5](https://github.com/front-matter/briard/tree/v2.6.5) (2022-10-04)
 
 [Full Changelog](https://github.com/front-matter/briard/compare/v2.6.4...v2.6.5)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    briard (2.7.1)
+    briard (2.8.1)
       activesupport (>= 4.2.5, < 8.0)
       base32-url (>= 0.5.0, < 1)
       benchmark_methods (~> 0.7)
@@ -19,7 +19,7 @@ PATH
       iso8601 (~> 0.9.1)
       json-ld-preloaded (~> 3.1, >= 3.1.3)
       jsonlint (~> 0.3.0)
-      loofah (~> 2.0, >= 2.0.3)
+      loofah (~> 2.19)
       maremma (>= 4.9.7, < 5)
       namae (~> 1.0)
       nokogiri (~> 1.13.1)

data/README.md

@@ -28,6 +28,13 @@ Briard reads and/or writes these metadata formats:
       <td>application/vnd.crossref.unixref+xml</td>
       <td>Yes</td>
       <td>Yes</td>
+   </tr>
+    <tr>
+      <td><a href='https://api.crossref.org'>CrossRef JSON</a></td>
+      <td>crossref_json</td>
+      <td>application/vnd.crossref+json</td>
+      <td>Yes</td>
+      <td>No</td>
    </tr>
     <tr>
       <td><a href='https://schema.datacite.org/'>DataCite XML</a></td>

data/briard.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'iso8601', '~> 0.9.1'
   s.add_dependency 'json-ld-preloaded', '~> 3.1', '>= 3.1.3'
   s.add_dependency 'jsonlint', '~> 0.3.0'
-  s.add_dependency 'loofah', '~> 2.0', '>= 2.0.3'
+  s.add_dependency 'loofah', '~> 2.19'
   s.add_dependency 'maremma', '>= 4.9.7', '< 5'
   s.add_dependency 'namae', '~> 1.0'
   s.add_dependency 'nokogiri', '~> 1.13.1'

data/lib/briard/author_utils.rb

@@ -18,17 +18,18 @@ module Briard
       return nil if author.fetch('creatorName', nil).is_a?(Array)
 
       name = parse_attributes(author.fetch('creatorName', nil)) ||
-             parse_attributes(author.fetch('contributorName', nil))
-      given_name = parse_attributes(author.fetch('givenName', nil))
-      family_name = parse_attributes(author.fetch('familyName', nil))
+             parse_attributes(author.fetch('contributorName', nil)) ||
+             parse_attributes(author.fetch('name', 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)
       name = [family_name, given_name].join(', ') if family_name.present? && given_name.present?
       contributor_type = parse_attributes(author.fetch('contributorType', nil))
 
       name_type = parse_attributes(author.fetch('creatorName', nil), content: 'nameType',
-                                                                     first: true) || parse_attributes(author.fetch('contributorName', nil), content: 'nameType',
-                                                                                                                                            first: true)
-
+                                                                     first: true) || parse_attributes(author.fetch('contributorName', nil), content: 'nameType',                                                                             first: true)
       name_identifiers = Array.wrap(author.fetch('nameIdentifier', nil)).map do |ni|
         if ni['nameIdentifierScheme'] == 'ORCID'
           {
@@ -51,21 +52,38 @@ module Briard
         end
       end.presence
 
-      author = { 'nameType' => name_type,
-                 'name' => name,
-                 'givenName' => given_name,
-                 'familyName' => family_name,
-                 'nameIdentifiers' => name_identifiers,
-                 'affiliation' => get_affiliations(author.fetch('affiliation', nil)),
-                 'contributorType' => contributor_type }.compact
+      # Crossref metadata
+      if name_identifiers.blank? && author['ORCID'].present?
+        name_identifiers = [{
+          'nameIdentifier' => normalize_orcid(author.fetch('ORCID')),
+          'schemeUri' => 'https://orcid.org',
+          'nameIdentifierScheme' => 'ORCID' }]
+      end
+
+      if name_type.blank? && Array.wrap(name_identifiers).find { |ni| ni['nameIdentifierScheme'] == 'ORCID' }.present?
+        name_type = 'Personal'
+      elsif name_type.blank? && Array.wrap(name_identifiers).find { |ni| %w(ISNI ROR).include? ni['nameIdentifierScheme'] }.present?
+        name_type = 'Organizational'
+      elsif name_type.blank? && is_personal_name?(given_name: given_name, name: name) && name.to_s.exclude?(';')
+        name_type = 'Personal'
+      end
+
+      author = { 
+        'nameType' => name_type,
+        'name' => name,
+        'givenName' => given_name,
+        'familyName' => family_name,
+        'nameIdentifiers' => name_identifiers,
+        'affiliation' => get_affiliations(author.fetch('affiliation', nil)),
+        'contributorType' => contributor_type }.compact
 
       return author if family_name.present?
 
-      if is_personal_name?(author)
+      if name_type == 'Personal'
         Namae.options[:include_particle_in_family] = true
         names = Namae.parse(name)
         parsed_name = names.first
-
+        
         if parsed_name.present?
           given_name = parsed_name.given
           family_name = parsed_name.family
@@ -79,14 +97,14 @@ module Briard
           'name' => name,
           'givenName' => given_name,
           'familyName' => family_name,
-          'nameIdentifiers' => Array.wrap(name_identifiers),
-          'affiliation' => Array.wrap(author.fetch('affiliation', nil)),
+          'nameIdentifiers' => name_identifiers,
+          'affiliation' => get_affiliations(author.fetch('affiliation', nil)),
           'contributorType' => contributor_type }.compact
       else
         { 'nameType' => name_type,
           'name' => name,
-          'nameIdentifiers' => Array.wrap(name_identifiers),
-          'affiliation' => Array.wrap(author.fetch('affiliation', nil)),
+          'nameIdentifiers' => name_identifiers,
+          'affiliation' => get_affiliations(author.fetch('affiliation', nil)),
           'contributorType' => contributor_type }.compact
       end
     end
@@ -102,21 +120,16 @@ module Briard
       # remove spaces around hyphens
       author = author.gsub(' - ', '-')
 
-      # titleize strings
       # remove non-standard space characters
-      author.my_titleize.gsub(/[[:space:]]/, ' ')
+      author.gsub(/[[:space:]]/, ' ')
     end
 
-    def is_personal_name?(author)
-      return false if author.fetch('nameType', nil) == 'Organizational'
-      return true if Array.wrap(author.fetch('nameIdentifiers', nil)).find do |a|
-                       a['nameIdentifierScheme'] == 'ORCID'
-                     end.present? ||
-                     author.fetch('familyName', '').present? ||
-                     (author.fetch('name', '').include?(',') &&
-                     author.fetch('name', '').exclude?(';')) ||
-                     name_exists?(author.fetch('name', '').split.first)
-
+    # check if given name is in the database of known given names:
+    # https://github.com/bmuller/gender_detector
+    def is_personal_name?(given_name: nil, name: nil)
+      return true if name_exists?(given_name.to_s) ||
+                     name_exists?(name.to_s.split.first) ||
+                     name_exists?(name.to_s.split(', ').last)
       false
     end
 
@@ -145,6 +158,8 @@ module Briard
     end
 
     def get_affiliations(affiliations)
+      return nil unless affiliations.present?
+
       Array.wrap(affiliations).map do |a|
         affiliation_identifier = nil
         if a.is_a?(String)
@@ -159,16 +174,18 @@ module Briard
             end
             affiliation_identifier = !affiliation_identifier.to_s.start_with?('https://') && schemeURI.present? ? normalize_id(schemeURI + affiliation_identifier) : normalize_id(affiliation_identifier)
           end
-          name = a['__content__'].to_s.squish.presence
+          name = (a['name'] || a['__content__']).to_s.squish.presence
           affiliation_identifier_scheme = a['affiliationIdentifierScheme']
           scheme_uri = a['SchemeURI']
         end
 
+        next unless name.present?
+
         { 'name' => name,
           'affiliationIdentifier' => affiliation_identifier,
           'affiliationIdentifierScheme' => affiliation_identifier_scheme,
           'schemeUri' => scheme_uri }.compact
-      end.presence
+      end.compact.presence
     end
   end
 end

data/lib/briard/doi_utils.rb

@@ -27,11 +27,15 @@ module Briard
       sandbox.present? || options[:sandbox] ? 'https://handle.stage.datacite.org/' : 'https://doi.org/'
     end
 
-    def doi_api_url(doi, options = {})
+    def datacite_api_url(doi, options = {})
       sandbox = Array(/handle\.stage\.datacite.\org/.match(doi)).last
       sandbox.present? || options[:sandbox] ? "https://api.stage.datacite.org/dois/#{doi_from_url(doi)}?include=media,client" : "https://api.datacite.org/dois/#{doi_from_url(doi)}?include=media,client"
     end
 
+    def crossref_api_url(doi, options = {})
+      "https://api.crossref.org/works/#{doi_from_url(doi)}"
+    end
+
     def normalize_doi(doi, options = {})
       doi_str = validate_doi(doi)
       return nil unless doi_str.present?

data/lib/briard/metadata.rb

@@ -18,26 +18,7 @@ module Briard
       id = normalize_id(options[:input], options)
       ra = nil
 
-      if id.present?
-        @from = options[:from] || find_from_format(id: id)
-
-        # mEDRA, KISTI, JaLC and OP DOIs are found in the Crossref index
-        case @from
-        when 'medra'
-          ra = 'mEDRA'
-        when 'kisti'
-          ra = 'KISTI'
-        when 'jalc'
-          ra = 'JaLC'
-        when 'op'
-          ra = 'OP'
-        end
-
-        # generate name for method to call dynamically
-        hsh = @from.present? ? send("get_#{@from}", id: id, sandbox: options[:sandbox]) : {}
-        string = hsh.fetch('string', nil)
-
-      elsif options[:input].present? && File.exist?(options[:input])
+      if options[:input].present? && File.exist?(options[:input])
         filename = File.basename(options[:input])
         ext = File.extname(options[:input])
         if %w[.bib .ris .xml .json .cff].include?(ext)
@@ -59,6 +40,24 @@ module Briard
           warn "File type #{ext} not supported"
           exit 1
         end
+      elsif id.present?
+        @from = options[:from] || find_from_format(id: id)
+
+        # mEDRA, KISTI, JaLC and OP DOIs are found in the Crossref index
+        case @from
+        when 'medra'
+          ra = 'mEDRA'
+        when 'kisti'
+          ra = 'KISTI'
+        when 'jalc'
+          ra = 'JaLC'
+        when 'op'
+          ra = 'OP'
+        end
+
+        # generate name for method to call dynamically
+        hsh = @from.present? ? send("get_#{@from}", id: id, **options) : {}
+        string = hsh.fetch('string', nil)
       else
         hsh = {
           'url' => options[:url],

data/lib/briard/metadata_utils.rb

@@ -11,6 +11,7 @@ require_relative 'readers/citeproc_reader'
 require_relative 'readers/cff_reader'
 require_relative 'readers/codemeta_reader'
 require_relative 'readers/crosscite_reader'
+require_relative 'readers/crossref_json_reader'
 require_relative 'readers/crossref_reader'
 require_relative 'readers/datacite_json_reader'
 require_relative 'readers/datacite_reader'
@@ -48,6 +49,7 @@ module Briard
     include Briard::Readers::CffReader
     include Briard::Readers::CodemetaReader
     include Briard::Readers::CrossciteReader
+    include Briard::Readers::CrossrefJsonReader
     include Briard::Readers::CrossrefReader
     include Briard::Readers::DataciteReader
     include Briard::Readers::DataciteJsonReader

data/lib/briard/readers/crossref_json_reader.rb

@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+module Briard
+    module Readers
+      module CrossrefJsonReader
+        def get_crossref_json(id: nil, **options)
+          return { 'string' => nil, 'state' => 'not_found' } unless id.present?
+
+          url = crossref_api_url(id, options)
+          response = Maremma.get(url, raw: true)
+          string = response.body.fetch('data', nil)
+
+          { 'string' => string }
+        end
+
+        def read_crossref_json(string: nil, **options)
+          if string.present?
+            errors = jsonlint(string)
+            return { 'errors' => errors } if errors.present?
+          end
+  
+          read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url,
+                                                                                     :sandbox, :validate, :ra))
+  
+          meta = string.present? ? Maremma.from_json(string).fetch('message', {}) : {}
+  
+          resource_type = meta.fetch('type', nil)
+          resource_type = resource_type.present? ? resource_type.underscore.camelcase : nil
+
+          types = {
+            'resourceTypeGeneral' => Briard::Utils::CR_TO_DC_TRANSLATIONS[resource_type] || 'Text',
+            'resourceType' => resource_type,
+            'schemaOrg' => Briard::Utils::CR_TO_SO_TRANSLATIONS[resource_type] || 'CreativeWork',
+            'citeproc' => Briard::Utils::CR_TO_CP_TRANSLATIONS[resource_type] || 'article-journal',
+            'bibtex' => Briard::Utils::CR_TO_BIB_TRANSLATIONS[resource_type] || 'misc',
+            'ris' => Briard::Utils::CR_TO_RIS_TRANSLATIONS[resource_type] || 'GEN'
+          }.compact
+  
+          creators = if meta.fetch('author', nil).present?
+                       get_authors(from_citeproc(Array.wrap(meta.fetch('author', nil))))
+                     else
+                       [{ 'nameType' => 'Organizational', 'name' => ':(unav)' }]
+                     end
+          editors = Array.wrap(meta.fetch('editor', nil)).each {|e| e['contributorType'] = "Editor"}
+          contributors = get_authors(from_citeproc(editors))
+          
+          published_date = get_date_from_date_parts(meta.fetch('issued', nil)) || get_date_from_date_parts(meta.fetch('created', nil))
+          updated_date = get_date_from_date_parts(meta.fetch('deposited', nil))
+          dates = [{ 'date' => published_date, 'dateType' => 'Issued' }]
+          dates << { 'date' => updated_date, 'dateType' => 'Updated' } if updated_date.present?
+          publication_year = published_date.to_s[0..3]
+          date_registered = get_date_from_date_parts(meta.fetch('registered', nil)) || get_date_from_date_parts(meta.fetch('created', nil))
+
+          rights_list = 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?
+
+          related_identifiers = if meta.fetch('container-title',
+                                              nil).present? && issn.present?
+                                  [{ 'relationType' => 'IsPartOf',
+                                     'relatedIdentifierType' => 'ISSN',
+                                     'resourceTypeGeneral' => 'Collection',
+                                     'relatedIdentifier' => issn }.compact]
+                                else
+                                  []
+                                end
+          related_identifiers += Array.wrap(meta.fetch('reference', nil)).map do |ref|
+            doi = ref.fetch('DOI', nil)
+            next unless doi.present?
+
+            { 'relationType' => 'References',
+              'relatedIdentifierType' => 'DOI',
+              'relatedIdentifier' => doi.downcase }
+          end.compact
+
+          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
+            }.compact
+            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
+          container_type = case resource_type
+                           when 'JournalArticle', 'JournalIssue'
+                             'Journal'
+                           when 'BookChapter'
+                             'Book'
+                           when 'Monograph'
+                             'BookSeries'
+                           else
+                             'Periodical'
+                           end                         
+
+          container = if meta.fetch('container-title', nil).present?
+                        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
+  
+                        { 'type' => container_type,
+                          'title' => parse_attributes(meta.fetch('container-title', nil), first: true).to_s.squish,
+                          'identifier' => issn,
+                          'identifierType' => issn.present? ? 'ISSN' : nil,
+                          'volume' => meta.fetch('volume', nil),
+                          'issue' => meta.fetch('issue', nil),
+                          'firstPage' => first_page,
+                          'lastPage' => last_page }.compact
+                      end
+  
+          id = normalize_id(meta.fetch('id', nil) || meta.fetch('DOI', nil))
+
+          id = normalize_doi(options[:doi] || options[:id] || meta.fetch('DOI', nil))
+          title = meta.fetch('title', nil).is_a?(Array) ? meta.fetch('title', nil)[0] : meta.fetch('title', nil)
+          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)
+          agency = get_doi_ra(id)
+  
+          { 'id' => id,
+            'types' => types,
+            'doi' => doi_from_url(id),
+            'url' => normalize_id(meta.dig('resource', 'primary', 'URL')),
+            'titles' => [{ 'title' => title }],
+            'creators' => creators,
+            'contributors' => contributors,
+            'container' => container,
+            'publisher' => meta.fetch('publisher', nil),
+            'related_identifiers' => related_identifiers,
+            'dates' => dates,
+            'publication_year' => publication_year,
+            'descriptions' => if abstract.present?
+                                [{ 'description' => sanitize(abstract),
+                                   'descriptionType' => 'Abstract' }]
+                              else
+                                []
+                              end,
+            'rights_list' => rights_list,
+            'identifiers' => [],
+            'funding_references' => funding_references,
+            'version_info' => meta.fetch('version', nil),
+            'subjects' => subjects,
+            'agency' => agency,
+            'date_registered' => date_registered,
+            'state' => state }.merge(read_options)
+        end
+      end
+    end
+  end
+  

data/lib/briard/readers/crossref_reader.rb

@@ -105,14 +105,14 @@ module Briard
         end
 
         resource_type = (resource_type || model).to_s.underscore.camelcase.presence
-        schema_org = Briard::Utils::CR_TO_SO_TRANSLATIONS[resource_type] || 'ScholarlyArticle'
+        schema_org = Briard::Utils::CR_TO_SO_TRANSLATIONS[resource_type] || 'CreativeWork'
         types = {
           'resourceTypeGeneral' => Briard::Utils::CR_TO_DC_TRANSLATIONS[resource_type],
           'resourceType' => resource_type,
           'schemaOrg' => schema_org,
           'citeproc' => Briard::Utils::CR_TO_CP_TRANSLATIONS[resource_type] || 'article-journal',
           'bibtex' => Briard::Utils::CR_TO_BIB_TRANSLATIONS[resource_type] || 'misc',
-          'ris' => Briard::Utils::CR_TO_RIS_TRANSLATIONS[resource_type] || 'JOUR'
+          'ris' => Briard::Utils::CR_TO_RIS_TRANSLATIONS[resource_type] || 'GEN'
         }.compact
 
         titles = if bibliographic_metadata['titles'].present?
@@ -221,7 +221,7 @@ module Briard
           'funding_references' => crossref_funding_reference(program_metadata),
           'publisher' => publisher,
           'container' => container,
-          'agency' => agency = options[:ra] || 'crossref',
+          'agency' => agency = options[:ra] || 'Crossref',
           'related_identifiers' => related_identifiers,
           'dates' => dates,
           'publication_year' => publication_year,

data/lib/briard/readers/datacite_reader.rb

@@ -6,7 +6,7 @@ module Briard
       def get_datacite(id: nil, **options)
         return { 'string' => nil, 'state' => 'not_found' } unless id.present?
 
-        api_url = doi_api_url(id, options)
+        api_url = datacite_api_url(id, options)
         response = Maremma.get(api_url)
         attributes = response.body.dig('data', 'attributes')
         return { 'string' => nil, 'state' => 'not_found' } unless attributes.present?

data/lib/briard/utils.rb

@@ -110,12 +110,13 @@ module Briard
     CR_TO_CP_TRANSLATIONS = {
       'Proceedings' => nil,
       'ReferenceBook' => nil,
-      'JournalIssue' => nil,
+      'JournalIssue' => 'article-journal',
       'ProceedingsArticle' => 'paper-conference',
       'Other' => nil,
       'Dissertation' => 'thesis',
       'Dataset' => 'dataset',
       'EditedBook' => 'book',
+      'PostedContent' => 'article-journal',
       'JournalArticle' => 'article-journal',
       'Journal' => nil,
       'Report' => 'report',
@@ -252,7 +253,7 @@ module Briard
       'BookChapter' => 'BookChapter',
       'SaComponent' => 'Text',
       'StandardSeries' => 'Standard',
-      'Monograph' => 'book',
+      'Monograph' => 'Book',
       'Component' => nil,
       'ReferenceEntry' => nil,
       'JournalVolume' => nil,
@@ -355,8 +356,9 @@ module Briard
 
     CR_TO_RIS_TRANSLATIONS = {
       'Proceedings' => 'CONF',
+      'PostedContent' => 'JOUR',
       'ReferenceBook' => 'BOOK',
-      'JournalIssue' => nil,
+      'JournalIssue' => 'JOUR',
       'ProceedingsArticle' => 'CPAPER',
       'Other' => 'GEN',
       'Dissertation' => 'THES',
@@ -544,6 +546,8 @@ module Briard
       elsif options[:ext] == '.json' && URI(Maremma.from_json(string).to_h.fetch('@context',
                                                                                  '')).host == 'schema.org'
         'schema_org'
+      elsif options[:ext] == '.json' && Maremma.from_json(string).to_h.dig('source') == 'Crossref'
+        'crossref_json'
       elsif options[:ext] == '.json' && Maremma.from_json(string).to_h.dig('@context') == ('https://raw.githubusercontent.com/codemeta/codemeta/master/codemeta.jsonld')
         'codemeta'
       elsif options[:ext] == '.json' && Maremma.from_json(string).to_h.dig('schemaVersion').to_s.start_with?('http://datacite.org/schema/kernel')
@@ -1049,6 +1053,8 @@ module Briard
         if a['literal'].present?
           a['@type'] = 'Organization'
           a['name'] = a['literal']
+        elsif a['name'].present?
+          a['@type'] = 'Organization'
         else
           a['@type'] = 'Person'
           a['name'] = [a['given'], a['family']].compact.join(' ')
@@ -1168,10 +1174,14 @@ module Briard
 
     def get_date_from_date_parts(date_as_parts)
       date_parts = date_as_parts.fetch('date-parts', []).first
+      return nil if date_parts == [nil]
+
       year = date_parts[0]
       month = date_parts[1]
       day = date_parts[2]
       get_date_from_parts(year, month, day)
+    rescue NoMethodError # if date_parts is nil
+      nil
     end
 
     def get_date_from_parts(year, month = nil, day = nil)

data/lib/briard/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Briard
-  VERSION = '2.7.1'
+  VERSION = '2.8.1'
 end