song_pro 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d51559bf23b8581a8dcba60800e39aab562439dc6e46ddce858feb46a4b86be
-  data.tar.gz: 496d9b028ace33732b0a420b271feaa2cdf274f06e725fc5747968cd033ea325
+  metadata.gz: c06c0b9f50bce6995726f812e4472defeb00cb4b37af5e5498b043fa1c9ed8a1
+  data.tar.gz: 955eec40e9481a7de7e4b0a46369f7e8c717e1919d653ec8aeb2b90d3eed1db2
 SHA512:
-  metadata.gz: 89ba491f7a8468cbe8746539b682461d00542d52bb17f6b68c622381c0e2399ed57b2714faa78e8496c24244bf5f623e867c51264f4a042c2f836e9162f29ca9
-  data.tar.gz: 36b35726800500b43630430e0b17a0cbe93a8657936eef2b8ebc19878887b9d280b8647f520efbfa8afe79b47055da6c95144cbb4faa1851b2a06f58db04ebed
+  metadata.gz: 28b10e4bc6531745b33dd01b5cb59c48210e8bc1ba635e333232bf4ea5b89fb537c9b8ecc18e02509be429841dd4e8adcb66ccd85966e1e798264afe807b0b2e
+  data.tar.gz: 217c7f14d9b13d34b066886ae9f14d1ff0a92d5ccfe3fd699e0e63ce448586572a92da8ca2fc00f8446829cce7f01511c8f9e3bdb4166c220c6c3aadbcaf9e12

data/.github/workflows/build.yml

@@ -2,20 +2,24 @@ name: Build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test:
     runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [3.0, 3.1, 3.2, 3.3]
+
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
+    - uses: actions/checkout@v4
+    - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
-    - name: Install dependencies
-      run: bundle install
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
     - name: Run tests
       run: bundle exec rake

data/.ruby-version

@@ -1 +1 @@
-2.7.3
+3.3.3

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.3.3

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 

data/Gemfile.lock

@@ -1,39 +1,82 @@
 PATH
   remote: .
   specs:
-    song_pro (0.1.9)
-      markaby
+    song_pro (0.1.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    builder (3.2.4)
-    diff-lcs (1.4.4)
-    markaby (0.9.0)
-      builder
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    ast (2.4.2)
+    diff-lcs (1.5.1)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
+    parallel (1.25.1)
+    parser (3.3.3.0)
+      ast (~> 2.4.1)
+      racc
+    racc (1.8.0)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.3)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.64.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-progressbar (1.13.0)
+    standard (1.37.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.64.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.4)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.4.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.21.0)
+    standardrb (1.0.1)
+      standard
+    strscan (3.1.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 2.2.19)
-  rake (~> 13.0)
-  rspec (~> 3.8)
+  bundler
+  rake
+  rspec
   song_pro!
+  standardrb
 
 BUNDLED WITH
-   2.2.21
+   2.4.16

data/README.md

