adhearsion 0.7.6 → 0.7.7

data/lib/constants.rb

@@ -19,5 +19,6 @@
 LOCAL_NUMBER = /^[1-9]\d{6}$/
 US_NUMBER = /^1?[1-9]\d{2}[1-9]\d{6}$/
 ISN = /^\d+\*\d+$/ # See http://freenum.org
+SIP_URI = /^sip:[\w\._%+-]+@[\w\.-]+\.[a-zA-Z]{2,4}$/
 
 Infinity = 1.0/0.0

data/lib/core_extensions.rb

@@ -39,14 +39,6 @@ class Object
 	  nil
   end
   
-  def is_local_number?
-    to_s =~ LOCAL_NUMBER
-  end
-
-  def is_national_number? 
-    to_s =~ US_NUMBER
-  end
-
   def mutex() @mutex ||= Mutex.new end
   def synchronize() mutex.synchronize { yield self } end
   
@@ -63,13 +55,15 @@ class Object
     name = priority == :normal ? "AFTER_CALL" : "AFTER_CALL_#{priority.to_s.upcase}"
     eval("$#{name}") << block
   end
+  
+  def segment(&block) block.call end
 end
 
 class String
   
 	def String.random_char
 		case r = rand(62)
-			when 0...10 then r.to_s
+			when  0...10 then r.to_s
 			when 10...36 then (r+55).chr
 			when 36...62 then (r+61).chr
 		end
@@ -136,6 +130,8 @@ class Numeric
 	def =~ other
 		to_s =~ other
 	end
+	def length() to_s.length end
+	alias size length
 	
 	def am() self end
 	def pm() self+12 end
@@ -148,6 +144,16 @@ class Numeric
 	end
 end
 
+class Integer
+  alias old_to_i to_i
+  # Allows 123.to_i(2) to work for base conversions.
+  def to_i base=nil
+    if base then to_s.to_i base
+    else self
+    end
+  end
+end
+
 class Time
   def weekday?() (1..5).include? wday end
   def weekend?() !weekday? end

data/lib/phone_number.rb

@@ -0,0 +1,85 @@
+class NumericalString
+
+  (instance_methods - %w"__id__ __send__ __real_num __real_string").each do |m|
+    undef_method m
+  end
+
+  def initialize str
+    @__real_string = str.to_s
+    @__real_num = str.to_i if @__real_string =~ /^\d+$/
+  end
+  
+  attr_reader :__real_num, :__real_string
+
+  def method_missing name, *args, &block
+    @__real_string.__send__ name, *args, &block
+  end
+
+  def respond_to? m
+    @__real_string.respond_to?(m) || m == :__real_num || m == :__real_string
+  end
+
+end
+
+# The PhoneNumber class is used by one object throughout Adhearsion: the AGI
+# "extension" variable. Using some clevery Ruby hackery, the Extension class allows
+# dialplan writers to use the best of Fixnum and String usage such as
+#
+# - Dialing international numbers
+# - Using a regexp in a case statement for "extension"
+# - Using a numerical range against extension -- e.g. (100...200)
+# - Using the thousands separator
+class PhoneNumber < NumericalString
+  
+  # Checks against a pattern identifying US local numbers (i.e numbers
+  # without an area code seven digits long)
+  def local_number?() to_s =~ LOCAL_NUMBER end
+
+  # Checks against a pattern identifying US domestic numbers.
+  def national_number?() to_s =~ US_NUMBER end
+
+  # Checks against a pattern identifying an ISN number. See http://freenum.org
+  # for more info.
+  def isn?() to_s =~ ISN end
+  
+  # Useful for dialing those 1-800-FUDGEME type numbers with letters in them. Letters
+  # in the argument will be converted to their appropriate keypad key.
+  def self.from_vanity str
+    str.gsub(/\W/, '').upcase.tr('A-Z', '22233344455566677778889999')
+  end
+  
+end
+
+class Object
+
+  alias _equalequalequal ===
+
+  def === arg
+    if arg.respond_to? :__real_string
+      arg = arg.__real_num if kind_of?(Numeric) || kind_of?(Range)
+      _equalequalequal arg
+    else
+      _equalequalequal arg
+    end
+  end
+end
+
+class Range
+  alias _old_equalequalequal ===
+  def === arg
+    if arg.respond_to? :__real_string
+      arg = arg.__real_num if kind_of?(Numeric) || kind_of?(Range)
+      _old_equalequalequal arg
+    else
+      _old_equalequalequal arg
+    end
+  end
+end
+
+class << String
+  # Had to do this for ActiveRecord compatability.
+  alias __equalequalequal ===
+  def === arg
+    arg.respond_to?(:__real_string) ? true : __equalequalequal(arg)
+  end
+end

