midi_lyrics 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de1fc14ed163e13a3b05eaddfcb29bd9b9d50948
-  data.tar.gz: 07a79b70ea64ecfde9b52ac275a679c9f5995352
+  metadata.gz: 07b22e1ff4393dd7bdb547715aee9447120e18fd
+  data.tar.gz: d5cc38925318b678df054a00b8fd63ee43e49240
 SHA512:
-  metadata.gz: e54f4f09be1608c63ea990e0c7952b305ab2b152cb027bb7cfe502712e95579ed55049551c4d2f5e25503a33a7efb997f95d37cc6888b2e97c9f8d98c795c7cd
-  data.tar.gz: 482259a6013bb46532c15dbaee7395b81d2712d720a0b17ca540401a026082e51cdb27b9edb2532b2ed56a60a064e62e46043b0b1bad13048ee12af65a606010
+  metadata.gz: 4e2a905b89acb28eb50f2f00755cf822b341a554cb0707397cda6ba0c2393ec96ef41e5d19bc8e85e50796a63e637d7da868dc1da3170cbe1244ee2699b5a859
+  data.tar.gz: 557d80948ace9c3d79647cb57b7240f189e2190034146bf0450df0756d89355c901a43c2b2dc7952208435e64de649e8fb2ca34f8bf674221b4b392fcadbd1ca

data/lib/midi_lyrics/version.rb

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

data/lib/midi_lyrics.rb

@@ -64,6 +64,19 @@ module MidiLyrics
       end
     end
 
+    def extract
+      read_sequence_from_file
+      load_tracks
+      calculate_durations
+      load_lyrics
+      remove_heading_blank_lines
+      consolidate_empty_syllables
+      remove_lines_trailing_spaces
+      remove_repeating unless repeating
+      @lyrics.collect(&:as_json)
+    end
+
+    private
     def read_sequence_from_file
       @sequence = ::MIDI::Sequence.new()
       File.open(file, "rb") do | file |
@@ -169,17 +182,5 @@ module MidiLyrics
         merge_half_lyrics
       end
     end
-
-    def extract
-      read_sequence_from_file
-      load_tracks
-      calculate_durations
-      load_lyrics
-      remove_heading_blank_lines
-      consolidate_empty_syllables
-      remove_lines_trailing_spaces
-      remove_repeating unless repeating
-      @lyrics
-    end
   end
 end

data/spec/midi_lyrics_spec.rb

@@ -8,46 +8,10 @@ describe MidiLyrics do
     expect(MidiLyrics::Parser.new("spec/fixtures/one_note_one_syllable.mid").extract).to be_kind_of(Array)
   end
 
-  context "accessing LyricSyllable attributes" do
-    let(:lyrics) { MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid").extract }
-
-    it "has text method" do
-      expect(lyrics[1].text).to eq("ing")
-    end
-
-    it "has start_in_pulses method" do
-      expect(lyrics[1].start_in_pulses).to eq(192)
-    end
-
-    it "has start method" do
-      expect(lyrics[1].start).to eq(0.5)
-    end
-
-    it "has start2_in_pulses method" do
-      expect(lyrics[1].start2_in_pulses).to eq(1152)
-    end
-
-    it "has start2 method" do
-      expect(lyrics[1].start2).to eq(3.0)
-    end
-
-    it "has duration_in_pulses method" do
-      expect(lyrics[1].duration_in_pulses).to eq(160)
-    end
-
-    it "has duration method" do
-      expect(lyrics[1].duration).to eq(QUARTER_NOTE_DURATION)
-    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})
-    end
-  end
-
   context "file parsing" do
     it "parses one_note_one_syllable.mid correctly" do
       expect(
-        MidiLyrics::Parser.new("spec/fixtures/one_note_one_syllable.mid").extract.collect(&:as_json)
+        MidiLyrics::Parser.new("spec/fixtures/one_note_one_syllable.mid").extract
       ).to eq([
         { 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 }
@@ -56,7 +20,7 @@ describe MidiLyrics do
 
     it "parses one_note_two_syllable.mid correctly" do
       expect(
-        MidiLyrics::Parser.new("spec/fixtures/one_note_two_syllable.mid").extract.collect(&:as_json)
+        MidiLyrics::Parser.new("spec/fixtures/one_note_two_syllable.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 }
@@ -65,7 +29,7 @@ describe MidiLyrics do
 
     it "parses two_notes_one_syllable.mid correctly" do
       expect(
-        MidiLyrics::Parser.new("spec/fixtures/two_notes_one_syllable.mid").extract.collect(&:as_json)
+        MidiLyrics::Parser.new("spec/fixtures/two_notes_one_syllable.mid").extract
       ).to eq([
         { 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 }
@@ -74,7 +38,7 @@ describe MidiLyrics do
 
     it "parses two_notes_two_syllables.mid correctly" do
       expect(
-        MidiLyrics::Parser.new("spec/fixtures/two_notes_two_syllables.mid").extract.collect(&:as_json)
+        MidiLyrics::Parser.new("spec/fixtures/two_notes_two_syllables.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 },
@@ -84,7 +48,7 @@ describe MidiLyrics do
 
     it "parses two_notes_three_syllables.mid correctly" do
       expect(
-        MidiLyrics::Parser.new("spec/fixtures/two_notes_three_syllables.mid").extract.collect(&:as_json)
+        MidiLyrics::Parser.new("spec/fixtures/two_notes_three_syllables.mid").extract
       ).to eq([
         { text: "Hello, test", start: 0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
         { text: "ing", start: 0.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
@@ -94,7 +58,7 @@ describe MidiLyrics do
 
     it "parses spaces_and_returns.mid correctly" do
       expect(
-        MidiLyrics::Parser.new("spec/fixtures/spaces_and_returns.mid").extract.collect(&:as_json)
+        MidiLyrics::Parser.new("spec/fixtures/spaces_and_returns.mid").extract
       ).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 },
@@ -110,7 +74,7 @@ describe MidiLyrics do
 
     it "parses repeating_lyrics.mid correctly repeating" do
       expect(
-        MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid", repeating: true).extract.collect(&:as_json)
+        MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid", repeating: true).extract
       ).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 },
@@ -135,7 +99,7 @@ describe MidiLyrics do
 
     it "parses repeating_lyrics.mid correctly not repeating" do
       expect(
-        MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid").extract.collect(&:as_json)
+        MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid").extract
       ).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 },
@@ -174,13 +138,13 @@ describe MidiLyrics do
 
     it "parses complete_example.mid correctly repeating" do
       expect(
-        MidiLyrics::Parser.new("spec/fixtures/complete_example.mid").extract.collect(&:as_json)
+        MidiLyrics::Parser.new("spec/fixtures/complete_example.mid").extract
       ).to eq(parsed_complete_example)
     end
 
     it "parses complete_example.mid correctly not repeating" do
       expect(
-        MidiLyrics::Parser.new("spec/fixtures/complete_example.mid", repeating: true).extract.collect(&:as_json)
+        MidiLyrics::Parser.new("spec/fixtures/complete_example.mid", repeating: true).extract
       ).to eq(parsed_complete_example)
     end
   end

metadata

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