song_pro 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d13f7f76dd430f25293eab52b8ebb42c1a6ed45eb5a5dedbd117cb4b0206b80
-  data.tar.gz: b13503808204e547d71b958d8ac7691bb040a3b1f3f7c8029e3dc9638753ca58
+  metadata.gz: a60d1b3170f1c93d6715aaf1e6ac32d4f7ea36279fd6337332e548f0d0b27ead
+  data.tar.gz: d6f071f7c7be13424e9861279ddae1cc5edf5f7264dfad1a2bbd9ee66cfcd542
 SHA512:
-  metadata.gz: 234fdde6636efb454f57b9bd12c9a25a087aad982ca732e04114c2dbf9166b118bc39a69d2371064ffe88064bf0760157ee632f84aa8f2ff490f4d4f90e2baa7
-  data.tar.gz: 31d1cafad5793a282bf37705794239d03a1eb8e4a0f7a273db153cef170ed29bf2acd685c6a7c93fcaa0860a8e5c98ee90277a04646066abc351d5e6a4adbe45
+  metadata.gz: 92826523e6724d3f5b94904302a0e2d037af838c6d0d0b5761de1b8a88241bccbd6c2a6be30b18c1eeca7b0e012119584204d7c33d72ffc79c574571ed8cddff
+  data.tar.gz: e63ddc6b96e8538d74b6158fa6ddfa9f7688d9a3b374f82beec5a6381cb8729e41437ee26ea68335114b235ea9d41ff44896435fe31062c2e0a5667b1f68e03f

data/.ruby-version

@@ -1 +1 @@
-2.6.1
+2.6.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    song_pro (0.1.3)
+    song_pro (0.1.4)
       markaby
 
 GEM

data/lib/song_pro/line.rb

@@ -2,15 +2,21 @@
 
 module SongPro
   class Line
-    attr_accessor :parts, :tablature
+    attr_accessor :parts, :tablature, :measures
 
     def initialize
       @parts = []
       @tablature = nil
+      @measures = nil
     end
 
     def tablature?
       return @tablature != nil
     end
+
+    def measures?
+      return @measures != nil
+    end
+
   end
 end

data/lib/song_pro/measure.rb

@@ -0,0 +1,9 @@
+module SongPro
+  class Measure
+    attr_accessor :chords
+
+    def initialize
+      @chords = []
+    end
+  end
+end

data/lib/song_pro/song.rb

@@ -66,6 +66,16 @@ module SongPro
                   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|

data/lib/song_pro/version.rb

@@ -1,3 +1,3 @@
 module SongPro
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/lib/song_pro.rb

@@ -5,12 +5,15 @@ 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 = /(\[[\w#b\/]+\])?([\w\s',.!\(\)_\-"]*)/i
+  CHORDS_AND_LYRICS_REGEX = %r{(\[[\w#b\/]+\])?([\w\s',.!()_\-"]*)}i
+  MEASURES_REGEX = %r{([\[[\w#b\/]+\]\s]+)[|]*}i
+  CHORDS_REGEX = %r{\[([\w#b\/]+)\]?}i
 
   def self.parse(lines)
     song = Song.new
@@ -60,7 +63,6 @@ module SongPro
     song.set_custom(key, value)
   end
 
-
   def self.process_lyrics_and_chords(song, current_section, text)
     return if text == ''
 
@@ -71,16 +73,29 @@ module SongPro
 
     line = Line.new
 
-    if text.start_with?('|')
+    if text.start_with?('|-')
       line.tablature = text
+    elsif text.start_with?('| ')
+      captures = text.scan(MEASURES_REGEX).flatten
+
+      measures = []
+
+      captures.each do |capture|
+        chords = capture.scan(CHORDS_REGEX).flatten
+        measure = Measure.new
+        measure.chords = chords
+        measures << measure
+      end
+
+      line.measures = measures
     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]&.strip || ''
+      captures.each_slice(2) do |pair|
+        part = Part.new
+        chord = pair[0]&.strip || ''
+        part.chord = chord.delete('[').delete(']')
+        part.lyric = pair[1]&.strip || ''
 
         line.parts << part unless (part.chord == '') && (part.lyric == '')
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: song_pro
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Brian Kelly
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: markaby
@@ -100,6 +100,7 @@ files:
 - bin/setup
 - lib/song_pro.rb
 - lib/song_pro/line.rb
+- lib/song_pro/measure.rb
 - lib/song_pro/part.rb
 - lib/song_pro/section.rb
 - lib/song_pro/song.rb
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Converts SongPro files to HTML