adhearsion 0.8.3 → 0.8.4

data/lib/adhearsion/voip/dsl/dialing_dsl/dialing_dsl_monkey_patches.rb

@@ -4,7 +4,7 @@ module Adhearsion
       class DialingDSL
         module MonkeyPatches
           module RegexpMonkeyPatch
-            
+
             def |(other)
               case other
                 when RouteRule

data/lib/adhearsion/voip/dsl/dialplan/control_passing_exception.rb

@@ -2,24 +2,24 @@ module Adhearsion
   module VoIP
     module DSL
       module Dialplan
-        # A ControlPassingException is used internally to stop execution of one 
-        # dialplan context and begin execution of another proc instead. It is 
+        # A ControlPassingException is used internally to stop execution of one
+        # dialplan context and begin execution of another proc instead. It is
         # most notably used by the ~@ unary operator that can be called on a
         # context name within a dialplan to transfer control entirely to that
         # particular context. The serve() method in the servlet_container actually
         # rescues these exceptions specifically and then does +e.target to execute
         # that code.
         class ControlPassingException < Exception
-          
+
           attr_reader :target
-          
+
           def initialize(target)
             super()
             @target = target
           end
-          
+
         end
-      
+
         class ContextNotFoundException < Exception; end
       end
     end

data/lib/adhearsion/voip/dsl/dialplan/dispatcher.rb

@@ -2,7 +2,7 @@ module Adhearsion
   module VoIP
     module DSL
       module Dialplan
-        
+
         class ReturnValue < Exception
           attr_reader :obj
           def initialize(obj)
@@ -10,34 +10,34 @@ module Adhearsion
             super
           end
         end
-        
+
         class Hangup < Exception; end
-        
+
         # Instantiated and returned in every dialplan command
         class EventCommand
-          
+
           attr_accessor :app, :args, :response_block, :returns, :on_keypress
-          
+
           def initialize(app, *args, &block)
             @hash = args.pop if args.last.kind_of?(Hash)
             @app, @args = app, args
-            
+
             if @hash
-              @returns = @hash[:returns] || :raw 
+              @returns = @hash[:returns] || :raw
               @on_keypress = @hash[:on_keypress]
             end
-            
+
             @response_block = block if block_given?
           end
-          
+
           def on_keypress(&block)
             block_given? ? @on_keypress = block : @on_keypress
           end
-          
+
           def on_break(&block)
             block_given? ? @on_break = block : @on_break
           end
-          
+
         end
 
         class NoOpEventCommand < EventCommand
@@ -57,7 +57,7 @@ module Adhearsion
         # every command must start with "api", but, when doing an originate, it
         # must begin with an ampersand. These two pre-processors would be developed
         # as separate CommandDispatchers.
-        class CommandDispatcher 
+        class CommandDispatcher
 
           attr_reader :factory, :context
 
@@ -84,13 +84,13 @@ module Adhearsion
                 end
                 dispatched_command
               else
-                command 
+                command
               end
             end.last
           rescue ReturnValue => r
             return r.obj
           end
-          
+
           def return!(obj)
             raise DSL::Dialplan::ReturnValue.new(obj)
           end
@@ -98,7 +98,7 @@ module Adhearsion
           def break!(uuid=@context)
             raise NotImplementedError, "Must subclass #{self.class} and override this!"
           end
-          
+
           # Takes a Hash and meta_def()'s a method for each key that returns
           # the key's value in the Hash.
           def def_keys!(hash)
@@ -106,7 +106,7 @@ module Adhearsion
               meta_def(k) { v } rescue nil
             end
           end
-          
+
           def clone
             returning super do |nemesis|
               instance_variables.each do |iv|
@@ -115,7 +115,7 @@ module Adhearsion
               end
             end
           end
-          
+
         end
 
       end

data/lib/adhearsion/voip/dsl/dialplan/parser.rb

@@ -6,22 +6,22 @@ module Adhearsion
       module Dialplan
         #TODO: This is obsolete, but we still need it for Freeswitch until we port that to the new 0.8.0 APIs
         module DialplanParser
-          
+
           # Create a container and then clone that. when the container is created
           # it should have all the contexts meta_def'd into it. for each call coming
           # in, the cloned copy has the variables meta_def'd and set as instance
           # variables
-          
+
           #TODO: separate into smaller pieces
           def self.get_contexts
             envelope = ContextsEnvelope.new
-            
+
             dialplans = AHN_CONFIG.files_from_setting "paths", "dialplan"
             ahn_log.dialplan.warn "No dialplan files were found!" if dialplans.empty?
