briard 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 274ef31afd2d0496eaa834fca379f2546ebadc1729c3139dc29e73411046cc82
-  data.tar.gz: a8eb31f51c2224c87856e1ce9ff547b33c3bc9b50579926a9152f2dd6083163e
+  metadata.gz: 6be06ae87915ce9307275bea4fec8176dd9e93f38cdd99d89522cac4e29cb7a1
+  data.tar.gz: 4f9907cc3f4c9ef7885e88d635f1667be1699c1db1d51f742a09ecc14eddc358
 SHA512:
-  metadata.gz: 7e91cec9de02a686f161b410736974b57cae8710fb80f92a8bca64d271c9b19c1593e03ef3fd96c288af72c7e99748f6ffe01648d3750161da247c8ddc77c728
-  data.tar.gz: 52c75c7fc2ea549f3fff4ca25a32e833d08df761ffc511c18cd80b1a64a4268f01afb7551bb98c2046b4369d21653ad2d91e8dd0d783ed510e9af4ede256c622
+  metadata.gz: 9da37799aafb46e13c97c6b67befe4b9566e9ec0aae892b082f5dd09f78a678819f28c5538a91d575379f65e01055456aa1eb1d83015829c10ce0f32dac596a9
+  data.tar.gz: cf09273fa22a240fb578785c0f9719fde52d3beeb767c360b2a548dd82c017e782b9af5e29e1277e4719718dfc0eeea911d0b2571742c45dc2a7216e33759888

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/.rubocop.yml

@@ -15,7 +15,7 @@ AllCops:
     - 'tmp/**/*'
     - '.git/**/*'
     - 'bin/*'
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   SuggestExtensions: false
 
 Naming/PredicateName:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    briard (2.7.0)
+    briard (2.8.0)
       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)
@@ -188,7 +188,7 @@ GEM
     rdf-xsd (3.2.1)
       rdf (~> 3.2)
       rexml (~> 3.2)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -206,7 +206,7 @@ GEM
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
-    rubocop (1.38.0)
+    rubocop (1.39.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -218,7 +218,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.15.0)
+    rubocop-performance (1.15.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
@@ -259,7 +259,7 @@ DEPENDENCIES
   briard!
   bundler (~> 2.3, >= 2.3.1)
   code-scanning-rubocop (~> 0.6.1)
-  hashdiff (>= 1.0.0.beta1, < 2.0.0)
+  hashdiff (~> 1.0.1)
   rack-test (~> 2.0)
   rake (~> 12.0)
   rspec (~> 3.4)

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>
@@ -134,7 +141,7 @@ Briard reads and/or writes these metadata formats:
 
 ## Installation
 
-Requires Ruby 2.3 or later. Then add the following to your `Gemfile` to install the
+Requires Ruby 2.7 or later. Then add the following to your `Gemfile` to install the
 latest version:
 
 ```ruby

data/briard.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.version       = Briard::VERSION
   s.extra_rdoc_files = ['README.md']
   s.license = 'MIT'
-  s.required_ruby_version = '~> 2.3'
+  s.required_ruby_version = '>= 2.7.0'
 
   # Declare dependencies here, rather than in the Gemfile
   s.add_dependency 'activesupport', '>= 4.2.5', '< 8.0'
@@ -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'
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'thor', '~> 1.1', '>= 1.1.0'
   s.add_development_dependency 'bundler', '~> 2.3', '>= 2.3.1'
   s.add_development_dependency 'code-scanning-rubocop', '~> 0.6.1'
-  s.add_development_dependency 'hashdiff', ['>= 1.0.0.beta1', '< 2.0.0']
+  s.add_development_dependency 'hashdiff', '~> 1.0.1'
   s.add_development_dependency 'rack-test', '~> 2.0'
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec', '~> 3.4'

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

@@ -12,10 +12,10 @@ module Briard
       doi = Array(%r{\A(?:(http|https):/(/)?(dx\.)?(doi\.org|handle\.stage\.datacite\.org|handle\.test\.datacite\.org)/)?(doi:)?(10\.13039/)?([1-9]\d+)\z}.match(doi)).last
 
       # remove non-printing whitespace and downcase
-      if doi.present?
-        doi.delete("\u200B").downcase
-        "https://doi.org/10.13039/#{doi}"
-      end
+      return unless doi.present?
+
+      doi.delete("\u200B").downcase
+      "https://doi.org/10.13039/#{doi}"
     end
 
     def validate_prefix(doi)
@@ -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?
@@ -41,10 +45,12 @@ module Briard
     end
 
     def doi_from_url(url)
-      if %r{\A(?:(http|https)://(dx\.)?(doi\.org|handle\.stage\.datacite\.org|handle\.test\.datacite\.org)/)?(doi:)?(10\.\d{4,5}/.+)\z}.match?(url)
-        uri = Addressable::URI.parse(url)
-        uri.path.gsub(%r{^/}, '').downcase
+      unless %r{\A(?:(http|https)://(dx\.)?(doi\.org|handle\.stage\.datacite\.org|handle\.test\.datacite\.org)/)?(doi:)?(10\.\d{4,5}/.+)\z}.match?(url)
+        return
       end
+
+      uri = Addressable::URI.parse(url)
+      uri.path.gsub(%r{^/}, '').downcase
     end
 
     def doi_as_url(doi)

data/lib/briard/metadata.rb

@@ -34,7 +34,7 @@ module Briard
         end
 
         # generate name for method to call dynamically
-        hsh = @from.present? ? send("get_#{@from}", id: id, sandbox: options[:sandbox]) : {}
+        hsh = @from.present? ? send("get_#{@from}", id: id, **options) : {}
         string = hsh.fetch('string', nil)
 
       elsif options[:input].present? && File.exist?(options[:input])

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,
@@ -373,10 +373,9 @@ module Briard
       def crossref_date_published(bibliographic_metadata)
         pub_date = Array.wrap(bibliographic_metadata.fetch('publication_date', nil)).presence ||
                    Array.wrap(bibliographic_metadata.fetch('acceptance_date', nil))
-        if pub_date.present?
-          get_date_from_parts(pub_date.first['year'], pub_date.first['month'],
-                              pub_date.first['day'])
-        end
+        return unless pub_date.present?
+
+        get_date_from_parts(pub_date.first['year'], pub_date.first['month'], pub_date.first['day'])
       end
 
       def crossref_is_part_of(model_metadata)

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/readers/schema_org_reader.rb

@@ -50,7 +50,7 @@ module Briard
           # workaround for html language attribute if no language is set via schema.org
           lang = doc.at('html')['lang']
           hsh['inLanguage'] = lang if hsh['inLanguage'].blank?
-          
+
           # workaround if issn not included with schema.org
           name = doc.at("meta[property='og:site_name']")
           issn = doc.at("meta[name='citation_issn']")