briard 2.4.2 → 2.6.1

data/lib/briard/readers/codemeta_reader.rb

@@ -3,85 +3,103 @@
 module Briard
   module Readers
     module CodemetaReader
-      def get_codemeta(id: nil, **options)
-        return { "string" => nil, "state" => "not_found" } unless id.present?
+      def get_codemeta(id: nil, **_options)
+        return { 'string' => nil, 'state' => 'not_found' } unless id.present?
+
         id = normalize_id(id)
-        response = Maremma.get(github_as_codemeta_url(id), accept: "json", raw: true)
-        string = response.body.fetch("data", nil)
+        response = Maremma.get(github_as_codemeta_url(id), accept: 'json', raw: true)
+        string = response.body.fetch('data', nil)
 
-        { "string" => string }
+        { 'string' => string }
       end
 
       def read_codemeta(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, :sandbox, :validate, :ra))
+        read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url,
+                                                                                   :sandbox, :validate, :ra))
 
         meta = string.present? ? Maremma.from_json(string) : {}
 
-        identifiers = Array.wrap(meta.fetch("identifier", nil)).map do |r|
+        identifiers = Array.wrap(meta.fetch('identifier', nil)).map do |r|
           r = normalize_id(r) if r.is_a?(String)
-          if r.is_a?(String) && !r.start_with?("https://doi.org")
-              { "identifierType" => "URL", "identifier" => r }
+          if r.is_a?(String) && URI(r) != 'doi.org'
+            { 'identifierType' => 'URL', 'identifier' => r }
           elsif r.is_a?(Hash)
-            { "identifierType" => get_identifier_type(r["propertyID"]), "identifier" => r["value"] }
+            { 'identifierType' => get_identifier_type(r['propertyID']), 'identifier' => r['value'] }
           end
         end.compact.uniq
 
-        id = normalize_id(options[:doi] || meta.fetch("@id", nil) || meta.fetch("identifier", nil))
+        id = normalize_id(options[:doi] || meta.fetch('@id', nil) || meta.fetch('identifier', nil))
 
-        has_agents = meta.fetch("agents", nil)
-        authors =  has_agents.nil? ? meta.fetch("authors", nil) : has_agents
+        has_agents = meta.fetch('agents', nil)
+        authors =  has_agents.nil? ? meta.fetch('authors', nil) : has_agents
         creators = get_authors(from_schema_org_creators(Array.wrap(authors)))
 
-        contributors = get_authors(from_schema_org_contributors(Array.wrap(meta.fetch("editor", nil))))
+        contributors = get_authors(from_schema_org_contributors(Array.wrap(meta.fetch('editor',
+                                                                                      nil))))
         dates = []
-        dates << { "date" => meta.fetch("datePublished"), "dateType" => "Issued" } if meta.fetch("datePublished", nil).present?
-        dates << { "date" => meta.fetch("dateCreated"), "dateType" => "Created" } if meta.fetch("dateCreated", nil).present?
-        dates << { "date" => meta.fetch("dateModified"), "dateType" => "Updated" } if meta.fetch("dateModified", nil).present?
-        publication_year = meta.fetch("datePublished")[0..3] if meta.fetch("datePublished", nil).present?
-        publisher = meta.fetch("publisher", nil)
-        state = meta.present? || read_options.present? ? "findable" : "not_found"
-        schema_org = meta.fetch("@type", nil)
+        dates << { 'date' => meta.fetch('datePublished'), 'dateType' => 'Issued' } if meta.fetch(
+          'datePublished', nil
+        ).present?
+        dates << { 'date' => meta.fetch('dateCreated'), 'dateType' => 'Created' } if meta.fetch(
+          'dateCreated', nil
+        ).present?
+        dates << { 'date' => meta.fetch('dateModified'), 'dateType' => 'Updated' } if meta.fetch(
+          'dateModified', nil
+        ).present?
+        publication_year = meta.fetch('datePublished')[0..3] if meta.fetch('datePublished',
+                                                                           nil).present?
+        publisher = meta.fetch('publisher', nil)
+        state = meta.present? || read_options.present? ? 'findable' : 'not_found'
+        schema_org = meta.fetch('@type', nil)
         types = {
-          "resourceTypeGeneral" => Briard::Utils::SO_TO_DC_TRANSLATIONS[schema_org],
-          "resourceType" => meta.fetch("additionalType", nil),
-          "schemaOrg" => schema_org,
-          "citeproc" => Briard::Utils::SO_TO_CP_TRANSLATIONS[schema_org] || "article-journal",
-          "bibtex" => Briard::Utils::SO_TO_BIB_TRANSLATIONS[schema_org] || "misc",
-          "ris" => Briard::Utils::SO_TO_RIS_TRANSLATIONS[schema_org] || "GEN"
+          'resourceTypeGeneral' => Briard::Utils::SO_TO_DC_TRANSLATIONS[schema_org],
+          'resourceType' => meta.fetch('additionalType', nil),
+          'schemaOrg' => schema_org,
+          'citeproc' => Briard::Utils::SO_TO_CP_TRANSLATIONS[schema_org] || 'article-journal',
+          'bibtex' => Briard::Utils::SO_TO_BIB_TRANSLATIONS[schema_org] || 'misc',
+          'ris' => Briard::Utils::SO_TO_RIS_TRANSLATIONS[schema_org] || 'GEN'
         }.compact
