midi_lyrics 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07b22e1ff4393dd7bdb547715aee9447120e18fd
-  data.tar.gz: d5cc38925318b678df054a00b8fd63ee43e49240
+  metadata.gz: 4a310168013f34acd05cac16d712dd0d8e8cc23e
+  data.tar.gz: cd5b78485d19c94f551e67142f2c22690ff19e2e
 SHA512:
-  metadata.gz: 4e2a905b89acb28eb50f2f00755cf822b341a554cb0707397cda6ba0c2393ec96ef41e5d19bc8e85e50796a63e637d7da868dc1da3170cbe1244ee2699b5a859
-  data.tar.gz: 557d80948ace9c3d79647cb57b7240f189e2190034146bf0450df0756d89355c901a43c2b2dc7952208435e64de649e8fb2ca34f8bf674221b4b392fcadbd1ca
+  metadata.gz: 1d57f45820e56a7d6ab6ee2f0d327bc89c0e1327c09b68bc9249bc610def44dfcfc61b45f896d171dac12e6943c620a976f597e2ccfbcf124d2057111ddaf8a0
+  data.tar.gz: 343f76df6de80b0a407932feae49bc36126211ed7a2fa96f9ccab3c4c8873da808ca7ccc048314f78a5c5e3c2c58616f7e85da765412da7ef4e434ce2e08577b

data/README.md

@@ -20,11 +20,11 @@ Or install it yourself as:
 
 ## Usage
 
-    >> MidiLyrics::Parser.new("test.mid").extract.collect(&:as_json)
+    >> MidiLyrics::Parser.new("test.mid").extract
     => [
-        { text: "Test",  start: 0,     start2: 0.0, duration: 0.417 },
-        { text: "ing",   start: 0.5,   start2: 0.0, duration: 0.417 },
-        { text: "\r\n", start: 0.917, start2: 0.0, duration: 0  }
+        { text: "Test", start: 0,     start2: 0.0, duration: 0.417 },
+        { text: "ing",  start: 0.5,   start2: 0.0, duration: 0.417 },
+        { text: "\r\n", start: 0.917, start2: 0.0, duration: 0.0   }
       ]
 
 ## Contributing

data/lib/midi_lyrics/version.rb

@@ -1,3 +1,3 @@
 module MidiLyrics
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/midi_lyrics.rb

@@ -29,7 +29,7 @@ module MidiLyrics
     end
 
     def blank?
-      text.strip == ""
+      text.gsub('-', '').strip == ""
     end
 
     def similar_to?(another)
@@ -109,12 +109,12 @@ module MidiLyrics
       @lyrics = []
       @lyrics_track.each do |event|
         event_text = event.data.collect{|x| x.chr(Encoding::UTF_8)}.join
-        letters = event_text.gsub(/^\s+|\s+$/, '')
+        letters = event_text.gsub(/^[\s-]+|[\s-]+$/, '')
 
-        heading_space = event_text.match(/^(\s+)[^\s]/)
+        heading_space = event_text.match(/^([\s-]+)[^[\s-]]/)
         heading_space = heading_space[1] unless heading_space.nil?
 
-        trailing_space = event_text.match(/(\s+)$/)
+        trailing_space = event_text.match(/([\s-]+)$/)
         trailing_space = trailing_space[1] unless trailing_space.nil?
 
         [heading_space, letters, trailing_space].each do |text|
@@ -131,7 +131,7 @@ module MidiLyrics
     end
 
     def remove_heading_blank_lines
-      while @lyrics.first.text.strip == ""
+      while @lyrics.first.blank?
         @lyrics.shift
       end
     end
@@ -140,13 +140,18 @@ module MidiLyrics
       new_lyrics = []
       @lyrics.each do |l|
         if l.blank?
-          if new_lyrics.last.blank?
-            new_lyrics.last.text += l.text
-          else
-            l.start_in_pulses = new_lyrics.last.start_in_pulses + new_lyrics.last.duration_in_pulses
-            l.duration_in_pulses = 0.0
-            new_lyrics << l
-          end
+          # if new_lyrics.last
+            if new_lyrics.last.blank?
+              new_lyrics.last.text += l.text
+            else
+              l.start_in_pulses = new_lyrics.last.start_in_pulses + new_lyrics.last.duration_in_pulses
+              l.duration_in_pulses = 0.0
+              new_lyrics << l
+            end
+          # else
+          #   l.duration_in_pulses = 0.0
+          #   new_lyrics << l
+          # end
         else
           new_lyrics << l
         end
@@ -156,7 +161,7 @@ module MidiLyrics
 
     def remove_lines_trailing_spaces
       @lyrics.each do |l|
-        l.text.gsub!(/^ ([\r\n])/, '\1')
+        l.text.gsub!(/^[ -]*([\r\n])/, '\1')
       end
     end
 

data/spec/midi_lyrics_spec.rb

@@ -46,6 +46,16 @@ describe MidiLyrics do
       ])
     end
 
+    it "parses two_notes_two_syllables_dash.mid correctly" do
+      expect(
+        MidiLyrics::Parser.new("spec/fixtures/two_notes_two_syllables_dash.mid").extract
+      ).to eq([
+        { text: "Test", start: 0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "ing", start: 0.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r\n", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 }
+      ])
+    end
+
     it "parses two_notes_three_syllables.mid correctly" do
       expect(
         MidiLyrics::Parser.new("spec/fixtures/two_notes_three_syllables.mid").extract

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midi_lyrics
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mateus Del Bianco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,8 @@ files:
 - spec/fixtures/two_notes_three_syllables.nwc
 - spec/fixtures/two_notes_two_syllables.mid
 - spec/fixtures/two_notes_two_syllables.nwc
+- spec/fixtures/two_notes_two_syllables_dash.mid
+- spec/fixtures/two_notes_two_syllables_dash.nwc
 - spec/midi_lyrics_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mateusdelbianco/midi_lyrics
@@ -144,5 +146,7 @@ test_files:
 - spec/fixtures/two_notes_three_syllables.nwc
 - spec/fixtures/two_notes_two_syllables.mid
 - spec/fixtures/two_notes_two_syllables.nwc
+- spec/fixtures/two_notes_two_syllables_dash.mid
+- spec/fixtures/two_notes_two_syllables_dash.nwc
 - spec/midi_lyrics_spec.rb
 - spec/spec_helper.rb