briard 2.4.1 → 2.6.0

data/lib/briard/readers/npm_reader.rb

@@ -3,39 +3,41 @@
 module Briard
   module Readers
     module NpmReader
-      def get_npm(id: nil, **options)
-        return { "string" => nil, "state" => "not_found" } unless id.present?
+      def get_npm(id: nil, **_options)
+        return { 'string' => nil, 'state' => 'not_found' } unless id.present?
+
         id = normalize_id(id)
-        response = Maremma.get(id, accept: "json", raw: true)
-        string = response.body.fetch("data", nil)
+        response = Maremma.get(id, accept: 'json', raw: true)
+        string = response.body.fetch('data', nil)
 
-        { "string" => string }
+        { 'string' => string }
       end
 
       def read_npm(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) : {}
 
         types = {
-          "resourceTypeGeneral" => "Software",
-          "reourceType" => "NPM Package",
-          "schemaOrg" => "SoftwareSourceCode",
-          "citeproc" => "article",
-          "bibtex" => "misc",
-          "ris" => "GEN"
+          'resourceTypeGeneral' => 'Software',
+          'reourceType' => 'NPM Package',
+          'schemaOrg' => 'SoftwareSourceCode',
+          'citeproc' => 'article',
+          'bibtex' => 'misc',
+          'ris' => 'GEN'
         }.compact
 
-        creators = if meta.fetch("author", nil).present?
-          get_authors(Array.wrap(meta.fetch("author", nil)))
-        else
-          [{ "nameType" => "Organizational", "name" => ":(unav)" }]
-        end
+        creators = if meta.fetch('author', nil).present?
+                     get_authors(Array.wrap(meta.fetch('author', nil)))
+                   else
+                     [{ 'nameType' => 'Organizational', 'name' => ':(unav)' }]
+                   end
         # contributors = get_authors(from_citeproc(Array.wrap(meta.fetch("editor", nil))))
         # dates = if date = get_date_from_date_parts(meta.fetch("issued", nil))
         #           if Date.edtf(date).present?
@@ -44,8 +46,8 @@ module Briard
         #           end
         #         end
         # publication_year = get_date_from_date_parts(meta.fetch("issued", nil)).to_s[0..3]
-        rights_list = if meta.fetch("license", nil)
-                        [{ "rights" => meta.fetch("license") }.compact]
+        rights_list = if meta.fetch('license', nil)
+                        [{ 'rights' => meta.fetch('license') }.compact]
                       end
         # related_identifiers = if meta.fetch("container-title", nil).present? && meta.fetch("ISSN", nil).present?
         #                         [{ "type" => "Periodical",
@@ -83,31 +85,36 @@ module Briard
 
         # id = Array.wrap(identifiers).first.to_h.fetch("identifier", nil)
         # doi = Array.wrap(identifiers).find { |r| r["identifierType"] == "DOI" }.to_h.fetch("identifier", nil)
-          
+
         # state = id.present? || read_options.present? ? "findable" : "not_found"
-        subjects = Array.wrap(meta.fetch("keywords", nil)).map do |s|
-          { "subject" => s }
+        subjects = Array.wrap(meta.fetch('keywords', nil)).map do |s|
+          { 'subject' => s }
         end
 
