midi_lyrics 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8091e1c24da61a2790de90896d716a9f2960bc36
-  data.tar.gz: 4cae82d9652f322c1951d227d3f2b0fac5a4499a
+  metadata.gz: 25ee2f178ba21c7e16bb86db9680b65d30f76324
+  data.tar.gz: 979f7dfe084d8db529566e5bef20a30cf7ff68d0
 SHA512:
-  metadata.gz: 73c50e8170abeb02e49dcb2b7f58aa4119e2ed451623d98a176b0f872bdb047349e83f6b6c6790094e2fdae4d74fb8d55a857e1126759d569f7822fc06afc9e4
-  data.tar.gz: 741c155d2f592a7ebbc0390567a32a2ce2a991f405f050d69920f75adabfa0f0e4d3082aa124f69dda199d8ddbd2ef7c7a0d44ad3ccd5282096c341c517700cf
+  metadata.gz: 40915a6ffdc72a025f4b1b86947b619c3a2f8dc44e93b0e928e3851e59e54d4c383e150625513985829571f6114cbe872d405678c4c86c623adcf67e993634cd
+  data.tar.gz: 023708cf54f7a8efd256bdd5f892b92cf3e68f409e076dd598c18e5e31938323a24353f1cfe229ea8ee6ecec89bab078567283838a20da3b615becf4fb984e80

data/README.md

@@ -20,7 +20,13 @@ Or install it yourself as:
 
 ## Usage
 
-    MidiLyrics::Parser.new("test.mid").extract
+    >> 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",   start: 0.917, start2: 0.0, duration: 0     },
+        { text: "\n",   start: 0.917, start2: 0.0, duration: 0     }
+      ]
 
 ## Contributing
 

data/lib/midi_lyrics.rb

@@ -32,6 +32,15 @@ module MidiLyrics
       self.duration_in_pulses == another.duration_in_pulses && self.text == another.text
     end
 
+    def as_json
+      {
+        text: text,
+        start: start,
+        start2: start2,
+        duration: duration
+      }
+    end
+
     private
     def format_time(time)
       @sequence.pulses_to_seconds(time.to_f).round(3)

data/lib/midi_lyrics/version.rb

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

data/spec/midi_lyrics_spec.rb

@@ -8,11 +8,47 @@ describe MidiLyrics do
     expect(MidiLyrics::Parser.new("spec/fixtures/one_note_one_syllable.mid").extract).to be_kind_of(Array)
   end
 
-  context "parsing" do
+  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
-      lyrics = MidiLyrics::Parser.new("spec/fixtures/one_note_one_syllable.mid").extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
-      expect(lyrics).to eq([
+      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 }
@@ -20,9 +56,9 @@ describe MidiLyrics do
     end
 
     it "parses two_notes_one_syllable.mid correctly" do
-      lyrics = MidiLyrics::Parser.new("spec/fixtures/two_notes_one_syllable.mid").extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
-      expect(lyrics).to eq([
+      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 }
@@ -30,9 +66,9 @@ describe MidiLyrics do
     end
 
     it "parses two_notes_two_syllables.mid correctly" do
-      lyrics = MidiLyrics::Parser.new("spec/fixtures/two_notes_two_syllables.mid").extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
-      expect(lyrics).to eq([
+      expect(
+        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 },
@@ -41,9 +77,9 @@ describe MidiLyrics do
     end
 
     it "parses spaces_and_returns.mid correctly" do
-      lyrics = MidiLyrics::Parser.new("spec/fixtures/spaces_and_returns.mid").extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
-      expect(lyrics).to eq([
+      expect(
+        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 },
@@ -56,9 +92,9 @@ describe MidiLyrics do
     end
 
     it "parses repeating_lyrics.mid correctly repeating" do
-      lyrics = MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid", repeating: true).extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
-      expect(lyrics).to eq([
+      expect(
+        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 },
@@ -79,9 +115,9 @@ describe MidiLyrics do
     end
 
     it "parses repeating_lyrics.mid correctly not repeating" do
-      lyrics = MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid").extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
-      expect(lyrics).to eq([
+      expect(
+        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 },
@@ -115,15 +151,15 @@ describe MidiLyrics do
     end
 
     it "parses complete_example.mid correctly repeating" do
-      lyrics = MidiLyrics::Parser.new("spec/fixtures/complete_example.mid").extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
-      expect(lyrics).to eq(parsed_complete_example)
+      expect(
+        MidiLyrics::Parser.new("spec/fixtures/complete_example.mid").extract.collect(&:as_json)
+      ).to eq(parsed_complete_example)
     end
 
     it "parses complete_example.mid correctly not repeating" do
-      lyrics = MidiLyrics::Parser.new("spec/fixtures/complete_example.mid", repeating: true).extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
-      expect(lyrics).to eq(parsed_complete_example)
+      expect(
+        MidiLyrics::Parser.new("spec/fixtures/complete_example.mid", repeating: true).extract.collect(&:as_json)
+      ).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.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mateus Del Bianco