fix linting using standardrb

Author: Dahie

Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 

lib/chord_pro.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'chord_pro/version'
-require 'chord_pro/song'
-require 'chord_pro/section'
-require 'chord_pro/line'
-require 'chord_pro/part'
-require 'chord_pro/measure'
+require "chord_pro/version"
+require "chord_pro/song"
+require "chord_pro/section"
+require "chord_pro/line"
+require "chord_pro/part"
+require "chord_pro/measure"
 
 module ChordPro
   SECTION_REGEX = /\{(?:chorus|soc|sov|start_of_verse|start_of_chorus|sob|start_of_bridge|start_of_tab|sot|start_of_grid|sog):?\n?(.*)\}/m
@@ -18,121 +18,122 @@ module ChordPro
   COMMENT_REGEX = /\{(?:c|comment|comment_italic|ci|comment_box|cb):([^$]*)\}/
   SANITIZE_REGEX = /\{end_of_chorus|eoc|end_of_verse|eov|end_of_tab|eot|end_of_tab|eog|end_of_grid|colb\}/
 
-  def self.parse(lines)
-    song = Song.new
-    current_section = nil
-
-    lines.split("\n").each do |text|
-      if text.start_with?('{meta:')
-        process_custom_attribute(song, text)
-      elsif section_start?(text)
-        current_section = process_section(song, text)
-      elsif !comment_starts?(text) && attribute_start?(text)
-        process_attribute(song, text)
-      elsif text.match(SANITIZE_REGEX)
-        # ignore
-      else
-        process_lyrics_and_chords(song, current_section, text)
+  class << self
+    def parse(lines)
+      song = Song.new
+      current_section = nil
+
+      lines.split("\n").each do |text|
+        if text.start_with?("{meta:")
+          process_custom_attribute(song, text)
+        elsif section_start?(text)
+          current_section = process_section(song, text)
+        elsif !comment_starts?(text) && attribute_start?(text)
+          process_attribute(song, text)
+        elsif text.match(SANITIZE_REGEX)
+          # ignore
+        else
+          process_lyrics_and_chords(song, current_section, text)
+        end
       end
+
+      song
     end
 
-    song
-  end
+    def process_section(song, text)
+      matches = SECTION_REGEX.match(text)
+      name = (!matches[1].empty?) ? matches[1].strip : section_name_by_directive(text)
 
-  def self.process_section(song, text)
-    matches = SECTION_REGEX.match(text)
-    name = !matches[1].empty? ? matches[1].strip : section_name_by_directive(text)
+      current_section = Section.new(name: name)
+      song.sections << current_section
 
-    current_section = Section.new(name: name)
-    song.sections << current_section
+      current_section
+    end
 
-    current_section
-  end
+    def process_attribute(song, text)
+      matches = ATTRIBUTE_REGEX.match(text)
+      key = matches[1]
+      value = matches[2].strip
+
+      if song.respond_to?(:"#{key}=")
+        song.send(:"#{key}=", value)
+      else
+        puts "WARNING: Unknown attribute '#{key}'"
+      end
+    end
 
-  def self.process_attribute(song, text)
-    matches = ATTRIBUTE_REGEX.match(text)
-    key = matches[1]
-    value = matches[2].strip
+    def process_custom_attribute(song, text)
+      matches = CUSTOM_ATTRIBUTE_REGEX.match(text)
+      key = matches[1]
+      value = matches[2].strip
 
-    if song.respond_to?("#{key}=".to_sym)
-      song.send("#{key}=", value)
-    else
-      puts "WARNING: Unknown attribute '#{key}'"
+      song.set_custom(key, value)
     end
-  end
 
-  def self.process_custom_attribute(song, text)
-    matches = CUSTOM_ATTRIBUTE_REGEX.match(text)
-    key = matches[1]
-    value = matches[2].strip
+    def process_lyrics_and_chords(song, current_section, text)
+      return if text == ""
 
-    song.set_custom(key, value)
-  end
+      if current_section.nil?
+        current_section = Section.new(name: "")
+        song.sections << current_section
+      end
 
-  def self.process_lyrics_and_chords(song, current_section, text)
-    return if text == ''
+      line = Line.new
 
-    if current_section.nil?
-      current_section = Section.new(name: '')
-      song.sections << current_section
-    end
+      if text.start_with?("|-")
+        line.tablature = text
+      elsif text.start_with?("| ")
+        captures = text.scan(MEASURES_REGEX).flatten
 
-    line = Line.new
+        measures = []
 
-    if text.start_with?('|-')
-      line.tablature = text
-    elsif text.start_with?('| ')
-      captures = text.scan(MEASURES_REGEX).flatten
+        captures.each do |capture|
+          chords = capture.scan(CHORDS_REGEX).flatten
+          measure = Measure.new
+          measure.chords = chords
+          measures << measure
+        end
 
-      measures = []
+        line.measures = measures
+      elsif comment_starts?(text)
+        matches = COMMENT_REGEX.match(text)
+        comment = matches[1].strip
+        line.comment = comment
+      else
+        captures = text.scan(CHORDS_AND_LYRICS_REGEX).flatten
 
-      captures.each do |capture|
-        chords = capture.scan(CHORDS_REGEX).flatten
-        measure = Measure.new
-        measure.chords = chords
-        measures << measure
-      end
+        captures.each_slice(2) do |pair|
+          part = Part.new
+          chord = pair[0]&.strip || ""
+          part.chord = chord.delete("[").delete("]")
+          part.lyric = pair[1] || ""
 