-        { 
-          #"id" => id,
-          #"identifiers" => identifiers,
-          "types" => types,
-          #"doi" => doi_from_url(doi),
-          #"url" => normalize_id(meta.fetch("URL", nil)),
-          "titles" => [{ "title" => meta.fetch("name", nil) }],
-          "creators" => creators,
-          #"contributors" => contributors,
-          #"container" => container,
-          #"publisher" => meta.fetch("publisher", nil),
-          #"related_identifiers" => related_identifiers,
-          #"dates" => dates,
-          #"publication_year" => publication_year,
-          "descriptions" => meta.fetch("description", nil).present? ? [{ "description" => sanitize(meta.fetch("description")), "descriptionType" => "Abstract" }] : [],
-          "rights_list" => rights_list,
-          "version_info" => meta.fetch("version", nil),
-          "subjects" => subjects
-          #"state" => state
+        {
+          # "id" => id,
+          # "identifiers" => identifiers,
+          'types' => types,
+          # "doi" => doi_from_url(doi),
+          # "url" => normalize_id(meta.fetch("URL", nil)),
+          'titles' => [{ 'title' => meta.fetch('name', nil) }],
+          'creators' => creators,
+          # "contributors" => contributors,
+          # "container" => container,
+          # "publisher" => meta.fetch("publisher", nil),
+          # "related_identifiers" => related_identifiers,
+          # "dates" => dates,
+          # "publication_year" => publication_year,
+          'descriptions' => if meta.fetch('description', nil).present?
+                              [{ 'description' => sanitize(meta.fetch('description')),
+                                 'descriptionType' => 'Abstract' }]
+                            else
+                              []
+                            end,
+          'rights_list' => rights_list,
+          'version_info' => meta.fetch('version', nil),
+          'subjects' => subjects
+          # "state" => state
         }.merge(read_options)
       end
     end

data/lib/briard/readers/ris_reader.rb

@@ -4,110 +4,112 @@ module Briard
   module Readers
     module RisReader
       RIS_TO_SO_TRANSLATIONS = {
-        "BLOG" => "BlogPosting",
-        "GEN" => "CreativeWork",
-        "CTLG" => "DataCatalog",
-        "DATA" => "Dataset",
-        "FIGURE" => "ImageObject",
-        "THES" => "Thesis",
-        "MPCT" => "Movie",
-        "JOUR" => "ScholarlyArticle",
-        "COMP" => "SoftwareSourceCode",
-        "VIDEO" => "VideoObject",
-        "ELEC" => "WebPage"
-      }
+        'BLOG' => 'BlogPosting',
+        'GEN' => 'CreativeWork',
+        'CTLG' => 'DataCatalog',
+        'DATA' => 'Dataset',
+        'FIGURE' => 'ImageObject',
+        'THES' => 'Thesis',
+        'MPCT' => 'Movie',
+        'JOUR' => 'ScholarlyArticle',
+        'COMP' => 'SoftwareSourceCode',
+        'VIDEO' => 'VideoObject',
+        'ELEC' => 'WebPage'
+      }.freeze
 
-      RIS_TO_CP_TRANSLATIONS = {
-        "JOUR" => "article-journal"
-      }
+      RIS_TO_CP_TRANSLATIONS = { 'JOUR' => 'article-journal' }.freeze
 
       RIS_TO_BIB_TRANSLATIONS = {
-        "JOUR" => "article",
-        "BOOK" => "book",
-        "CHAP" => "inbook",
-        "CPAPER" => "inproceedings",
-        "GEN" => "misc",
-        "THES" => "phdthesis",
-        "CONF" => "proceedings",
-        "RPRT" => "techreport",
-        "UNPD" => "unpublished"
-      }
+        'JOUR' => 'article',
+        'BOOK' => 'book',
+        'CHAP' => 'inbook',
+        'CPAPER' => 'inproceedings',
+        'GEN' => 'misc',
+        'THES' => 'phdthesis',
+        'CONF' => 'proceedings',
+        'RPRT' => 'techreport',
+        'UNPD' => 'unpublished'
+      }.freeze
 
       def read_ris(string: nil, **options)
-        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 = ris_meta(string: string)
 
-        ris_type = meta.fetch("TY", nil) || "GEN"
-        schema_org = RIS_TO_SO_TRANSLATIONS[ris_type] || "CreativeWork"
+        ris_type = meta.fetch('TY', nil) || 'GEN'
+        schema_org = RIS_TO_SO_TRANSLATIONS[ris_type] || 'CreativeWork'
         types = {
-          "resourceTypeGeneral" => Metadata::RIS_TO_DC_TRANSLATIONS[ris_type],
-          "schemaOrg" => schema_org,
-          "citeproc" => RIS_TO_CP_TRANSLATIONS[schema_org] || "misc",
-          "ris" => ris_type
+          'resourceTypeGeneral' => Metadata::RIS_TO_DC_TRANSLATIONS[ris_type],
+          'schemaOrg' => schema_org,
+          'citeproc' => RIS_TO_CP_TRANSLATIONS[schema_org] || 'misc',
+          'ris' => ris_type
         }.compact
 
-        id = normalize_doi(options[:doi] || meta.fetch("DO", nil))
+        id = normalize_doi(options[:doi] || meta.fetch('DO', nil))
 
-        author = Array.wrap(meta.fetch("AU", nil)).map { |a| { "creatorName" => a } }
-        date_parts = meta.fetch("PY", nil).to_s.split("/")
-        created_date_parts = meta.fetch("Y1", nil).to_s.split("/")
+        author = Array.wrap(meta.fetch('AU', nil)).map { |a| { 'creatorName' => a } }
+        date_parts = meta.fetch('PY', nil).to_s.split('/')
+        created_date_parts = meta.fetch('Y1', nil).to_s.split('/')
         dates = []
