adhearsion 0.8.3 → 0.8.4

data/lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rl.rb

@@ -10,58 +10,58 @@ module Adhearsion
 
           %%{
           	machine ami_protocol_parser;
-          
+
             # All required Ragel actions are implemented as Ruby methods.
-          
+
             # Executed after a "Respone: Success" or "Response: Pong"
             action init_success { init_success }
-          
+
             action init_response_follows { init_response_follows }
-          
+
             action init_error { init_error }
-            
+
             action message_received { message_received @current_message }
             action error_received   {   error_received @current_message }
-              
+
             action version_starts { version_starts }
             action version_stops  { version_stops  }
-          
+
             action key_starts { key_starts }
             action key_stops  { key_stops  }
-          
+
             action value_starts { value_starts }
             action value_stops  { value_stops  }
-          
+
             action error_reason_starts { error_reason_starts }
             action error_reason_stops  { error_reason_stops  }
-          
+
             action syntax_error_starts { syntax_error_starts }
             action syntax_error_stops  { syntax_error_stops  }
-          
+
             action immediate_response_starts { immediate_response_starts }
             action immediate_response_stops  { immediate_response_stops  }
-          
+
             action follows_text_starts { follows_text_starts }
             action follows_text_stops  { follows_text_stops  }
-          
+
             action event_name_starts { event_name_starts }
             action event_name_stops  { event_name_stops  }
-          
+
             include ami_protocol_parser_machine "ami_protocol_lexer_machine.rl";
-    
+
           }%%##
 
           attr_accessor(:ami_version)
           def initialize
-    
+
             @data = ""
             @current_pointer = 0
             @ragel_stack = []
-            
+
             %%{
               # All other variables become local, letting Ruby garbage collect them. This
               # prevents us from having to manually reset them.
-      
+
         			variable data  @data;
               variable p     @current_pointer;
         			variable pe    @data_ending_pointer;
@@ -73,22 +73,22 @@ module Adhearsion
         			variable eof   @eof;
 			        variable stack @ragel_stack;
 			        variable top   @ragel_stack_top;
-			        
+
         			write data;
               write init;
             }%%##
-            
+
           end
-  
+
           def <<(new_data)
             extend_buffer_with new_data
             resume!
           end
-        
+
           def resume!
             %%{ write exec; }%%##
           end
-        
+
           def extend_buffer_with(new_data)
             if new_data.size + @data.size > BUFFER_SIZE
               @data.slice! 0...new_data.size
@@ -98,9 +98,9 @@ module Adhearsion
             @data << new_data
             @data_ending_pointer = @data.size
           end
-        
+
           protected
-                
+
           ##
           # Called after a response or event has been successfully parsed.
           #
@@ -130,117 +130,117 @@ module Adhearsion
           def syntax_error_encountered(ignored_chunk)
             raise NotImplementedError, "Must be implemented in subclass!"
           end
-        
+
           def init_success
             @current_message = ManagerInterfaceResponse.new
           end
-        
+
           def init_response_follows
             @current_message = ManagerInterfaceResponse.new
           end
-          
+
           def init_error
             @current_message = ManagerInterfaceError.new()
           end
-          
+
           def version_starts
             @start_of_version = @current_pointer
           end
-  
+
           def version_stops
             self.ami_version = @data[@start_of_version...@current_pointer].to_f
             @start_of_version = nil
           end
-  
+
           def event_name_starts
             @event_name_start = @current_pointer
           end
-  
+
           def event_name_stops
             event_name = @data[@event_name_start...@current_pointer]
             @event_name_start = nil
             @current_message = ManagerInterfaceEvent.new(event_name)
           end
-  
+
           def key_starts
             @current_key_position = @current_pointer
           end
-  
+
           def key_stops
             @current_key = @data[@current_key_position...@current_pointer]
           end
-  
+
           def value_starts
             @current_value_position = @current_pointer
           end
-  
+
           def value_stops
             @current_value = @data[@current_value_position...@current_pointer]
             @last_seen_value_end = @current_pointer + 2 # 2 for \r\n
             add_pair_to_current_message
           end
-          
+
           def error_reason_starts
             @error_reason_start = @current_pointer
           end
-          
+
           def error_reason_stops
             @current_message.message = @data[@error_reason_start...@current_pointer]
           end
-          
+
           def follows_text_starts
             @follows_text_start = @current_pointer
           end
-  
+
           def follows_text_stops
             text = @data[@last_seen_value_end..@current_pointer]
             text.sub! /\r?\n--END COMMAND--/, ""
             @current_message.text_body = text
             @follows_text_start = nil
           end
-  
+
           def add_pair_to_current_message
             @current_message[@current_key] = @current_value
             reset_key_and_value_positions
           end
-  
+
           def reset_key_and_value_positions
             @current_key, @current_value, @current_key_position, @current_value_position = nil
           end
-  
+
           def syntax_error_starts
             @current_syntax_error_start = @current_pointer # Adding 1 since the pointer is still set to the last successful match
           end
-  
+
           def syntax_error_stops
             # Subtracting 3 from @current_pointer below for "\r\n" which separates a stanza
             offending_data = @data[@current_syntax_error_start...@current_pointer - 1]
             syntax_error_encountered offending_data
             @current_syntax_error_start = nil
           end
-  
+
           def immediate_response_starts
             @immediate_response_start = @current_pointer
           end
-  
+
           def immediate_response_stops
             message = @data[@immediate_response_start...(@current_pointer -1)]
             message_received ManagerInterfaceResponse.from_immediate_response(message)
           end
-  
+
           ##
           # This method is used primarily in debugging.
           #
           def view_buffer(message=nil)
-    
+
             message ||= "Viewing the buffer"
