ruby-agi 0.0.3 → 1.0.0

data/lib/{asterisk_variable.rb → ruby-agi/asterisk_variable.rb}

@@ -23,19 +23,21 @@
 # == Overview
 #
 
-require 'agi.rb'
-require 'error.rb'
+require 'ruby-agi/agi.rb'
+require 'ruby-agi/error.rb'
 
 class AGI
 end
 
 class AsteriskVariable < AGI
+
 	def initialize
-		@env = nil
 	end
 
+	protected
 	def env
-		if @env.nil?
+		if @asterisk_variable.nil?
+			@asterisk_variable = Hash.new
 			semaphore do 
 				$stdin.each_line do | line |
 					line.strip!
@@ -43,102 +45,115 @@ class AsteriskVariable < AGI
 					key, value = line.split(':')
 					value.strip! if not value.nil?
 					if ((not key.nil?) and (not key.to_s.size.zero?))
-						@env[key.to_s] = value
+						@asterisk_variable[key.to_s] = value
 					end
 				end
 			end
 		end
 
-		return @env
+		return @asterisk_variable
+	end
+
+	protected
+	def read_env(name)
+		val = env[name]
+		if debug?
+			semaphore do
+				$stderr.puts "    -- ruby-agi << Read asterisk variable '#{name}'"
+				$stderr.puts "    -- ruby-agi >> Asterisk variable #{name} = #{val.to_s}"
+			end	
+		end
+
+		return val
 	end
 
 	public
 	def request
-		return env['agi_request']
+		return read_env('agi_request')
 	end
 
 	public
 	def channel
-		return env['agi_channel']
+		return read_env('agi_channel')
 	end
 
 	public
 	def language
-		return env['agi_language']
+		return read_env('agi_language')
 	end
 
 	public
 	def type
-		return env['agi_type']
+		return read_env('agi_type')
 	end
 
 	public
-	def unique_id
-		return env['agi_uniqueid']
+	def uniqueid
+		return read_env('agi_uniqueid')
 	end
 
 	public
-	def caller_id
-		return env['agi_callerid'] 
+	def callerid
+		return read_env('agi_callerid') 
 	end
 
 	public
-	def caller_id_name
-		return env['agi_calleridname']	
+	def calleridname
+		return read_env('agi_calleridname')	
 	end
 
 	public
-	def calling_pres
-		return env['agi_callingpres']	
+	def callingpres
+		return read_env('agi_callingpres')	
 	end
 
 	public
-	def calling_ani_2
-		return env['agi_callingani2']	
+	def callingani2
+		return read_env('agi_callingani2')	
 	end
 
 	public
-	def calling_ton
-		return env['agi_callington']	
+	def callington
+		return read_env('agi_callington')	
 	end
 
 	public
-	def calling_tns
-		return env['agi_callingtns']	
+	def callingtns
+		return read_env('agi_callingtns')	
 	end
 
 	public
-	def dn_id
-		return env['agi_dnid']	
+	def dnid
+		return read_env('agi_dnid')	
 	end
 
 	public
-	def rdn_id
-		return env['agi_rdnid']	
+	def rdnid
+		return read_env('agi_rdnid')	
 	end
 
 	public
 	def context
-		return env['agi_context']	
+		return read_env('agi_context')	
 	end
 
 	public
 	def extension
-		return env['agi_extension']	
+		return read_env('agi_extension')	
 	end
 
 	public
 	def priority
-		return env['agi_priority']	
+		return read_env('agi_priority')	
 	end
 
 	public
 	def enhanced
-		return env['agi_enhanced']	
+		return read_env('agi_enhanced')	
 	end
 
 	public
-	def account_code 
-		return env['agi_accountcode']	
+	def accountcode 
+		return read_env('agi_accountcode')
 	end
 end