ruby-asterisk 0.0.2 → 0.0.3

data/lib/ruby-asterisk/response.rb

@@ -60,20 +60,20 @@ module RubyAsterisk
 		end
 
 		def _parse_data_core_show_channels(response)
-			self._parse_objects(response,:channels,"Event: CoreShowChannel")
+			self._parse_objects(response,:channels,"Event: CoreShowChannel","Event: CoreShowChannelsComplete")
 		end
 
-		def _parse_objects(response,symbol_name,search_for)
+		def _parse_objects(response,symbol_name,search_for,stop_with=nil)
 			 _data = { symbol_name => [] }
       parsing = false
       object = nil
       response.each_line do |line|
-        if line.start_with?(search_for)
+				if line.strip.empty? or (!stop_with.nil? and line.start_with?(stop_with))
+          parsing = false
+        elsif line.start_with?(search_for)
           _data[symbol_name] << object unless object.nil?
           object = {}
           parsing = true
-        elsif line.strip.empty?
-          parsing = false
         elsif parsing
           object[line.split(':')[0].strip]=line.split(':')[1].strip unless line.split(':')[1].nil?
         end

data/lib/ruby-asterisk/version.rb

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

data/spec/ruby-asterisk/response_spec.rb

@@ -2,6 +2,13 @@
 require 'spec_helper'
 describe RubyAsterisk::Response do
 
+	def empty_core_show_channels_response
+		"Event: CoreShowChannelsComplete
+		EventList: Complete
+    ListItems: 1
+    ActionID: 839"
+	end
+
 	def core_show_channels_response
 		"Event: CoreShowChannel
 		ActionID: 839
@@ -21,7 +28,12 @@ describe RubyAsterisk::Response do
 		Duration: 00:00:05
 		AccountCode:
 		BridgedChannel:
-		BridgedUniqueID:"
+		BridgedUniqueID:
+
+		Event: CoreShowChannelsComplete
+		EventList: Complete
+		ListItems: 1
+		ActionID: 839"
 	end
 
 	def parked_calls_response
@@ -76,6 +88,11 @@ describe RubyAsterisk::Response do
         @response = RubyAsterisk::Response.new("CoreShowChannels",core_show_channels_response)
         @response.data[:channels][0]["CallerIDnum"].should eq("123456")
       end
+
+			it "should have no channels if answer is empty" do
+				@response = RubyAsterisk::Response.new("CoreShowChannels",empty_core_show_channels_response)
+				@response.data[:channels].count.should eq(0)
+			end
 		end
 	
 		describe "receiving a Parked Calls request" do

metadata

@@ -2,7 +2,7 @@
 name: ruby-asterisk
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Emiliano Della Casa