-      line.measures = measures
-    elsif comment_starts?(text)
-      matches = COMMENT_REGEX.match(text)
-      comment = matches[1].strip
-      line.comment = comment
-    else
-      captures = text.scan(CHORDS_AND_LYRICS_REGEX).flatten
-
-      captures.each_slice(2) do |pair|
-        part = Part.new
-        chord = pair[0]&.strip || ''
-        part.chord = chord.delete('[').delete(']')
-        part.lyric = pair[1] || ''
-
-        line.parts << part unless (part.chord == '') && (part.lyric == '')
+          line.parts << part unless (part.chord == "") && (part.lyric == "")
+        end
       end
-    end
 
-    current_section.lines << line unless line.empty?
-  end
+      current_section.lines << line unless line.empty?
+    end
 
-  private
+    private
 
-  def self.attribute_start?(text)
-    text.match(/\{(.+):(.*)\}/)
-  end
+    def attribute_start?(text)
+      text.match(/\{(.+):(.*)\}/)
+    end
 
-  def self.section_start?(text)
-    text.match(SECTION_REGEX)
-  end
+    def section_start?(text)
+      text.match(SECTION_REGEX)
+    end
 
-  def self.comment_starts?(text)
-    text.match(/\{(?:c|comment|comment_italic|ci|comment_box|cb):/)
-  end
+    def comment_starts?(text)
+      text.match(/\{(?:c|comment|comment_italic|ci|comment_box|cb):/)
+    end
 
-  def self.section_name_by_directive(text)
-    return 'Chorus' if text.match(/soc|start_of_chorus|chorus/)
-    return 'Verse' if text.match(/sov|start_of_verse/)
-    return 'Tab' if text.match(/sot|start_of_tab/)
-    return 'Grid' if text.match(/sot|start_of_grid/)
+    def section_name_by_directive(text)
+      return "Chorus" if /soc|start_of_chorus|chorus/.match?(text)
+      return "Verse" if /sov|start_of_verse/.match?(text)
+      return "Tab" if /sot|start_of_tab/.match?(text)
+      "Grid" if /sot|start_of_grid/.match?(text)
+    end
   end
-
 end

lib/chord_pro/section.rb

@@ -4,7 +4,7 @@ module ChordPro
   class Section
     attr_accessor :name, :lines
 
-    def initialize(name: '')
+    def initialize(name: "")
       @name = name
       @lines = []
     end

lib/chord_pro/song.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require 'markaby'
+require "markaby"
 
 module ChordPro
   class Song
     attr_accessor :title,
-                  :artist,
-                  :capo,
-                  :key,
-                  :tempo,
-                  :year,
-                  :copyright,
-                  :album,
-                  :tuning,
-                  :sections,
-                  :custom
+      :artist,
+      :capo,
+      :key,
+      :tempo,
+      :year,
+      :copyright,
+      :album,
+      :tuning,
+      :sections,
+      :custom
 
     def initialize
       @sections = []
@@ -45,72 +45,72 @@ def to_html
 
         dl.information do
           if song.tuning
-            dt.tuning 'Tuning'
+            dt.tuning "Tuning"
             dd.tuning song.tuning
           end
           if song.capo
-            dt.capo 'Capo'
+            dt.capo "Capo"
             dd.capo song.capo
           end
           if song.key
-            dt.key 'Key'
+            dt.key "Key"
             dd.key song.key
           end
           if song.tempo
-            dt.tempo 'Tempo'
+            dt.tempo "Tempo"
             dd.tempo song.tempo
           end
           if song.year
-            dt.year 'Year'
+            dt.year "Year"
             dd.year song.year
           end
           if song.album
-            dt.album 'Album'
+            dt.album "Album"
             dd.album song.album
           end
         end
 
         song.sections.each do |section|
           div.section do
             div.name section.name
-            div.lines do
-              section.lines.each do |line|
-                if line.tablature?
-                  div.tablature do
-                    line.tablature
-                  end
-                elsif line.measures?
-                  div.measures do
-                    line.measures.each do |measure|
-                      div.measure do
-                        measure.chords.each do |chord|
-                          div.chord chord
+            unless section.lines.empty?
+              div.lines do
+                section.lines.each do |line|
+                  if line.tablature?
+                    div.tablature do
+                      line.tablature
+                    end
+                  elsif line.measures?
+                    div.measures do
+                      line.measures.each do |measure|
+                        div.measure do
+                          measure.chords.each do |chord|
+                            div.chord chord
+                          end
                         end
                       end
                     end
-                  end
-                else
-                  div.line do
-                    line.parts.each do |part|
-                      div.part do
-                        div.chord part.chord
-                        div.lyric part.lyric
+                  else
+                    div.line do
+                      line.parts.each do |part|
+                        div.part do
+                          div.chord part.chord
+                          div.lyric part.lyric
+                        end
                       end
                     end
                   end
                 end
               end
-            end unless section.lines.empty?
+            end
           end
         end
       end
 
       mab.to_s
     end
 
-    def comment=(value)
-      @comment = value
-    end
+    attr_writer :comment
 
     alias_method :ci=, :comment=
     alias_method :comment_italic=, :comment=

lib/chord_pro/version.rb

@@ -1,3 +1,3 @@
 module ChordPro
-  VERSION = '0.1.7'.freeze
+  VERSION = "0.1.8".freeze
 end