data/lib/rami.rb

@@ -215,7 +215,7 @@ class Client
                                 'Exten' =>h['Exten'],
                                 'Priority' =>h['Priority'],
                                 'Timeout' =>h['Timeout'],
-                                'CallerID' =>h['CallerID'],
+                                'CallerID' =>h['Callerid'] || h['CallerID'],
                                 'Variable' =>h['Variable'],
                                 'Account' =>h['Account'],
                                 'Application' =>h['Application'],
@@ -387,7 +387,8 @@ def connect
     $HUTDOWN.now!
     return 
   end
-  login = {'Action' => 'login', 'Username' => @username, 'Secret' => @secret, 'Events' => 'Off'}
+  events = $HELPERS['manager_proxy']['events']
+  login = {'Action' => 'login', 'Username' => @username, 'Secret' => @secret, 'Events' => events ? 'On' : 'Off'}
   writesock(login)
   accum = {}
   login = 0

data/lib/servlet_container.rb

@@ -17,7 +17,7 @@
 
 class ServletContainer
 
-	# TODO: Port Mongrel server here.
+	# TODO: Port more efficient server here. Erlang perhaps?
 	class NativeServer;end
 
 	require 'gserver'
@@ -30,18 +30,38 @@ class ServletContainer
 		end
 		
     def read_variables io
-      call_variables = {}
-  		while(line = io.gets.chomp)
+      vars = {}
+  		while line = io.gets.chomp
   			break if line.empty? # Empty lines signify no more variables
   			variable = line.split(/:\s*/)
   			new_name, new_value = variable.first[4..-1].downcase, variable.last
-  			if new_name == 'extension'
-  			  new_value.gsub! '-', '_'
-  			  call_variables['str_extension'] = new_value
+  			
+  			if new_name == 'extension' then vars['extension'] = PhoneNumber.new new_value
+			  elsif new_name == 'context' then vars['context'] = new_value.gsub '-', '_'
+        elsif new_name == 'request'
+          uri = URI.parse new_value
+          query = {}
+          if uri.query
+            hash = {}
+            uri.query.split('&').each do |a|
+              k,v = a.split('=')
+              query[k] = v
+            end
+            context = query['context']
+          end
+          vars['request'], vars['uri'], vars['query'] = new_value, uri, query
+		    else
+		      vars[new_name.to_s] = if new_value =~ /^\d+$/
+		                              if new_value.starts_with?('0') then NumericalString.new(new_value)
+		                              else new_value.to_i
+	                                end
+		                            else new_value
+	                              end
 			  end
-  			call_variables["#{new_name}"] = new_value =~ /^\d+$/ ? Integer(new_value) : new_value
+  			
   		end
-  		call_variables
+      vars['context'] = vars['query']['context'] if vars['query']['context']
+  		vars
     end
 		
 		# GServer allows all functionality to be packed into this one serve() method.
@@ -70,7 +90,7 @@ class ServletContainer
         end
         
   			log "Executing call with variables: " + call_variables.inspect
-        
+  			
   			call_variables.each do |k,v|
           Thread.current[:container].run_inside do
             meta_def(k) { v }
@@ -78,17 +98,18 @@ class ServletContainer
         end
         
         # Execute all before_call hooks
-  			[$BEFORE_CALl_HIGH, $BEFORE_CALL, $BEFORE_CALL_LOW].flatten.compact.each(&:call)
-			  +lambda { answer if CONFIG.answer_before_call }
+  			[$BEFORE_CALL_HIGH, $BEFORE_CALL, $BEFORE_CALL_LOW].flatten.compact.each(&:call)
+			  +lambda { answer if CONFIG['answer_before_call'] }
 			  
 			  # A call hook may decree that the call shouldn't be processed further (e.g. if
 			  # it processed the call itself). This is done be rewriting the context variable.
 			  unless Thread.current[:VARS]['context'] == :interrupted