-        subjects = Array.wrap(meta.fetch("tags", nil)).reduce([]) do |sum, subject|
+        subjects = Array.wrap(meta.fetch('tags', nil)).reduce([]) do |sum, subject|
           sum += name_to_fos(subject)
 
           sum
         end
 
-        has_title = meta.fetch("title", nil)
-        titles =  has_title.nil? ?  [{ "title" => meta.fetch("name", nil) }] : [{ "title" => has_title }]  
-        rights_list = meta.fetch("licenseId", nil).present? ? [hsh_to_spdx("rightsIdentifier" => meta.fetch("licenseId"))] : nil
+        has_title = meta.fetch('title', nil)
+        titles =  if has_title.nil?
+                    [{ 'title' => meta.fetch('name', nil) }]
+                  else
+                    [{ 'title' => has_title }]
+                  end
+        rights_list = if meta.fetch('licenseId', nil).present?
+                        [hsh_to_spdx('rightsIdentifier' => meta.fetch('licenseId'))]
+                      end
 
-        { "id" => id,
-          "types" => types,
-          "identifiers" => identifiers,
-          "doi" => doi_from_url(id),
-          "url" => normalize_id(meta.fetch("codeRepository", nil)),
-          "titles" => titles,
-          "creators" => creators,
-          "contributors" => contributors,
-          "publisher" => publisher,
-          #{}"is_part_of" => is_part_of,
-          "dates" => dates,
-          "publication_year" => publication_year,
-          "descriptions" => meta.fetch("description", nil).present? ? [{ "description" => sanitize(meta.fetch("description")), "descriptionType" => "Abstract" }] : nil,
-          "rights_list" => rights_list,
-          "version_info" => meta.fetch("version", nil),
-          "subjects" => subjects,
-          "state" => state
-        }.merge(read_options)
+        { 'id' => id,
+          'types' => types,
+          'identifiers' => identifiers,
+          'doi' => doi_from_url(id),
+          'url' => normalize_id(meta.fetch('codeRepository', nil)),
+          'titles' => titles,
+          'creators' => creators,
+          'contributors' => contributors,
+          'publisher' => publisher,
+          # {}"is_part_of" => is_part_of,
+          'dates' => dates,
+          'publication_year' => publication_year,
+          'descriptions' => if meta.fetch('description', nil).present?
+                              [{ 'description' => sanitize(meta.fetch('description')),
+                                 'descriptionType' => 'Abstract' }]
+                            end,
+          'rights_list' => rights_list,
+          'version_info' => meta.fetch('version', nil),
+          'subjects' => subjects,
+          'state' => state }.merge(read_options)
       end
 
       # def related_identifiers(relation_type)

data/lib/briard/readers/crosscite_reader.rb

@@ -3,9 +3,9 @@
 module Briard
   module Readers
     module CrossciteReader
-      def read_crosscite(string: nil, **options)
+      def read_crosscite(string: nil, **_options)
         errors = jsonlint(string)
-        return { "errors" => errors } if errors.present?
+        return { 'errors' => errors } if errors.present?
 
         string.present? ? Maremma.from_json(string) : {}
       end