midi_lyrics 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25ee2f178ba21c7e16bb86db9680b65d30f76324
-  data.tar.gz: 979f7dfe084d8db529566e5bef20a30cf7ff68d0
+  metadata.gz: f734c528919168e0348b3b936bd4dbd8c0e7041a
+  data.tar.gz: ace7320df7fbaab6d2bda807e1220368cdf1273e
 SHA512:
-  metadata.gz: 40915a6ffdc72a025f4b1b86947b619c3a2f8dc44e93b0e928e3851e59e54d4c383e150625513985829571f6114cbe872d405678c4c86c623adcf67e993634cd
-  data.tar.gz: 023708cf54f7a8efd256bdd5f892b92cf3e68f409e076dd598c18e5e31938323a24353f1cfe229ea8ee6ecec89bab078567283838a20da3b615becf4fb984e80
+  metadata.gz: c216ecd753faf7535e8044b3a93204623039ab741dbe9f24ea51e8c1cb2e889a14ef00aab78422b7e87d83832902ea97f6af48f7285c9e5058835f817b62bcce
+  data.tar.gz: 3a554fef7e8359b4983b6f192e23e9913cd116630843c3d2b8ecd08de11c4c94531943b63fa6064746a8b5fd4958a7601c456b4cf491a78c7245c3273ec09066

data/README.md

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

data/lib/midi_lyrics/version.rb

@@ -1,3 +1,3 @@
 module MidiLyrics
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/midi_lyrics.rb

@@ -28,6 +28,10 @@ module MidiLyrics
       format_time(duration_in_pulses)
     end
 
+    def blank?
+      text.strip == ""
+    end
+
     def similar_to?(another)
       self.duration_in_pulses == another.duration_in_pulses && self.text == another.text
     end
@@ -73,10 +77,7 @@ module MidiLyrics
       @noteon_track = ::MIDI::Track.new(@sequence)
       @sequence.tracks[1].each do | event |
         if event.kind_of?(::MIDI::MetaEvent) && event.meta_type == ::MIDI::META_LYRIC
-          text = event.data.collect{|x| x.chr(Encoding::UTF_8)}.join
-          if text.gsub(" ", "") != ""
-            @lyrics_track.events << event
-          end
+          @lyrics_track.events << event
         end
         if event.kind_of?(::MIDI::NoteOn)
           @noteon_track.events << event
@@ -92,13 +93,25 @@ module MidiLyrics
     end
 
     def load_lyrics
-      @lyrics = @lyrics_track.collect do |event|
-        LyricSyllable.new(
-          sequence: @sequence,
-          start_in_pulses: event.time_from_start,
-          duration_in_pulses: @durations[event.time_from_start],
-          text: event.data.collect{|x| x.chr(Encoding::UTF_8)}.join,
-        )
+      @lyrics = []
+      @lyrics_track.each do |event|
+        parts = event.data.collect{|x| x.chr(Encoding::UTF_8)}.join.match(/([^\s]*)(\s*)/)
+        if parts[1] != ""
+          @lyrics << LyricSyllable.new(
+            sequence: @sequence,
+            start_in_pulses: event.time_from_start,
+            duration_in_pulses: @durations[event.time_from_start],
+            text: parts[1]
+          )
+        end
+        if parts[2] != ""
+          @lyrics << LyricSyllable.new(
+            sequence: @sequence,
+            start_in_pulses: event.time_from_start,
+            duration_in_pulses: 0,
+            text: parts[2]
+          )
+        end
       end
     end
 
@@ -108,13 +121,17 @@ module MidiLyrics
       end
     end
 
-    def consolidate_carriage_returns
+    def consolidate_empty_syllables
       new_lyrics = []
       @lyrics.each do |l|
-        if ["\r", "\n"].include?(l.text)
-          l.start_in_pulses = new_lyrics.last.start_in_pulses + new_lyrics.last.duration_in_pulses
-          l.duration_in_pulses = 0
-          new_lyrics << 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
         else
           new_lyrics << l
         end
@@ -151,7 +168,7 @@ module MidiLyrics
       calculate_durations
       load_lyrics
       remove_heading_blank_lines
-      consolidate_carriage_returns
+      consolidate_empty_syllables
       remove_repeating unless repeating
       @lyrics
     end

data/spec/midi_lyrics_spec.rb

