From e9b0d2dfd71db0f9bc349746fd20f23b6111386a Mon Sep 17 00:00:00 2001
From: diego-asterisk <diegomanias@gmail.com>
Date: Fri, 1 Feb 2019 11:56:09 -0300
Subject: [PATCH] Multiple headers with the same key return a comma-separated
 string

---
 lib/ruby_ami/lexer.rb        |  2 ++
 spec/ruby_ami/stream_spec.rb | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/lib/ruby_ami/lexer.rb b/lib/ruby_ami/lexer.rb
index 631edbc..4081df7 100644
--- a/lib/ruby_ami/lexer.rb
+++ b/lib/ruby_ami/lexer.rb
@@ -132,6 +132,8 @@ def syntax_error_encountered(ignored_chunk)
     # returns first char index after last match
     def populate_message_body(obj, raw)
       headers = raw.scan(KEYVALUEPAIR)
+      # get the values of repeated keys (example 'Variable' header)
+      headers = headers.group_by(&:shift).map { |k, v| [ k, v.join(',') ] }
       if match = $~
         obj.merge_headers!(Hash[headers])
         match.end(match.size - 1) + 2
diff --git a/spec/ruby_ami/stream_spec.rb b/spec/ruby_ami/stream_spec.rb
index 1c1c8e5..f3012c5 100644
--- a/spec/ruby_ami/stream_spec.rb
+++ b/spec/ruby_ami/stream_spec.rb
@@ -175,6 +175,26 @@ def mocked_server(times = nil, fake_client = nil, &block)
       ]
     end
 
+    it 'sends events with multiple headers with the same key to the client when the stream is ready' do
+      mocked_server(1, lambda { @stream.send_data 'Foo' }) do |val, server|
+        server.send_data <<-EVENT
+Event: Status
+Channel: SIP/101-3f3f
+Variable: CDR(ds_type)=Test-INT
+Variable: from_user=ssether
+Variable: companyID=Test
+ActionID: 2
+
+        EVENT
+      end
+
+      client_messages.should be == [
+        [Stream::Connected.new, @stream],
+        [Event.new('Status', 'Channel' => 'SIP/101-3f3f', 'Variable' => 'CDR(ds_type)=Test-INT,from_user=ssether,companyID=Test', 'ActionID' => '2'), @stream],
+        [Stream::Disconnected.new, @stream],
+      ]
+    end
+
     describe 'when a response is received' do
       it 'should be returned from #send_action' do
         response = nil