songbook 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d862405d26a445cf66da2b06ed4fb5c35bb70ad1e14633649d2f05f141d0f340
-  data.tar.gz: d93153d5a854ff317a3be0c20608134aa4c343085eadef3be24ab794abdeb061
+  metadata.gz: 77a576ace791a1d2336d9a1028864b0430263bbd8ef7a7ee1fab7b3c32feead6
+  data.tar.gz: cc47254a55d12c987e451ca82aa76dfe4a054b9685f624821196cce1b8396ee5
 SHA512:
-  metadata.gz: 632ccbdd9d3e895412c0501b7bffdeed7824fb708949eb9eaee7d91e107c0b43d34c9a92a83fa9780ec1eb2da857275476dedcf401c58408f967fb73a17f4398
-  data.tar.gz: 83831f2a8e03990d1bb5fce2b3338c70f62f8764b469865df8fb0bcaac2400f0193583926defa16c1471cc46fe5cf8a4ac6cc5c246f70af46bb791c11ffe59e2
+  metadata.gz: 01c14ac68fe116b3119b4861b0b43fb4061df58dc7ca843f23f1cfb16f4b52560054c39a3e356f76975710a9080e4ce819a88d414d302e52ed24b1b2bc7f6e3f
+  data.tar.gz: 671c92a26a6f4b5c314573c156a3fcabe93ea4ea1b965947aadc4a4443ba2300fb12e16c41782d1fe724a8b0eefd6a2cc320a60fe7fb892faea45c88186f10c6

data/lib/songbook/generate_song_file.rb

@@ -27,14 +27,11 @@ module Songbook
     end
 
     def song
-      table_width = song_data['config']['table_width'] if song_data['config']
-
       @song ||= Song.new(
         title: File.basename(input_path, '.yml'),
         details: song_data['details'],
         chords: song_data['chords'],
-        lyrics: song_data['lyrics'],
-        table_width: table_width
+        lyrics: song_data['lyrics']
       )
     end
 

data/lib/songbook/render_song.rb

@@ -29,10 +29,10 @@ module Songbook
     def verses_table
       table = TTY::Table.new do |t|
         song.verses.each do |verse|
-          t << ["[#{verse.title}]", nil]
+          t << [verse.formatted_title, nil]
 
           verse.lines.each do |line|
-            t << [line.lyrics, line.chords]
+            t << [line.chords, line.lyrics]
           end
 
           t << SEPARATOR
@@ -48,22 +48,22 @@ module Songbook
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def table_settings
-      { column_widths: [lyrics_column_width, nil], multiline: true }
+      { resize: true, width: table_width }
     end
 
-    def lyrics_column_width
-      [
-        song.table_width - chords_column_width - LYRICS_CHORDS_SEPARATOR.length,
-        max_lyrics_column_width
-      ].min
+    def table_width
+      chords_column_width + LYRICS_CHORDS_SEPARATOR.length + lyrics_column_width
     end
 
-    def max_lyrics_column_width
+    def lyrics_column_width
       song.verses.flat_map(&:lines).flat_map(&:lyrics).map(&:length).max
     end
 
     def chords_column_width
-      song.verses.flat_map(&:lines).flat_map(&:chords).map(&:length).max
+      chord_column_texts =
+        song.verses.flat_map(&:lines).flat_map(&:chords) + song.verses.map(&:formatted_title)
+
+      chord_column_texts.map(&:length).max
     end
   end
 end

data/lib/songbook/song.rb

@@ -4,16 +4,13 @@ require_relative 'verse'
 
 module Songbook
   class Song
-    TABLE_WIDTH = 80
+    attr_reader :title, :details, :chords, :lyrics
 
-    attr_reader :title, :details, :chords, :lyrics, :table_width
-
-    def initialize(title:, details:, chords:, lyrics:, table_width: nil)
+    def initialize(title:, details:, chords:, lyrics:)
       @title = title
       @details = details
       @chords = chords
       @lyrics = lyrics
-      @table_width = table_width || TABLE_WIDTH
     end
 
     def verses

data/lib/songbook/verse.rb

@@ -27,6 +27,10 @@ module Songbook
     end
     # rubocop:enable Metrics/AbcSize
 
+    def formatted_title
+      "[#{title}]"
+    end
+
     private
 
     def lyric_lines

data/lib/songbook/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Songbook
-  VERSION = '0.4.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: songbook
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - George Mendoza
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-28 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-table
@@ -135,7 +135,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,8 +150,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.22
+signing_key:
 specification_version: 4
 summary: Songbook
 test_files: []