-			  
+			    
     			begin
+    			  
     			  Contexts.new.instance_eval do
     			    # Interpret the extensions.rb file!
-              eval File.read(File.join(Dir.pwd, "extensions.rb"))
+              eval File.read("extensions.rb")
             end
     			rescue => detail
     				log "Exception raised in extensions.rb! " << detail.message
@@ -98,21 +119,23 @@ class ServletContainer
 			
     			log "Parsing of extensions.rb complete"
     			
-    			# Because Asterisk allows dashes in its context names and Ruby interprets
-    			# these as minuses, let's convert them to underscores.
-    			call_variables['context'].gsub! '-', '_'
-    			
           begin
     				target_context = call_variables['context']
             if target_context
               Thread.current[:container].run_inside do
                 begin
-                  +send(target_context.to_s.to_sym)
+                  unless target_context.kind_of? Proc
+                    target_context = send(target_context.to_s.to_sym) 
+                  end
+                  +target_context
+                rescue ControlPassingException => new_target
+                  target_context = new_target.target
+                  retry
                 rescue => e
                   error e.inspect + "\n   " + e.backtrace * "\n   "
                   +lambda {
-                    play 'were-sorry'
-                    hangup
+                    play 'an-error-has-occurred', 'were-sorry'
+                    hangup if CONFIG.key?('hangup_after_error') && CONFIG['hangup_after_error']
                   }
                 end
               end
@@ -122,14 +145,14 @@ class ServletContainer
               return
             end
           rescue => detail
-            log "ERROR: #{detail.class.name} => #{detail.inspect}"
-            detail.backtrace.each do |msg| log " "*8 << msg end
+            error "ERROR: #{detail.class.name} => #{detail.inspect}"
+            detail.backtrace.each do |msg| error " " * 8 << msg end
           end
     			log "Call routing complete"
   			end
       	rescue => detail
-      	   log "Call thread raised an exception! #{detail.message}"
-           detail.backtrace.each do |msg| log " "*8 << msg end
+      	   error "Call thread raised an exception! #{detail.message}"
+           detail.backtrace.each { |msg| error " " * 8 << msg }
       	end
 			  
    			[$AFTER_CALL_HIGH, $AFTER_CALL, $AFTER_CALL_LOW].flatten.compact.each(&:call)

data/lib/sexy_migrations.rb