@@ -1,4 +1,4 @@
-# SongPro for Ruby ![Build](https://github.com/SongProOrg/songpro-ruby/workflows/Build/badge.svg?branch=master)
+# SongPro for Ruby ![Build](https://github.com/SongProOrg/songpro-ruby/workflows/Build/badge.svg?branch=main)
 
 [SongPro](https://songpro.org) is a text format for transcribing songs.
  
@@ -60,8 +60,11 @@ puts song.title
 puts song.artist
 # Brian Kelly
 
-puts song.sections[1].title
+puts song.sections[1].name
 # Chorus 1
+
+p song.chords
+# ["D", "A", "Bm", "F#m", "G", "Asus4", "A7", "F#"]
 ```
 
 ## Development

data/Rakefile

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "standard/rake"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: [:spec, :standard]

data/lib/song_pro/part.rb

@@ -4,4 +4,4 @@ module SongPro
   class Part
     attr_accessor :lyric, :chord
   end
-end
+end

data/lib/song_pro/section.rb

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

data/lib/song_pro/song.rb

@@ -1,19 +1,17 @@
 # frozen_string_literal: true
 
-require 'markaby'
-
 module SongPro
   class Song
     attr_accessor :title,
-                  :artist,
-                  :capo,
-                  :key,
-                  :tempo,
-                  :year,
-                  :album,
-                  :tuning,
-                  :sections,
-                  :custom
+      :artist,
+      :capo,
+      :key,
+      :tempo,
+      :year,
+      :album,
+      :tuning,
+      :sections,
+      :custom
 
     def initialize
       @sections = []
@@ -35,76 +33,5 @@ module SongPro
         end
       end.flatten.uniq.reject(&:empty?)
     end
-
-    def to_html
-      mab = Markaby::Builder.new(song: self)
-      mab.div.song do
-        h1.title song.title if song.title
-        h2.artist song.artist if song.artist
-
-        dl.information do
-          if song.tuning
-            dt.tuning 'Tuning'
-            dd.tuning song.tuning
-          end
-          if song.capo
-            dt.capo 'Capo'
-            dd.capo song.capo
-          end
-          if song.key
-            dt.key 'Key'
-            dd.key song.key
-          end
-          if song.tempo
-            dt.tempo 'Tempo'
-            dd.tempo song.tempo
-          end
-          if song.year
-            dt.year 'Year'
-            dd.year song.year
-          end
-          if song.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
-                        end
-                      end
-                    end
-                  end
-                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
-        end
-      end
-
-      mab.to_s
-    end
   end
 end

data/lib/song_pro/version.rb

@@ -1,3 +1,3 @@
 module SongPro
-  VERSION = '0.1.10'.freeze
+  VERSION = "0.1.12".freeze
 end

data/lib/song_pro.rb

@@ -1,32 +1,33 @@
 # frozen_string_literal: true
 
-require 'song_pro/version'
-require 'song_pro/song'
-require 'song_pro/section'
-require 'song_pro/line'
-require 'song_pro/part'
-require 'song_pro/measure'
+require "song_pro/version"
+require "song_pro/song"
+require "song_pro/section"
+require "song_pro/line"
+require "song_pro/part"
+require "song_pro/measure"
 
 module SongPro
   SECTION_REGEX = /#\s*([^$]*)/
   ATTRIBUTE_REGEX = /@(\w*)=([^%]*)/
   CUSTOM_ATTRIBUTE_REGEX = /!(\w*)=([^%]*)/
-  CHORDS_AND_LYRICS_REGEX = %r{(\[[\w#b+\/]+\])?([^\[]*)}i
+  CHORDS_AND_LYRICS_REGEX = %r{(\[[\w#b+/]+\])?([^\[]*)}i
 
-  MEASURES_REGEX = %r{([\[[\w#b\/]+\]\s]+)[|]*}i
-  CHORDS_REGEX = %r{\[([\w#b+\/]+)\]?}i
+  MEASURES_REGEX = %r{([\[[\w#b/]+\]\s]+)[|]*}i
+  CHORDS_REGEX = %r{\[([\w#b+/]+)\]?}i
   COMMENT_REGEX = />\s*([^$]*)/
+  TABLATURE_REGEX = /^\s?[a-zA-Z]?#?b?\|-/
 
   def self.parse(lines)
     song = Song.new
     current_section = nil
 
     lines.split("\n").each do |text|
-      if text.start_with?('@')
+      if text.start_with?("@")
         process_attribute(song, text)
-      elsif text.start_with?('!')
+      elsif text.start_with?("!")
         process_custom_attribute(song, text)
-      elsif text.start_with?('#')
+      elsif text.start_with?("#")
         current_section = process_section(song, text)
       else
         process_lyrics_and_chords(song, current_section, text)
@@ -50,8 +51,8 @@ module SongPro
     key = matches[1]
     value = matches[2].strip
 
-    if song.respond_to?("#{key}=".to_sym)
-      song.send("#{key}=", value)
+    if song.respond_to?(:"#{key}=")
+      song.send(:"#{key}=", value)
     else
       puts "WARNING: Unknown attribute '#{key}'"
     end
@@ -66,18 +67,18 @@ module SongPro
   end
 
   def self.process_lyrics_and_chords(song, current_section, text)
-    return if text == ''
+    return if text == ""
 
     if current_section.nil?
-      current_section = Section.new(name: '')
+      current_section = Section.new(name: "")
       song.sections << current_section
     end
 
     line = Line.new
 
-    if text.start_with?('|-')
+    if text.match(TABLATURE_REGEX)
       line.tablature = text
-    elsif text.start_with?('| ')
+    elsif text.start_with?("| ")
       captures = text.scan(MEASURES_REGEX).flatten
 
       measures = []
@@ -90,7 +91,7 @@ module SongPro
       end
 
       line.measures = measures
-    elsif text.start_with?('>')
+    elsif text.start_with?(">")
       matches = COMMENT_REGEX.match(text)
       comment = matches[1].strip
       line.comment = comment
@@ -99,11 +100,11 @@ module SongPro
 
       captures.each_slice(2) do |pair|
         part = Part.new
-        chord = pair[0]&.strip || ''
-        part.chord = chord.delete('[').delete(']')
-        part.lyric = pair[1] || ''
+        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
 

data/song_pro.gemspec

@@ -1,34 +1,34 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'song_pro/version'
+require "song_pro/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'song_pro'
-  spec.version       = SongPro::VERSION
-  spec.authors       = ['Brian Kelly']
-  spec.email         = ['polymonic@gmail.com']
+  spec.name = "song_pro"
+  spec.version = SongPro::VERSION
+  spec.authors = ["Brian Kelly"]
+  spec.email = ["polymonic@gmail.com"]
 
-  spec.summary       = 'Converts SongPro files to HTML'
-  spec.description   = 'Provides classes for creating, parsing and rendering SongPro files'
-  spec.homepage      = 'https://songpro.org'
-  spec.license       = 'MIT'
+  spec.summary = "Converts SongPro files to HTML"
+  spec.description = "Provides classes for creating, parsing and rendering SongPro files"
+  spec.homepage = "https://songpro.org"
+  spec.license = "MIT"
 
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
   else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
   end
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'markaby'
-  spec.add_development_dependency "bundler", ">= 2.2.19"
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.8'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "standardrb"
 end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: song_pro
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Brian Kelly
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-04 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: markaby
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.19
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.19
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: standardrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0'
 description: Provides classes for creating, parsing and rendering SongPro files
 email:
 - polymonic@gmail.com
@@ -77,7 +77,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -98,7 +98,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,8 +113,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.5.15
+signing_key:
 specification_version: 4
 summary: Converts SongPro files to HTML
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.3
-before_install: gem install bundler -v 2.2