midi_lyrics 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a310168013f34acd05cac16d712dd0d8e8cc23e
-  data.tar.gz: cd5b78485d19c94f551e67142f2c22690ff19e2e
+  metadata.gz: f2d3244f48a9396a092d757b43cf05e3aadd4968
+  data.tar.gz: d4e2d6d87f15bac459768ef2a5958a8d6ca4d6e6
 SHA512:
-  metadata.gz: 1d57f45820e56a7d6ab6ee2f0d327bc89c0e1327c09b68bc9249bc610def44dfcfc61b45f896d171dac12e6943c620a976f597e2ccfbcf124d2057111ddaf8a0
-  data.tar.gz: 343f76df6de80b0a407932feae49bc36126211ed7a2fa96f9ccab3c4c8873da808ca7ccc048314f78a5c5e3c2c58616f7e85da765412da7ef4e434ce2e08577b
+  metadata.gz: 86f4b34f63cc01bdb978c24c7e34396b32b3c6d5b64e79cd8942aa91a4a3e853dfd57bb4f9aaf75f20e7ff6d3d9692f0b49f1a031a3ea2f66380260ad2f07cb5
+  data.tar.gz: d2bb17884dd4ec0a0ffd2f9c8d6cf4e3d0fea338b69d44b1c0e88ed24c34951a3591b8f3f1d47033a6d0892a9a961c1ae1f2ad45d50b1308d3394888002be92f

data/lib/midi_lyrics/version.rb

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

data/lib/midi_lyrics.rb

@@ -28,6 +28,10 @@ module MidiLyrics
       format_time(duration_in_pulses)
     end
 
+    def end_in_pulses
+      start_in_pulses + duration_in_pulses
+    end
+
     def blank?
       text.gsub('-', '').strip == ""
     end
@@ -73,6 +77,7 @@ module MidiLyrics
       consolidate_empty_syllables
       remove_lines_trailing_spaces
       remove_repeating unless repeating
+      fix_durations
       @lyrics.collect(&:as_json)
     end
 
@@ -140,18 +145,13 @@ module MidiLyrics
       new_lyrics = []
       @lyrics.each do |l|
         if l.blank?
-          # 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
+          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
           new_lyrics << l
         end
@@ -187,5 +187,17 @@ module MidiLyrics
         merge_half_lyrics
       end
     end
+
+    def lyric_starting_at time_in_pulses
+      @lyrics.find{ |l| l.duration_in_pulses != 0.0 && l.start_in_pulses == time_in_pulses }
+    end
+
+    def fix_durations
+      @lyrics.each do |lyric|
+        while @durations.has_key?(lyric.end_in_pulses) && lyric_starting_at(lyric.end_in_pulses).nil?
+          lyric.duration_in_pulses += @durations[lyric.end_in_pulses]
+        end
+      end
+    end
   end
 end

data/spec/midi_lyrics_spec.rb

@@ -18,9 +18,9 @@ describe MidiLyrics do
       ])
     end
 
-    it "parses one_note_two_syllable.mid correctly" do
+    it "parses one_note_two_syllables.mid correctly" do
       expect(
-        MidiLyrics::Parser.new("spec/fixtures/one_note_two_syllable.mid").extract
+        MidiLyrics::Parser.new("spec/fixtures/one_note_two_syllables.mid").extract
       ).to eq([
         { text: "Test One", start: 0.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
         { text: "\r\n", start: QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 }
@@ -66,6 +66,38 @@ describe MidiLyrics do
       ])
     end
 
+    it "parses three_notes_two_syllables.mid correctly" do
+      expect(
+        MidiLyrics::Parser.new("spec/fixtures/three_notes_two_syllables.mid").extract
+      ).to eq([
+        { text: "Test", start: 0, start2: 0.0, duration: 0.5 + QUARTER_NOTE_DURATION },
+        { text: "ing", start: 1, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r\n", start: 1 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 }
+      ])
+    end
+
+    it "parses three_notes_two_syllables_with_pause.mid correctly" do
+      expect(
+        MidiLyrics::Parser.new("spec/fixtures/three_notes_two_syllables_with_pause.mid").extract
+      ).to eq([
+        { text: "Test", start: 0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "ing", start: 1, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r\n", start: 1 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 }
+      ])
+    end
+
+    it "parses three_notes_three_syllables.mid correctly" do
+      expect(
+        MidiLyrics::Parser.new("spec/fixtures/three_notes_three_syllables.mid").extract
+      ).to eq([
+        { text: "Hi,", start: 0.0, start2: 0.0, duration: 0.5 },
+        { text: " ", start: 0.5, start2: 0.0, duration: 0.0 },
+        { text: "test", start: 0.5, start2: 0.0, duration: 0.5 },
+        { text: "ing", start: 1.0, start2: 0.0, duration: 0.5 },
+        { text: "\r\n", start: 1.5, start2: 0.0, duration: 0.0 }
+      ])
+    end
+
     it "parses spaces_and_returns.mid correctly" do
       expect(
         MidiLyrics::Parser.new("spec/fixtures/spaces_and_returns.mid").extract

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midi_lyrics
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mateus Del Bianco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,12 +89,18 @@ files:
 - spec/fixtures/complete_example.nwc
 - spec/fixtures/one_note_one_syllable.mid
 - spec/fixtures/one_note_one_syllable.nwc
-- spec/fixtures/one_note_two_syllable.mid
-- spec/fixtures/one_note_two_syllable.nwc
+- spec/fixtures/one_note_two_syllables.mid
+- spec/fixtures/one_note_two_syllables.nwc
 - spec/fixtures/repeating_lyrics.mid
 - spec/fixtures/repeating_lyrics.nwc
 - spec/fixtures/spaces_and_returns.mid
 - spec/fixtures/spaces_and_returns.nwc
+- spec/fixtures/three_notes_three_syllables.mid
+- spec/fixtures/three_notes_three_syllables.nwc
+- spec/fixtures/three_notes_two_syllables.mid
+- spec/fixtures/three_notes_two_syllables.nwc
+- spec/fixtures/three_notes_two_syllables_with_pause.mid
+- spec/fixtures/three_notes_two_syllables_with_pause.nwc
 - spec/fixtures/two_notes_one_syllable.mid
 - spec/fixtures/two_notes_one_syllable.nwc
 - spec/fixtures/two_notes_three_syllables.mid
@@ -134,12 +140,18 @@ test_files:
 - spec/fixtures/complete_example.nwc
 - spec/fixtures/one_note_one_syllable.mid
 - spec/fixtures/one_note_one_syllable.nwc
-- spec/fixtures/one_note_two_syllable.mid
-- spec/fixtures/one_note_two_syllable.nwc
+- spec/fixtures/one_note_two_syllables.mid
+- spec/fixtures/one_note_two_syllables.nwc
 - spec/fixtures/repeating_lyrics.mid
 - spec/fixtures/repeating_lyrics.nwc
 - spec/fixtures/spaces_and_returns.mid
 - spec/fixtures/spaces_and_returns.nwc
+- spec/fixtures/three_notes_three_syllables.mid
+- spec/fixtures/three_notes_three_syllables.nwc
+- spec/fixtures/three_notes_two_syllables.mid
+- spec/fixtures/three_notes_two_syllables.nwc
+- spec/fixtures/three_notes_two_syllables_with_pause.mid
+- spec/fixtures/three_notes_two_syllables_with_pause.nwc
 - spec/fixtures/two_notes_one_syllable.mid
 - spec/fixtures/two_notes_one_syllable.nwc
 - spec/fixtures/two_notes_three_syllables.mid