-            
+
             returning({}) do |contexts|
               dialplans.each do |file|
-                raise "Dialplan file #{file} does not exist!" unless File.exists? file                
+                raise "Dialplan file #{file} does not exist!" unless File.exists? file
                 envelope.instance_eval do
                   eval File.read(file)
                 end
@@ -42,7 +42,7 @@ module Adhearsion
             end
           end
         end
-        
+
         class ContextsEnvelope
 
           keep = %w"__send__ __id__ define_method instance_eval meta_def meta_eval metaclass"
@@ -65,7 +65,7 @@ module Adhearsion
         end
 
       end
-      
+
     end
   end
 end

data/lib/adhearsion/voip/dsl/dialplan/thread_mixin.rb

@@ -4,11 +4,11 @@ module Adhearsion
     module DSL
       module Dialplan
         module ThreadMixin
-          
+
           def call
             @thread_call_struct ||= OpenStruct.new
           end
-          
+
         end
       end
     end

data/lib/adhearsion/voip/dsl/numerical_string.rb

@@ -3,13 +3,13 @@ module Adhearsion
     module DSL
       # In Ruby, a number with a leading zero such as 023.45 or 023 does not evaluate as expected.
       # In the case of the float 023.45, you get a syntax error. In the case of 023 the number is
-      # parsed as being in octal form and the number 19 is returned. 
+      # parsed as being in octal form and the number 19 is returned.
       #
       # In Adhearsion, various strings that are entirely numeric might start with zero and that zero
-      # should be preserved when converting that string of numbers into a number. The numerical string 
+      # should be preserved when converting that string of numbers into a number. The numerical string
       # retains the zero while still allowing it to be compared to other numbers.
       #
-      # [[I think this leading zero thing is only part of the reason that NumericalString exists. I'm 
+      # [[I think this leading zero thing is only part of the reason that NumericalString exists. I'm
       # currently writing tests for this leading zero stuff so I thought I'd dump some of my assumptions
       # about it here in the documentation.]]
       class NumericalString

data/lib/adhearsion/voip/freeswitch/basic_connection_manager.rb

@@ -1,22 +1,22 @@
 module Adhearsion
   module VoIP
     module FreeSwitch
-  
+
       class BasicConnectionManager
 
         def initialize(io)
           @io = io
         end
-    
+
         # The send-command operator
         def <<(str)
           @io.write str + "\n\n"
         end
-    
+
         def get_header
           separate_pairs get_raw_header
         end