-    
+
             buffer = @data.clone
             buffer.insert(@current_pointer, "\033[0;31m\033[1;31m^\033[0m")
-    
+
             buffer.gsub!("\r", "\\\\r")
             buffer.gsub!("\n", "\\n\n")
-    
+
             puts <<-INSPECTION
 VVVVVVVVVVVVVVVVVVVVVVVVVVVVV
 ####  #{message}
@@ -249,37 +249,37 @@ VVVVVVVVVVVVVVVVVVVVVVVVVVVVV
 #############################
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
             INSPECTION
-    
+
           end
         end
         class DelegatingAsteriskManagerInterfaceLexer < AbstractAsteriskManagerInterfaceStreamLexer
-          
+
           def initialize(delegate, method_delegation_map=nil)
             super()
             @delegate = delegate
-            
+
             @message_received_method = method_delegation_map && method_delegation_map.has_key?(:message_received) ?
                 method_delegation_map[:message_received] : :message_received
-            
+
             @error_received_method = method_delegation_map && method_delegation_map.has_key?(:error_received) ?
                 method_delegation_map[:error_received] : :error_received
-            
+
             @syntax_error_method = method_delegation_map && method_delegation_map.has_key?(:syntax_error_encountered) ?
                 method_delegation_map[:syntax_error_encountered] : :syntax_error_encountered
           end
-          
+
           def message_received(message)
             @delegate.send(@message_received_method, message)
           end
-          
+
           def error_received(message)
             @delegate.send(@error_received_method, message)
           end
-          
+
           def syntax_error_encountered(ignored_chunk)
             @delegate.send(@syntax_error_method, ignored_chunk)
           end
-          
+
         end
       end
     end

data/lib/adhearsion/voip/asterisk/manager_interface/ami_messages.rb

@@ -10,7 +10,7 @@ module Adhearsion
         # Note: not all responses have an ActionID!
         #
         class ManagerInterfaceResponse
-        
+
           class << self
             def from_immediate_response(text)
               returning new do |instance|
@@ -18,59 +18,59 @@ module Adhearsion
               end
             end
           end
-          
+
           attr_accessor :action,
                         :action_id,
                         :text_body  # For "Response: Follows" sections
           attr_reader   :events
-          
+
           def initialize
             @headers = HashWithIndifferentAccess.new
           end
-          
+
           def has_text_body?
             !! @text_body
           end
-          
+
           def headers
             @headers.clone
           end
-        
+
           def [](arg)
             @headers[arg]
           end
-  
+
           def []=(key,value)
             @headers[key] = value
           end
-          
+
         end
-      
+
         class ManagerInterfaceError < Exception
-          
+
           attr_accessor :message
           def initialize
             @headers = HashWithIndifferentAccess.new
           end
-          
+
           def [](key)
             @headers[key]
           end
-          
+
           def []=(key,value)
             @headers[key] = value
           end
-          
+
         end
-        
+
         class ManagerInterfaceEvent < ManagerInterfaceResponse
-  
+
           attr_reader :name
           def initialize(name)
             super()
             @name = name
           end
-          
+
         end
       end
     end

data/lib/adhearsion/voip/asterisk/manager_interface/ami_protocol_lexer_machine.rl

@@ -83,5 +83,5 @@ response_follows := |*
     FollowsBody;
     crlf @{ message_received @current_message; fgoto protocol; };
 *|;
- 
+
 }%%

data/lib/adhearsion/voip/asterisk/special_dial_plan_managers.rb

@@ -1,9 +1,9 @@
 module Adhearsion
   class DialPlan
     class ConfirmationManager
-      
+
       class << self
-          
+
         def encode_hash_for_dial_macro_argument(options)
           options    = options.clone
           macro_name = options.delete :macro
@@ -11,20 +11,20 @@ module Adhearsion
           encoded_options = URI.escape options.map { |key,value| "#{key}:#{value}" }.join('!')
           returning "M(#{macro_name}^#{encoded_options})" do |str|
             if str.rindex('^') != str.index('^')
-              raise ArgumentError, "You seem to have supplied a :confirm option with a caret (^) in it!" + 
+              raise ArgumentError, "You seem to have supplied a :confirm option with a caret (^) in it!" +
                                    " Please remove it. This will blow Asterisk up."
             end
           end
         end
-        
+
         def handle(call)
           new(call).handle
         end
-        
+
         def confirmation_call?(call)
           call.variables.has_key?(:network_script) && call.variables[:network_script].starts_with?('confirm!')
         end
-                
+
         def decode_hash(encoded_hash)
           encoded_hash = encoded_hash =~ /^M\((.+)\)$/ ? $1 : encoded_hash
           encoded_hash = encoded_hash =~ /^([^:]+\^)?(.+)$/ ? $2 : encoded_hash # Remove the macro name if it's there
@@ -38,19 +38,19 @@ module Adhearsion
         end
 
       end
-      
+
       attr_reader :call
       def initialize(call)
         @call = call
         extend Adhearsion::VoIP::Commands.for(call.originating_voip_platform)
       end
-      
+
       def handle
         variables = self.class.decode_hash call.variables[:network_script]
-        
+
         answer
         loop do
-          response = interruptable_play(*variables[:play])
+          response = interruptible_play(*variables[:play])
           if response && response.to_s == variables[:key].to_s
             # Don't set a variable to pass through to dial()
             break
@@ -58,7 +58,7 @@ module Adhearsion
             next
           else
             response = wait_for_digit variables[:timeout]
-            if response 
+            if response
               if response.to_s == variables[:key].to_s
                 # Don't set a variable to pass through to dial()
                 break
@@ -72,9 +72,9 @@ module Adhearsion
             end
           end
         end
-        
+
       end
-      
+
     end
   end
 end