Add session methods to output events

Author: arirusso

lib/nibbler/session.rb

@@ -39,14 +39,34 @@ def parse_string(*args, timestamp: Time.now.to_i)
     end
     alias parse_s parse_string
 
+    # Parse some string input.  Can be single or multiple bytes. Returns an event struct
+    # eg single '40'
+    # eg multiple '4050'
+    # @param [Array<Integer>] bytes
+    # @param [Object] timestamp A timestamp to store with the messages that result
+    # @return [Event]
+    def parse_string_to_event(*args, timestamp: Time.now.to_i)
+      integers = Util::Conversion.strings_to_numeric_bytes(*args)
+      parse_to_event(*integers, timestamp: timestamp)
+    end
+
     # Parse the given integer bytes and add them to the buffer.
     # @param [Array<Integer>] bytes
     # @param [Object] timestamp A timestamp to store with the messages that result
     # @return [Array<Object>]
     def parse(*bytes, timestamp: Time.now.to_i)
+      parse_to_event(*bytes, timestamp: timestamp).report.messages
+    end
+
+    # Parse the given integer bytes, add them to the buffer and return an event struct
+    # @param [Array<Integer>] bytes
+    # @param [Object] timestamp A timestamp to store with the messages that result
+    # @return [Event]
+    def parse_to_event(*bytes, timestamp: Time.now.to_i)
       parser_report = @parser.process(*bytes)
-      @events << Event.new(parser_report, timestamp)
-      parser_report.messages
+      event = Event.new(parser_report, timestamp)
+      @events << event
+      event
     end
   end
 end

spec/session_spec.rb

@@ -5,6 +5,40 @@
 describe Nibbler::Session do
   let!(:session) { Nibbler::Session.new }
 
+  describe '#parse_string_to_event' do
+    let(:returned_event) { session.parse_string_to_event(*input, timestamp: timestamp) }
+    let(:timestamp) { Time.now.to_i }
+    let(:input) { %w[90 40 30] }
+    let(:returned_messages) { returned_event.report.messages }
+    let(:returned_message) { returned_messages.first }
+
+    it 'returns correct message' do
+      expect(returned_messages.count).to eq(1)
+      expect(returned_message).to be_a(MIDIMessage::NoteOn)
+      expect(returned_message.channel).to eq(0)
+      expect(returned_message.note).to eq(0x40)
+      expect(returned_message.velocity).to eq(0x30)
+      expect(returned_event.timestamp).to eq(timestamp)
+    end
+  end
+
+  describe '#parse_to_event' do
+    let(:returned_event) { session.parse_to_event(*input, timestamp: timestamp) }
+    let(:timestamp) { Time.now.to_i }
+    let(:input) { [0x91, 0x30, 0x10] }
+    let(:returned_messages) { returned_event.report.messages }
+    let(:returned_message) { returned_messages.first }
+
+    it 'returns correct message' do
+      expect(returned_messages.count).to eq(1)
+      expect(returned_message).to be_a(MIDIMessage::NoteOn)
+      expect(returned_message.channel).to eq(1)
+      expect(returned_message.note).to eq(0x30)
+      expect(returned_message.velocity).to eq(0x10)
+      expect(returned_event.timestamp).to eq(timestamp)
+    end
+  end
+
   describe '#parse_string' do
     let(:returned_messages) { session.parse_s(*input) }
     let(:returned_message) { returned_messages.first }