@@ -12,7 +12,7 @@ describe MidiLyrics do
     let(:lyrics) { MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid").extract }
 
     it "has text method" do
-      expect(lyrics[1].text).to eq("ing ")
+      expect(lyrics[1].text).to eq("ing")
     end
 
     it "has start_in_pulses method" do
@@ -40,7 +40,7 @@ describe MidiLyrics do
     end
 
     it "has as_json method" do
-      expect(lyrics[1].as_json).to eq({text: "ing ", start: 0.5, start2: 3.0, duration: 0.417})
+      expect(lyrics[1].as_json).to eq({text: "ing", start: 0.5, start2: 3.0, duration: 0.417})
     end
   end
 
@@ -49,9 +49,8 @@ describe MidiLyrics do
       expect(
         MidiLyrics::Parser.new("spec/fixtures/one_note_one_syllable.mid").extract.collect(&:as_json)
       ).to eq([
-        { text: "Test ", start: 0.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
-        { text: "\n", start: QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 }
+        { text: "Test", start: 0.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: " \r\n", start: QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 }
       ])
     end
 
@@ -59,9 +58,8 @@ describe MidiLyrics do
       expect(
         MidiLyrics::Parser.new("spec/fixtures/two_notes_one_syllable.mid").extract.collect(&:as_json)
       ).to eq([
-        { text: "Test ", start: 0, start2: 0.0, duration: 0.5 + QUARTER_NOTE_DURATION },
-        { text: "\r", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0 },
-        { text: "\n", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0 }
+        { text: "Test", start: 0, start2: 0.0, duration: 0.5 + QUARTER_NOTE_DURATION },
+        { text: " \r\n", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 }
       ])
     end
 
@@ -70,9 +68,8 @@ describe MidiLyrics do
         MidiLyrics::Parser.new("spec/fixtures/two_notes_two_syllables.mid").extract.collect(&:as_json)
       ).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", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0 },
-        { text: "\n", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0 }
+        { 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
 
@@ -81,13 +78,14 @@ describe MidiLyrics do
         MidiLyrics::Parser.new("spec/fixtures/spaces_and_returns.mid").extract.collect(&:as_json)
       ).to eq([
         { text: "Test", start: 0.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "ing ", start: 1, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: 1 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0 },
+        { text: "ing", start: 1, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: " \r", start: 1 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "One", start: 1.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: " ", start: 1.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "Two", start: 2.5, start2: 0.0, duration: HALF_NOTE_DURATION },
-        { text: "Three ", start: 3.5, start2: 0.0, duration: HALF_NOTE_DURATION },
-        { text: "\r", start: 3.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0 },
-        { text: "\n", start: 3.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0 }
+        { text: " ", start: 2.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "Three", start: 3.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: " \r\n", start: 3.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 }
       ])
     end
 
@@ -96,21 +94,23 @@ describe MidiLyrics do
         MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid", repeating: true).extract.collect(&:as_json)
       ).to eq([
         { text: "Test", start: 0.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "ing ", start: 0.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "ing", start: 0.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: " \r", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "One", start: 1.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: " ", start: 1.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "Two", start: 1.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "Three ", start: 2.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: 2.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
-        { text: "\n", start: 2.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: " ", start: 1.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "Three", start: 2.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: " \r\n", start: 2.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "Test", start: 2.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "ing ", start: 3.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: 3.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "ing", start: 3.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: " \r", start: 3.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "One", start: 3.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: " ", start: 3.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "Two", start: 4.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "Three ", start: 4.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: 4.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
-        { text: "\n", start: 4.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: " ", start: 4.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "Three", start: 4.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: " \r\n", start: 4.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 }
       ])
     end
 
@@ -119,34 +119,37 @@ describe MidiLyrics do
         MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid").extract.collect(&:as_json)
       ).to eq([
         { text: "Test", start: 0.0, start2: 2.5, duration: QUARTER_NOTE_DURATION },
-        { text: "ing ", start: 0.5, start2: 3.0, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: 0.5 + QUARTER_NOTE_DURATION, start2: 3.0 + QUARTER_NOTE_DURATION, duration: 0.0 },
+        { text: "ing", start: 0.5, start2: 3.0, duration: QUARTER_NOTE_DURATION },
+        { text: " \r", start: 0.5 + QUARTER_NOTE_DURATION, start2: 3.0 + QUARTER_NOTE_DURATION, duration: 0.0 },
         { text: "One", start: 1.0, start2: 3.5, duration: QUARTER_NOTE_DURATION },
+        { text: " ", start: 1.0 + QUARTER_NOTE_DURATION, start2: 3.5 + QUARTER_NOTE_DURATION, duration: 0.0 },
         { text: "Two", start: 1.5, start2: 4.0, duration: QUARTER_NOTE_DURATION },
-        { text: "Three ", start: 2.0, start2: 4.5, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: 2.0 + QUARTER_NOTE_DURATION, start2: 4.5 + QUARTER_NOTE_DURATION, duration: 0.0 },
-        { text: "\n", start: 2.0 + QUARTER_NOTE_DURATION, start2: 4.5 + QUARTER_NOTE_DURATION, duration: 0.0 },
+        { text: " ", start: 1.5 + QUARTER_NOTE_DURATION, start2: 4.0 + QUARTER_NOTE_DURATION, duration: 0.0 },
+        { text: "Three", start: 2.0, start2: 4.5, duration: QUARTER_NOTE_DURATION },
+        { text: " \r\n", start: 2.0 + QUARTER_NOTE_DURATION, start2: 4.5 + QUARTER_NOTE_DURATION, duration: 0.0 }
       ])
     end
 
     let :parsed_complete_example do
       [
         { text: "Test", start: 0.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "ing ", start: 1.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: 1.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "ing", start: 1.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: " \r", start: 1.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "One", start: 1.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: " ", start: 1.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "Two", start: 2.5, start2: 0.0, duration: HALF_NOTE_DURATION },
-        { text: "Three ", start: 3.5, start2: 0.0, duration: HALF_NOTE_DURATION },
-        { text: "\r", start: 3.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
-        { text: "\n", start: 3.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: " ", start: 2.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "Three", start: 3.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: " \r\n", start: 3.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "Test", start: 4.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "ing ", start: 5.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: 5.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "ing", start: 5.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: " \r", start: 5.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "Four", start: 5.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: " ", start: 5.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
         { text: "Five", start: 6.5, start2: 0.0, duration: HALF_NOTE_DURATION },
-        { text: "Six ", start: 7.5, start2: 0.0, duration: HALF_NOTE_DURATION },
-        { text: "\r", start: 7.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
-        { text: "\n", start: 7.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: " ", start: 6.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "Six", start: 7.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: " \r\n", start: 7.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
       ]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: midi_lyrics
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mateus Del Bianco