-    
+
         def get_raw_header
           (returning [] do |lines|
             until line = @io.gets and line.chomp.empty?
@@ -31,7 +31,7 @@ module Adhearsion
           # puts "Reading an event of #{length} bytes"
           separate_pairs @io.read(length)
         end
-    
+
         def separate_pairs(lines)
           lines.inject({}) do |h,line|
             returning h do |hash|
@@ -40,9 +40,9 @@ module Adhearsion
             end
           end
         end
-        
+
       end
-  
+
     end
   end
 end

data/lib/adhearsion/voip/freeswitch/event_handler.rb

@@ -51,7 +51,7 @@ module Adhearsion
         def self.on(event, &block)
           event = event.underscore.to_sym if event.is_a? String
           (event.kind_of?(Hash) ? @@compound_events : @@events)[event] = block
-        end    
+        end
       end
     end
   end

data/lib/adhearsion/voip/freeswitch/freeswitch_dialplan_command_factory.rb

@@ -4,30 +4,30 @@ module Adhearsion
   module VoIP
     module FreeSwitch
       class FreeSwitchDialplanCommandFactory
-        
+
         def initialize(context=nil)
           @context = context
         end
-        
+
         # These should all return those objects...
         def speak(text, hash={})
           voice, engine = hash[:voice] || "Dianne", hash[:engine] || "cepstral"
-          
+
           dtmf = hash[:on_keypress]
           speak_cmd = cmd 'speak', "#{engine}|#{voice}|%p" % text, :on_keypress => dtmf
-          
+
           if hash[:timeout] == 0
             [speak_cmd, DSL::Dialplan::NoOpEventCommand.new(hash[:timeout], :on_keypress => dtmf)]
           else
             puts "Returning the normal speak command"
-            speak_cmd 
+            speak_cmd
           end
         end
-        
+
         def set(key, value)
           cmd 'set', "#{key}=#{value}"
         end
-        
+
         def play(*files)
           hash = files.last.kind_of?(Hash) ? files.pop : {}
           conference, to = hash[:conference], hash[:to]
@@ -48,27 +48,27 @@ module Adhearsion
             files.map { |file| cmd('playback', file) }
           end
         end
-        
+
         def join(id)
           DSL::Dialplan::ExitingEventCommand.new "conference", id.to_s
         end
-        
+
         def hangup!
           cmd "exit"
         end
-        
+
         def return!(obj)
           raise DSL::Dialplan::ReturnValue.new(obj)
         end
-        
+
         def hangup!
           raise DSL::Dialplan::Hangup
         end
-        
+
         def wait(seconds=nil, &block)
           DSL::Dialplan::NoOpEventCommand.new(seconds)
         end
-        
+
         def record(hash={}, &block)
           # TODO: Could want to record a conference or a UUID
           p hash
@@ -76,13 +76,13 @@ module Adhearsion
             cmd 'stop_record_session', hash[:stop]
           else
             file = hash[:file] || File.join(Dir::tmpdir, String.random(32), '.wav')
-            
+
             raise "Cannot supply both a timeout and a block!" if hash[:timeout] && block_given?
-            
+
             dtmf_breaker = lambda do |digit|
               return! file if digit == hash[:break_on]
             end
-            
+
             rec_cmd = cmd "record", file, :on_keypress => dtmf_breaker
             returning [] do |cmds|
               cmds << play('beep') if hash[:beep]
@@ -99,7 +99,7 @@ module Adhearsion
             end
           end
         end
-        
+
         def input(number=nil, hash={})
           timeout, file = hash[:timeout], hash[:play] || hash[:file]
           break_on = hash[:break_on] || '#'
@@ -116,13 +116,13 @@ module Adhearsion
             command.on_keypress &dtmf_hook
           end
         end
-        
+
         private
-        
+
         def cmd(*args, &block)
           DSL::Dialplan::EventCommand.new(*args, &block)
         end
-        
+
       end
     end
   end

data/lib/adhearsion/voip/freeswitch/inbound_connection_manager.rb

@@ -3,9 +3,9 @@ module Adhearsion
   module VoIP
     module FreeSwitch
       class InboundConnectionManager < BasicConnectionManager
-    
+
         DEFAULTS = { :pass => "ClueCon", :host => '127.0.0.1', :port => 8021 }
-    
+
         def initialize(arg)
           if arg.kind_of? Hash
             @opts = DEFAULTS.merge arg
@@ -19,19 +19,19 @@ module Adhearsion
             super @io
           end
         end
-    
+
         def enable_events!(which='ALL')
           self << "event plain #{which}"
           get_raw_header
         end
-    
+
         # Only called when nothing has been sent over the socket.
         def login(pass)
           get_raw_header
           self << "auth #{pass}"
           get_raw_header.include? "+OK"
         end
-    
+
       end
     end
   end

data/lib/adhearsion/voip/freeswitch/oes_server.rb

@@ -10,65 +10,65 @@ module Adhearsion
   module VoIP
     module FreeSwitch
       class OesServer < GServer
-        
+
         def initialize(port, host=nil)
           @port, @host = port || 4572, host || "0.0.0.0"
           @cache_lock = Mutex.new
           super @port, @host, (1.0/0.0)
           log "Starting FreeSwitch OES Server"
         end
-        
+
         def serve(io)
-          
+
           log "Incoming call on the FreeSwitch outbound event socket..."
           Thread.me.extend DSL::Dialplan::ThreadMixin
           Thread.me.call.io = io
           conn = BasicConnectionManager.new io
-          
+
           Thread.my.call.mgr = conn
           conn << "connect"
           @vars = conn.get_header
           answered = @vars['variable_endpoint_disposition'] == "ANSWER"
-          
+
           conn << "myevents"
           myevents_response = conn.get_header
           answered ||= myevents_response['Event-Name'] == 'CHANNEL_ANSWER'
-          
+
           log "Connected to Freeswitch. Waiting for answer state."
-          
+
           until answered
             answered ||= conn.get_header['Event-Name'] == 'CHANNEL_ANSWER'
           end
-          
+
           log "Loading cached dialplan"
           contexts, dispatcher = cached_dialplan_data
           log "Finished loading cached dialplans"
-          
+
           first_context_name  = @vars['variable_context'] || @vars["Channel-Context"]
           first_context       = contexts[first_context_name.to_sym]
-          
+
           log "Found context #{first_context_name} from call variables."
-          
+
           # If the target context does not exist, warn and don't handle the call
           unless first_context
             log "No context '#{first_context_name}' found in " +
                 "#{AHN_CONFIG.files_from_setting("paths", "").to_sentence(:connector => "or")}. Ignoring request!"
             return
           end
-          
+
           # Enable events
-          
+
           # Now that we have the code, let's dispatch it back.
-          
+
           pretty_vars = rubyize_keys_for @vars
           dispatcher.def_keys! pretty_vars
           dispatcher.instance_eval(&first_context.block)
-          
+
         rescue => e
           p e
           puts e.backtrace.map {|x| " " * 4 + x }
         end
-        
+
         def cached_dialplan_data
           @cache_lock.synchronize do
             log "Checking whether the contexts should be reloaded"
@@ -79,33 +79,33 @@ module Adhearsion
               @abstract_dispatcher = OesDispatcher.new @vars['Channel-Unique-ID']
               log "Done creating it"
               @abstract_dispatcher.def_keys! @abstract_contexts
-            else  
+            else
               log "Should not reload context."
               @abstract_dispatcher.instance_variable_set :@uuid, @vars['Channel-Unique-ID']
             end
             return [@abstract_contexts.clone, @abstract_dispatcher.clone]
           end
         end
-        
+
         # TODO. This is broken. Always returns true. Should cache the last reload
         # time.
         def should_reload_contexts?
           !@abstract_contexts || !@abstract_dispatcher ||
             AHN_CONFIG.files_from_setting("paths", "dialplan").map { |x| File.mtime(x) }.max < Time.now
         end
-        
+
         def rubyize_keys_for(hash)
           returning({}) do |pretty|
             hash.each { |k,v| pretty[k.to_s.underscore] = v }
           end
         end
-        
+
         class OesDispatcher < DSL::Dialplan::CommandDispatcher
-          
+
           def initialize(uuid=nil)
             super FreeSwitchDialplanCommandFactory, uuid
           end
-          
+
           def dispatch!(event)
             if event.kind_of?(DSL::Dialplan::NoOpEventCommand) && event.on_keypress
               return_value = nil
@@ -128,37 +128,37 @@ module Adhearsion
                 end
               else dispatch.call
               end
-              
+
             else
               log "Not a noop. Sending #{event.app}(#{event.args.to_a * " "})"
-              Thread.my.call.mgr << "SendMsg\ncall-command: execute\nexecute-app-name: " +  
+              Thread.my.call.mgr << "SendMsg\ncall-command: execute\nexecute-app-name: " +
                 "#{event.app}\nexecute-app-arg: #{event.args.to_a * " "}"
-              
+
               if event.kind_of? DSL::Dialplan::ExitingEventCommand
                 Thread.my.call.io.close
                 Thread.me.exit
               end
-              
+
               # Useless "command/reply" +OK and content-length headers
               lambda do
                 Thread.my.call.mgr.get_raw_header
                 redo if Thread.my.call.mgr.get_header['Event-Name'] == "CHANNEL_EXECUTE_COMPLETE"
               end.call
-              
+
               # Main event information. Keep track of the Core-UUID and wait for
               # it to come back to us as a CHANNEL_EXECUTE_COMPLETE event.
               execution_header = Thread.my.call.mgr.get_header
               execution_uuid = execution_header['Core-UUID']
-              
+
               loop do
                 log "Waiting for either a DTMF or the app to finish"
                 hdr = Thread.my.call.mgr.get_raw_header
                 log "Got head #{hdr}"
-                
+
                 if hdr == "Content-Type: api/response\nContent-Length: 0"
                   break
                 end
-                
+
                 async_event = Thread.my.call.mgr.get_header
                 event_name = async_event['Event-Name']
                 if event_name == 'DTMF' && event.on_keypress
@@ -167,7 +167,7 @@ module Adhearsion
                 elsif event_name == 'CHANNEL_EXECUTE_COMPLETE' && async_event['Core-UUID'] == execution_uuid
                   break async_event
                 else
-                  
+
                 end
               end
             end
@@ -179,7 +179,7 @@ module Adhearsion
             Thread.my.call.mgr << "SendMsg\ncall-command: hangup"
             Thread.my.call.mgr.io.close rescue nil
           end
-          
+
           def break!(uuid=@context)
             log "Breaking with #{uuid}"
             Thread.my.call.mgr << "api break #{uuid}"
@@ -188,7 +188,7 @@ module Adhearsion
             # Thread.my.call.mgr.get_raw_header
           end
         end
-        
+
       end
     end
   end