-        dates << { "date" => get_date_from_parts(*date_parts), "dateType" => "Issued" } if meta.fetch("PY", nil).present?
-        dates << { "date" => get_date_from_parts(*created_date_parts), "dateType" => "Created" } if meta.fetch("Y1", nil).present?
-        publication_year = get_date_from_parts(*date_parts).to_s[0..3]
-        related_identifiers = if meta.fetch("T2", nil).present? && meta.fetch("SN", nil).present?
-          [{ "type" => "Periodical",
-             "id" => meta.fetch("SN", nil),
-             "relatedIdentifierType" => "ISSN",
-             "relationType" => "IsPartOf",
-             "title" => meta.fetch("T2", nil), }.compact]
-        else
-          []
+        if meta.fetch('PY', nil).present?
+          dates << { 'date' => get_date_from_parts(*date_parts), 'dateType' => 'Issued' }
         end
-        container = if meta.fetch("T2", nil).present?
-          { "type" => "Journal",
-            "title" => meta.fetch("T2", nil),
-            "identifier" => meta.fetch("SN", nil),
-            "volume" => meta.fetch("VL", nil),
-            "issue" => meta.fetch("IS", nil),
-            "firstPage" => meta.fetch("SP", nil),
-            "lastPage" => meta.fetch("EP", nil) }.compact
-        else
-          nil
+        if meta.fetch('Y1', nil).present?
+          dates << { 'date' => get_date_from_parts(*created_date_parts), 'dateType' => 'Created' }
         end
-        state = meta.fetch("DO", nil).present? || read_options.present? ? "findable" : "not_found"
-        subjects = Array.wrap(meta.fetch("KW", nil)).reduce([]) do |sum, subject|
+        publication_year = get_date_from_parts(*date_parts).to_s[0..3]
+        related_identifiers = if meta.fetch('T2', nil).present? && meta.fetch('SN', nil).present?
+                                [{ 'type' => 'Periodical',
+                                   'id' => meta.fetch('SN', nil),
+                                   'relatedIdentifierType' => 'ISSN',
+                                   'relationType' => 'IsPartOf',
+                                   'title' => meta.fetch('T2', nil) }.compact]
+                              else
+                                []
+                              end
+        container = if meta.fetch('T2', nil).present?
+                      { 'type' => 'Journal',
+                        'title' => meta.fetch('T2', nil),
+                        'identifier' => meta.fetch('SN', nil),
+                        'volume' => meta.fetch('VL', nil),
+                        'issue' => meta.fetch('IS', nil),
+                        'firstPage' => meta.fetch('SP', nil),
+                        'lastPage' => meta.fetch('EP', nil) }.compact
+                    end
+        state = meta.fetch('DO', nil).present? || read_options.present? ? 'findable' : 'not_found'
+        subjects = Array.wrap(meta.fetch('KW', nil)).reduce([]) do |sum, subject|
           sum += name_to_fos(subject)
 
           sum
         end
 
-        { "id" => id,
-          "types" => types,
-          "doi" => doi_from_url(id),
-          "url" => meta.fetch("UR", nil),
-          "titles" => meta.fetch("T1", nil).present? ? [{ "title" => meta.fetch("T1", nil) }] : nil,
-          "creators" => get_authors(author),
-          "publisher" => meta.fetch("PB", "(:unav)"),
-          "container" => container,
-          "related_identifiers" => related_identifiers,
-          "dates" => dates,
-          "publication_year" => publication_year,
-          "descriptions" => meta.fetch("AB", nil).present? ? [{ "description" => sanitize(meta.fetch("AB")), "descriptionType" => "Abstract" }] : nil,
-          "subjects" => subjects,
-          "language" => meta.fetch("LA", nil),
-          "state" => state
-        }.merge(read_options)
+        { 'id' => id,
+          'types' => types,
+          'doi' => doi_from_url(id),
+          'url' => meta.fetch('UR', nil),
+          'titles' => meta.fetch('T1', nil).present? ? [{ 'title' => meta.fetch('T1', nil) }] : nil,
+          'creators' => get_authors(author),
+          'publisher' => meta.fetch('PB', '(:unav)'),
+          'container' => container,
+          'related_identifiers' => related_identifiers,
+          'dates' => dates,
+          'publication_year' => publication_year,
+          'descriptions' => if meta.fetch('AB', nil).present?
+                              [{ 'description' => sanitize(meta.fetch('AB')),
+                                 'descriptionType' => 'Abstract' }]
+                            end,
+          'subjects' => subjects,
+          'language' => meta.fetch('LA', nil),
+          'state' => state }.merge(read_options)
       end
 
       def ris_meta(string: nil)
-        h = Hash.new { |h,k| h[k] = [] }
-        string.split("\n").reduce(h) do |sum, line|
-          k, v = line.split("-",2)
+        h = Hash.new { |h, k| h[k] = [] }
+        string.split("\n").each_with_object(h) do |line, _sum|
+          k, v = line.split('-', 2)
           h[k.strip] << v.to_s.strip
-          sum
-        end.map { |k,v| [k, v.unwrap] }.to_h.compact
+        end.transform_values(&:unwrap).compact
       end
     end
   end