ruby-agi 1.1.0 → 1.1.1

data/ChangeLog

@@ -1,3 +1,7 @@
+2006-02-08
+	--	method AsteriskVariable#init_caller_variable updated to have correct callerid
+	--	method ReturnStatus#timeout? updated
+
 2006-01-16 (revision 23)
 	--	ruby-agi-1.1.0 released
 	--	method calleridnumber added and is generated from callerid

data/DOWNLOAD

@@ -1,3 +1,3 @@
 To download ruby-agi or ruby-agi dependent application, please visit
-http://www.ruby-agi.org
+	http://ruby-agi.rubyforge.org
 

data/INSTALL

@@ -1,5 +1,10 @@
 I strongly suggest to install ruby-agi using gem, 
-gem install ruby-agi
+	% gem install ruby-agi
+To update your existing ruby-agi using gem,  try
+	% gem update ruby-agi
+
+If you don't have gem intalled on your computer, download it from here
+	http://www.rubygems.org
 
 Alternatively, do
 	1. ruby extconf.rb

data/README

@@ -1,17 +1,14 @@
 This library comes with absolutely no warranty.
 
-I wanted to write couple of AGI scripts in ruby for myself.
-But I didn't see any AGI library written in ruby available.
-So, I decided to develop one and share with everybody.
+ruby-agi is a library to write AGI scripts in ruby language for Asterisk. ruby-agi does not depend of Asterisk Manager.
+There have a very simple AGI script in example/call_log.rb
+I couldn't write any tutorial for ruby-agi and I am not good at it, if anybody want to give me a hand on writing documentation and tutorial, would be greatly appreciated.
 
-Hopefully, you already understood I am not good at documentation.
-I truely appolize for that.
-If anybody want to give a hand to write documentation for this project would be greatly appreciated.
+Here are a sites that may help to know more about ruby-agi
+http://ruby-agi.rubyforge.org           (ruby-agi homepage)
 
-Project homepage: http://www.ruby-agi.org
-
-Please feel free to email me with your feature request, bug report or any suggession.
+Feel free to send me email, if you don't find any answer related to ruby-agi.
 
 Thank you,
 Mohammad Khan,
-email: info at beeplove dot com
+email: info <AT> beeplove <DOT> com

data/Release-Notes

@@ -1,20 +1,15 @@
-1.1.0 (2006-01-17)
-	addition of method 'jump_to'
-	jump_to would take three arguments ex. jump_to(context, extension, priority)
-	enhanced callerid, calleridname and calleridnumber. calleridnumber is an addtional method to this release.
-	Regardless of Asterisk version above three caller variables would return uniform value.
-	Such as, callerid would return "John Smith" <1234567890> or empty string, if unidentified 
-	calleridnumber would return number part of callerid (as string) ex. 1234567890 or empty string, if unidentified
-	calleridname would return name part of callerid ex. John Smith or emtpy string, if unidentified
-   
-1.0.2 (2006-01-09)
-	Because of a yaml bug in ruby-1.8.3, rubyforge server doesn't support any package that were built on ruby-1.8.3
-	This version is basically re-build of version 1.0.1 on ruby-1.8.4 instead of ruby-1.8.3
+Release notes of ruby-agi-1.1.1
+February 09, 2006
 
-1.0.1 (2006-01-08)
-	This release have minor a minor change.
-	There have an example file in examples/call_log.rb
-	You can use call_log.rb to keep your incoming call history in syslog.
+This is a bug fix release of ruby-agi. Below two bugs have fixed in this release.
+  --  ReturnStatus#timeout? was not functional, which has fixed.
+  --  AsteriskVariable#init_caller_variable updated to fix callerid bug which was returning 'nil' for number only callerid. method init_caller_variable is a private method that manage callerid, calleridname and calleridnumber
 
-1.0.0 (2006-01-08)
-	This is the first stable version of ruby-agi
+
+Feedback, suggestion, feature request, bug report is always appreciated.
+
+
+Thanks,
+Mohammad Khan
+info <AT> beeplove <DOT> com
+February 09, 2006

data/lib/ruby-agi/asterisk_variable.rb

@@ -194,15 +194,22 @@ class AsteriskVariable < AGI
 		return read_env('agi_callingtns')	
 	end
 
+	# asterisk-1.0.9  : agi_callerid (default value is 'unknown')
+	# asterisk-1.0.10 : agi_callerid (default value is 'unknown')
+	# asterisk-1.0.10 : agi_callerid, agi_calleridname (default value for both is 'unknown')
 	protected
 	def init_caller_variable
-		if read_env('callerid') == "unknown"
+		@callerid = read_env('agi_callerid').to_s.strip
+		if @callerid == "unknown"
 			@callerid		= ""
 			@calleridname	= ""
 			@calleridnumber	= ""
+		elsif Regexp.new(/^\d+\d$/).match(@callerid)
+			@calleridname	= ""
+			@calleridnumber	= @callerid
 		else
-			if read_env('calleridname').nil?		# for asterisk that don't have agi variable 'agi_calleridname'
-				@callerid	= read_env('callerid')
+			@calleridname	= read_env('agi_calleridname')
+			if @calleridname.nil?					# for asterisk that don't have agi variable 'agi_calleridname'
 				name		= Regexp.new(/\".+\"/).match(@callerid)
 				number		= Regexp.new(/\<\d+\>/).match(@callerid)
 
@@ -211,7 +218,7 @@ class AsteriskVariable < AGI
 				else
 					name = name.to_s
 					name.gsub!(/\"/, '')
-					@calleridname = name.strip
+					@calleridname = name.to_s.strip
 				end
 
 				if number.nil?
@@ -220,14 +227,12 @@ class AsteriskVariable < AGI
 					number = number.to_s
 					number.sub!(/\</, '')
 					number.sub!(/\>/, '')
-					@calleridnumber = number
+					@calleridnumber = number.to_s.strip
 				end
 			else									# for asterisk that have agi variable 'agi_calleridname'
-				@calleridnumber	= read_env('callerid')
-				@calleridname	= read_env('calleridname')
+				@calleridnumber	= @callerid
 				@callerid		= "\"#{@calleridname}\" <#{@calleridnumber}>"
 			end
 		end
 	end
-
 end

data/lib/ruby-agi/command.rb

@@ -651,7 +651,7 @@ class Command < AGI
 
 
 	#
-    # stream file: Sends audio file on channel
+	# stream file: Sends audio file on channel
 	# Send the given file, allowing playback to be interrupted by the given digits, if any. 
 	# Use double quotes for the digits if you wish none to be permitted. 
 	# If sample offset is provided then the audio will seek to sample offset before play starts. 

data/lib/ruby-agi/return_status.rb

@@ -82,5 +82,11 @@ class ReturnStatus
 
 	public
 	def timeout?
+		rgx = Regexp.new(/\(timeout\)/)
+		if rgx.match(@message)
+			return true
+		else
+			return false
+		end
 	end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-agi
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-01-17 00:00:00 -05:00
+  version: 1.1.1
+date: 2006-02-09 00:00:00 -05:00
 summary: Ruby Language API for Asterisk
 require_paths: 
 - lib