@@ -0,0 +1,70 @@
+# Taken from svn://errtheblog.com/svn/plugins/sexy_migrations/lib/sexy_migrations.rb
+module SexyMigrations
+  module Table
+    attr_reader :fk_references
+
+    def foreign_key(*args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      args.each do |col| 
+        column(id = "#{col}_id", :integer, options)
+        (@fk_references ||= []) << [id, options[:ref].to_s] if options[:ref]
+      end 
+    end
+    alias :fkey :foreign_key
+    alias :fkeys :foreign_key
+    alias :foreign_keys :foreign_key
+
+    def timestamps(*extras)
+      (Array(extras) + %w(created_at updated_at)).each do |stamp|
+        datetime stamp
+      end
+    end
+    alias :timestamps! :timestamps
+    alias :auto_dates  :timestamps
+    alias :auto_dates! :timestamps
+
+    def polymorphic(name)
+      integer "#{name}_id"
+      string  "#{name}_type"
+    end
+    alias :polymorphic! :polymorphic
+
+    def method_missing(name, *args)
+      return super unless type = simplified_type(name)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      args.each { |col| column(col, type, options) }
+    end
+
+  private
+    def simplified_type(type)
+      ActiveRecord::ConnectionAdapters::Column.new(:type_check, false, type.to_s).type
+    end
+  end
+
+  module Schema
+    def create_table(name, options = {}, &block)
+      table_definition = ActiveRecord::ConnectionAdapters::TableDefinition.new(self)
+      table_definition.primary_key(options[:primary_key] || "id") unless options[:id] == false
+
+      table_definition.instance_eval &block
+
+      if options[:force]
+        drop_table(name, options) rescue nil
+      end
+
+      create_sql = "CREATE#{' TEMPORARY' if options[:temporary]} TABLE "
+      create_sql << "#{name} ("
+      create_sql << table_definition.to_sql
+      create_sql << ") #{options[:options]}"
+
+      # if any fk contraints, add them
+      if table_definition.fk_references
+        create_sql << "; "
+        table_definition.fk_references.each do |fk|
+          create_sql << "ALTER TABLE #{name} ADD FOREIGN KEY (#{fk[0]}) REFERENCES #{fk[1]} (id); "
+        end
+      end
+      execute create_sql
+    end
+  end
+end

data/test/asterisk_module_test.rb

@@ -1,13 +1,13 @@
-context "The Asterisk module" do
+context "The PBX object" do
   specify "should properize properly" do
-    properize("123").should == 'SIP/123'
-    properize(1_555_444_1234).should == 'SIP/15554441234'
-    properize(:jay).should == 'SIP/jay'
-    properize("jay").should == 'SIP/jay'
-    properize("SIP/123").should == 'SIP/123'
-    properize("IAX2/jay").should == 'IAX2/jay'
-    properize((100..110).to_a).should == 'SIP/100&SIP/101&SIP/102&SIP/103&SIP/104&SIP/105&SIP/106&SIP/107&SIP/108&SIP/109&SIP/110'
-    properize(["SIP/123", "SIP/456"]).should == 'SIP/123&SIP/456'
+    PBX.properize("123").should == 'SIP/123'
+    PBX.properize(1_555_444_1234).should == 'SIP/15554441234'
+    PBX.properize(:jay).should == 'SIP/jay'
+    PBX.properize("jay").should == 'SIP/jay'
+    PBX.properize("SIP/123").should == 'SIP/123'
+    PBX.properize("IAX2/jay").should == 'IAX2/jay'
+    PBX.properize((100..110).to_a).should == 'SIP/100&SIP/101&SIP/102&SIP/103&SIP/104&SIP/105&SIP/106&SIP/107&SIP/108&SIP/109&SIP/110'
+    PBX.properize(["SIP/123", "SIP/456"]).should == 'SIP/123&SIP/456'
     # TODO: Should mock up dialing a user
     # TODO: Should mock up dialing a group
   end

data/test/specs/numerical_string_spec.rb

@@ -0,0 +1,53 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'phone_number.rb')
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'constants.rb')
+
+context "A NumericalString" do
+  specify "should be accessable as a Fixnum to a case statement" do
+    (123 === NumericalString.new("123")).should == true
+    (987 === NumericalString.new("0987")).should == true
+  end
+  specify "should be accessable as a String to a case statement" do
+    ("123" === NumericalString.new("123")).should == true
+    ("0987" === NumericalString.new("0987")).should == true
+  end
+  
+  specify "should satisfy Ranges" do
+    (100..200).should === NumericalString.new("150")
+    (100..200).should === NumericalString.new("0150")
+    ((100..200) === NumericalString.new("1000000")).should === false
+  end
+  
+  specify "should satify regular expressions" do
+    /^\d+$/.should === NumericalString.new("027316287")
+  end
+end
+# 
+# case extension
+#   when US_NUMBER
+#   when (100..200)
+#   when _('12Z')
+#   when 123
+#   when "123"
+# end
+
+context "A PhoneNumber" do
+  specify "should have an ISN pattern-matching method" do
+    !! PhoneNumber.new("0115544332211").isn?.should == false
+    !! PhoneNumber.new("1*548").isn?.should === false
+  end
+  
+  specify "should have a US local number pattern-matching method" do
+    !! PhoneNumber.new("18887776665555").local_number?.should == false
+    !! PhoneNumber.new("18887776665555").national_number?.should == true
+    
+    !! PhoneNumber.new("8887776665555").local_number?.should == false
+    !! PhoneNumber.new("8887776665555").national_number?.should == true
+     
+    !! PhoneNumber.new("4445555").local_number?.should == true
+    !! PhoneNumber.new("4445555").national_number?.should == false
+  end
+  
+  specify "should convert from vanity numbers properly" do
+    PhoneNumber.from_vanity("1-800-FUDGEME").should == "18003834363"
+  end
+end