lib/bibtex/entry/citeproc_converter.rb in bibtex-ruby-4.4.7 vs lib/bibtex/entry/citeproc_converter.rb in bibtex-ruby-5.0.0

@@ -1,56 +1,56 @@
 class BibTeX::Entry::CiteProcConverter
-  CSL_FILTER = Hash.new { |h, k| k }.merge(Hash[*%w{
-    date         issued
-    isbn         ISBN
-    booktitle    container-title
-    journal      container-title
+  CSL_FILTER = Hash.new { |_h, k| k }.merge(Hash[*%w[
+    date issued
+    isbn ISBN
+    booktitle container-title
+    journal container-title
     journaltitle container-title
-    series       collection-title
-    address      publisher-place
-    pages        page
-    number       issue
-    url          URL
-    doi          DOI
-    pmid         PMID
-    pmcid        PMCID
-    year         issued
-    type         genre
-    school       publisher
-    institution  publisher
+    series collection-title
+    address publisher-place
+    pages page
+    number issue
+    url URL
+    doi DOI
+    pmid PMID
+    pmcid PMCID
+    year issued
+    type genre
+    school publisher
+    institution publisher
     organization publisher
     howpublished publisher
-    type         genre
-  }.map(&:intern)]).freeze
+    type genre
+  ].map(&:intern)]).freeze
 
-  CSL_FIELDS = %w{
+  CSL_FIELDS = %w[
     abstract annote archive archive_location archive-place
     authority call-number chapter-number citation-label citation-number
     collection-title container-title DOI edition event event-place
     first-reference-note-number genre ISBN issue jurisdiction keyword locator
     medium note number number-of-pages number-of-volumes original-publisher
     original-publisher-place original-title page page-first publisher
     publisher-place references section status title URL version volume
     year-suffix accessed container event-date issued original-date
     author editor translator recipient interviewer publisher composer
     original-publisher original-author container-author collection-editor
-  }.map(&:intern).freeze
+  ].map(&:intern).freeze
 
-  CSL_TYPES = Hash.new { |h, k| k }.merge(Hash[*%w{
-    booklet        pamphlet
-    conference     paper-conference
-    inbook         chapter
-    incollection   chapter
-    inproceedings  paper-conference
-    manual         book
-    mastersthesis  thesis
-    phdthesis      thesis
-    proceedings    book
-    techreport     report
-    unpublished    manuscript
-    article        article-journal
-  }.map(&:intern)]).freeze
+  CSL_TYPES = Hash.new { |_h, k| k }.merge(Hash[*%w[
+    booklet pamphlet
+    conference paper-conference
+    inbook chapter
+    incollection chapter
+    inproceedings paper-conference
+    manual book
+    mastersthesis thesis
+    phdthesis thesis
+    proceedings book
+    techreport report
+    unpublished manuscript
+    article article-journal
+  ].map(&:intern)]).freeze
 
   def self.convert(bibtex, options = {})
     new(bibtex, options).convert!
   end
 
@@ -69,64 +69,58 @@
 
     bibtex.inherited_fields.each do |key|
       convert key, bibtex.parent.provide(key)
     end
 
-    methods = self.class.instance_methods(false) - [:convert!, :hash]
+    methods = self.class.instance_methods(false) - %i[convert! hash]
     methods.each { |m| send(m) }
 
     hash
   end
 
   def conferences
-    return unless [:conference, :proceedings, :inproceedings].include?(bibtex.type)
+    return unless %i[conference proceedings inproceedings].include?(bibtex.type)
 
     if bibtex.field?(:organization) && bibtex.field?(:publisher)
       hash['authority'] = bibtex[:organization]
       hash['publisher'] = bibtex[:publisher]
     end
 
-    if bibtex.field? :address
-      hash['event-place'] = bibtex[:address]
-    end
+    hash['event-place'] = bibtex[:address] if bibtex.field? :address
   end
 
   def techreport
-    return unless [:techreport, :report].include?(bibtex.type)
+    return unless %i[techreport report].include?(bibtex.type)
+
     hash['number'] = bibtex[:number].to_s if bibtex.field? :number
   end
 
   def date
-    case
-    when bibtex.field?(:date)
+    if bibtex.field?(:date)
       hash['issued'] = {
-        'date-parts' => bibtex.date.to_s.split('/').map { |part|
+        'date-parts' => bibtex.date.to_s.split('/').map do |part|
           part.split('-').map(&:to_i)
-        }
+        end
       }
 
-    when bibtex.field?(:year)
+    elsif bibtex.field?(:year)
       case bibtex[:year].to_s
       when /^\d+$/
         parts = [bibtex[:year].to_s]
 
         if bibtex.field?(:month)
           parts.push BibTeX::Entry::MONTHS.find_index(bibtex[:month].to_s.intern)
           parts[1] = parts[1] + 1 unless parts[1].nil?
 
-          if bibtex.field?(:day)
-            parts.push bibtex[:day]
-          end
+          parts.push bibtex[:day] if bibtex.field?(:day)
         end
 
         hash['issued'] = { 'date-parts' => [parts.compact.map(&:to_i)] }
       else
         hash['issued'] = { 'literal' => bibtex[:year].to_s }
       end
 
-    else
-      # no date present
     end
   end
 
   def key
     hash['id'] = bibtex.key.to_s
@@ -134,9 +128,10 @@
 
   def type
     hash['type'] = CSL_TYPES[bibtex.type].to_s
 
     return if hash.key?('genre')
+
     case bibtex.type
     when :mastersthesis
       hash['genre'] = "Master's thesis"
     when :phdthesis
       hash['genre'] = 'PhD thesis'