adhearsion 0.8.3 → 0.8.4

data/lib/adhearsion/voip/menu_state_machine/calculated_match.rb

@@ -54,7 +54,7 @@ module Adhearsion
         calculated_matches << calculated_match
         actual_potential_matches.concat calculated_match.potential_matches
         actual_exact_matches.concat calculated_match.exact_matches
-  
+
         potential_matches << calculated_match if calculated_match.potential_match?
         exact_matches << calculated_match if calculated_match.exact_match?
       end

data/lib/adhearsion/voip/menu_state_machine/matchers.rb

@@ -52,11 +52,11 @@ module Adhearsion
 
       def match(query)
         numerical_query = coerce_to_numeric query
-        if numerical_query      
+        if numerical_query
           exact_match = pattern.include?(numerical_query) ? query : nil
           potential_matches = numbers_in_range_like numerical_query
           potential_matches.reject! { |m| m.to_s == exact_match.to_s } if exact_match
-    
+
           new_calculated_match :query => query, :exact_matches => exact_match,
                                :potential_matches => potential_matches
         else

data/lib/adhearsion/voip/menu_state_machine/menu_class.rb

@@ -11,7 +11,7 @@ module Adhearsion
       attr_reader :builder, :timeout, :tries_count, :max_number_of_tries
       def initialize(options={}, &block)
         @tries_count         = 0 # Counts the number of tries the menu's been executed
-        
+
         @timeout             = options[:timeout] || DEFAULT_TIMEOUT
         @max_number_of_tries = options[:tries]   || DEFAULT_MAX_NUMBER_OF_TRIES
 
@@ -24,15 +24,15 @@ module Adhearsion
       def <<(other)
         digit_buffer << other
       end
-      
+
       def digit_buffer
         @digit_buffer
       end
-      
+
       def digit_buffer_string
         digit_buffer.to_s
       end
-      
+
       def digit_buffer_empty?
         digit_buffer.empty?
       end
@@ -79,8 +79,8 @@ module Adhearsion
       end
 
       protected
-      
-      # If you're using a more complex class in subclasses, you may want to override this method in addition to the 
+
+      # If you're using a more complex class in subclasses, you may want to override this method in addition to the
       # digit_buffer, digit_buffer_empty, and digit_buffer_string methods
       def initialize_digit_buffer
         @digit_buffer = ClearableStringBuffer.new
@@ -131,17 +131,17 @@ module Adhearsion
       # Raised when the user's input matches no patterns
       class MenuResultInvalid < MenuResult; end
 
-      # For our default purposes, we need the digit_buffer to behave much like a normal String except that it should 
+      # For our default purposes, we need the digit_buffer to behave much like a normal String except that it should
       # handle its own resetting (clearing).
       class ClearableStringBuffer < String
         def clear!
           replace ""
         end
-        
+
         def <<(other)
           super other.to_s
         end
-        
+
       end
 
     end

data/lib/theatre.rb

@@ -9,11 +9,11 @@ require 'theatre/invocation'
 require 'theatre/callback_definition_loader'
 
 module Theatre
-  
+
   class Theatre
-    
+
     attr_reader :namespace_manager
-    
+
     ##
     # Creates a new stopped Theatre. You must call start!() after you instantiate this for it to begin processing events.
     #
@@ -27,7 +27,7 @@ module Theatre
       @master_queue      = Queue.new
       @loader_mixins     = []
     end
-    
+
     ##
     # Send a message to this Theatre for asynchronous processing.
     #
@@ -48,10 +48,10 @@ module Theatre
         invocation
       end
     end
-    
+
     ##
     # Send a message to this Theatre for synchronous processing. The execution of this will not go through this Theatre's
-    # Thread pool. If an error occurred in any of callbacks, the Exception object will be placed in the returned Array 
+    # Thread pool. If an error occurred in any of callbacks, the Exception object will be placed in the returned Array
     # instead for you to act upon.
     #
     # @param [String] namespace The namespace to which the payload should be sent
@@ -72,29 +72,29 @@ module Theatre
         end
       end
     end
-    
+
     def load_events_code(code, *args)
       loader = CallbackDefinitionLoader.new(self, *args)
       loader.load_events_code code
     end
-    
+
     def load_events_file(file, *args)
       loader = CallbackDefinitionLoader.new(self, *args)
       loader.load_events_file file
     end
-    
+
     def register_namespace_name(*args)
       @namespace_manager.register_namespace_name(*args)
     end
-    
+
     def register_callback_at_namespace(*args)
       @namespace_manager.register_callback_at_namespace(*args)
     end
-    
+
     def register_loader_mixin(mod)
       @loader_mixins << mod
     end
-    
+
     def join
       @thread_group.list.each do |thread|
         begin
@@ -104,7 +104,7 @@ module Theatre
         end
       end
     end
-    
+
     ##
     # Starts this Theatre.
     #
@@ -117,7 +117,7 @@ module Theatre
         @thread_group.add Thread.new(&method(:thread_loop))
       end
     end
-    
+
     ##
     # Notifies all Threads for this Theatre to stop by sending them special messages. Any messages which were queued and
     # untriggered when this method is received will still be processed. Note: you may start this Theatre again later once it
@@ -127,14 +127,14 @@ module Theatre
       @thread_count.times { @master_queue << :THEATRE_SHUTDOWN! }
       @started_time = nil
     end
-    
+
     protected
-    
+
     # This will use the Adhearsion logger eventually.
     def warn(exception)
       # STDERR.puts exception.message, *exception.backtrace
     end
-    
+
     def thread_loop
       loop do
         begin
@@ -146,6 +146,6 @@ module Theatre
         end
       end
     end
-    
+
   end
 end

data/lib/theatre/callback_definition_loader.rb

@@ -1,22 +1,22 @@
 module Theatre
-  
+
   ##
   # This class provides the a wrapper aroung which an events.rb file can be instance_eval'd.
   #
   class CallbackDefinitionLoader
-    
+
     attr_reader :theatre, :root_name
     def initialize(theatre, root_name=:events)
       @theatre   = theatre
       @root_name = root_name
-      
+
       create_recorder_method root_name
     end
-    
+
     def anonymous_recorder
       BlankSlateMessageRecorder.new(&method(:callback_registered))
     end
-    
+
     ##
     # Parses the given Ruby source code file and returns this object.
     #
@@ -27,7 +27,7 @@ module Theatre
       instance_eval file.read, file.path
       self
     end
-    
+
     ##
     # Parses the given Ruby source code and returns this object.
     #
@@ -41,9 +41,9 @@ module Theatre
       instance_eval code
       self
     end
-    
+
     protected
-    
+
     ##
     # Immediately register the namespace and callback with the Theatre instance given to the constructor. This method is only
     # called when a new BlankSlateMessageRecorder is instantiated and receives #each().
@@ -51,34 +51,34 @@ module Theatre
     def callback_registered(namespaces, callback)
       # Get rid of all arguments passed to the namespaces. Will support arguments in the future.
       namespaces = namespaces.map { |namespace| namespace.first }
-      
+
       theatre.namespace_manager.register_callback_at_namespace namespaces, callback
     end
-    
+
     def create_recorder_method(record_method_name)
       (class << self; self; end).send(:alias_method, record_method_name, :anonymous_recorder)
     end
-    
+
     class BlankSlateMessageRecorder
-      
+
       (instance_methods - %w[__send__ __id__]).each { |m| undef_method m }
-      
+
       def initialize(&notify_on_completion)
         @notify_on_completion = notify_on_completion
         @namespaces = []
       end
-      
+
       def method_missing(*method_name_and_args)
         raise ArgumentError, "Supplying a block is not supported" if block_given?
         @namespaces << method_name_and_args
         self
       end
-      
+
       def each(&callback)
         @notify_on_completion.call(@namespaces, callback)
       end
-      
+
     end
-    
+
   end
 end

data/lib/theatre/guid.rb

@@ -2,19 +2,19 @@
 # Theatre depends and make that a dependent library.
 
 unless respond_to? :new_guid
-  
+
   def random_character
     case random_digit = rand(62)
-      when  0...10 : random_digit.to_s
-      when 10...36 : (random_digit + 55).chr
-      when 36...62 : (random_digit + 61).chr
+      when  0...10 then random_digit.to_s
+      when 10...36 then (random_digit + 55).chr
+      when 36...62 then (random_digit + 61).chr
     end
   end
-  
+
   def random_string(length_of_string=8)
     Array.new(length_of_string) { random_character }.join
   end
-  
+
   # This GUID implementation doesn't adhere to the RFC which wants to make certain segments based on the MAC address of a
   # network interface card and other wackiness. It's sufficiently random for our needs.
   def new_guid

data/lib/theatre/invocation.rb

@@ -3,16 +3,16 @@ require 'thread'
 require 'monitor'
 
 module Theatre
-  
+
   ##
   # An Invocation is an object which Theatre generates and returns from Theatre#trigger.
   #
   class Invocation
-    
+
     attr_reader :queued_time, :started_time, :finished_time, :unique_id, :callback, :namespace, :error, :returned_value
-    
+
     class InvalidStateError < Exception; end
-    
+
     ##
     # Create a new Invocation.
     #
@@ -27,14 +27,14 @@ module Theatre
       @callback      = callback
       @current_state = :new
       @state_lock    = Mutex.new
-      
+
       # Used just to protect access to the @returned_value instance variable
       @returned_value_lock = Monitor.new
-      
+
       # Used when wait() is called to notify all waiting threads by using a ConditionVariable
       @returned_value_blocker = @returned_value_lock.new_cond#Monitor::ConditionVariable.new @returned_value_lock
     end
-    
+
     def queued
       with_state_lock do
         raise InvalidStateError unless @current_state == :new
@@ -43,18 +43,18 @@ module Theatre
       end
       true
     end
-    
+
     def current_state
       with_state_lock { @current_state }
     end
-    
+
     def start
       with_state_lock do
         raise InvalidStateError unless @current_state == :queued
         @current_state = :running
       end
       @started_time = Time.now.freeze
-      
+
       begin
         self.returned_value = if @payload.equal? :theatre_no_payload
           @callback.call
@@ -68,20 +68,20 @@ module Theatre
         @finished_time = Time.now.freeze
       end
     end
-    
+
     def execution_duration
       return nil unless @finished_time
       @finished_time - @started_time
     end
-    
+
     def error?
       current_state.equal? :error
     end
-    
+
     def success?
       current_state.equal? :success
     end
-    
+
     ##
     # When this Invocation has been queued, started, and entered either the :success or :error state, this method will
     # finally return. Until then, it blocks the Thread.
@@ -94,9 +94,9 @@ module Theatre
       # Return the returned_value
       with_returned_value_lock { @returned_value }
     end
-    
+
     protected
-    
+
     ##
     # Protected setter which does some other housework when the returned value is found (such as notifying wait()ers)
     #
@@ -108,14 +108,14 @@ module Theatre
         @returned_value_blocker.broadcast
       end
     end
-    
+
     def with_returned_value_lock(&block)
       @returned_value_lock.synchronize(&block)
     end
-    
+
     def with_state_lock(&block)
       @state_lock.synchronize(&block)
     end
-    
+
   end
 end

data/lib/theatre/namespace_manager.rb

@@ -1,17 +1,17 @@
 module Theatre
-  
+
   ##
   # Manages the hierarchial namespaces of a Theatre. This class is Thread-safe.
   #
   class ActorNamespaceManager
 
     VALID_NAMESPACE = %r{^(/[\w_]+)+$}
-    
+
     class << self
       def valid_namespace_path?(namespace_path)
         namespace_path =~ VALID_NAMESPACE
       end
-      
+
       ##
       # Since there are a couple ways to represent namespaces, this is a helper method which will normalize
       # them into the most practical: an Array of Symbols
@@ -25,13 +25,13 @@ module Theatre
       end
 
     end
-    
+
     def initialize
       @registry_lock = Mutex.new
       @root          = RootNamespaceNode.new
     end
-    
-    ## 
+
+    ##
     # Have this registry recognize a new path and prepare it for callback registrations. All path segements will be created
     # in order. For example, when registering "/foo/bar/qaz" when no namespaces at all have been registered, this method will
     # first register "foo", then "bar", then "qaz". If the namespace was already registered, it will not be affected.
@@ -42,12 +42,12 @@ module Theatre
     #
     def register_namespace_name(*paths)
       paths = self.class.normalize_path_to_array paths
-      
+
       paths.inject(@root) do |node, name|
         node.register_namespace_name name
       end
     end
-    
+
     ##
     # Returns a Proc found after searching with the namespace you provide
     #
@@ -56,7 +56,7 @@ module Theatre
     def callbacks_for_namespaces(*paths)
       search_for_namespace(paths).callbacks
     end
-    
+
     ##
     # Find a namespace in the tree.
     #
@@ -66,7 +66,7 @@ module Theatre
     def search_for_namespace(paths)
       paths = self.class.normalize_path_to_array paths
       path_string = "/"
-      
+
       found_namespace = paths.inject(@root) do |last_node,this_node_name|
         raise NamespaceNotFound.new(path_string) if last_node.nil?
         path_string << this_node_name.to_s
@@ -75,64 +75,64 @@ module Theatre
       raise NamespaceNotFound.new("/#{paths.join('/')}") unless found_namespace
       found_namespace
     end
-    
+
     ##
     # Registers the given callback at a namespace, assuming the namespace was already registered.
     #
     # @param [Array] paths Must be an Array of segments
-    # @param [Proc] callback 
+    # @param [Proc] callback
     # @raise NamespaceNotFound if a segment has not been registered yet
     #
     def register_callback_at_namespace(paths, callback)
       raise ArgumentError, "callback must be a Proc" unless callback.kind_of? Proc
       search_for_namespace(paths).register_callback callback
     end
-    
+
     protected
-    
+
     ##
-    # Used by NamespaceManager to build a tree of namespaces. Has a Hash of children which is not 
+    # Used by NamespaceManager to build a tree of namespaces. Has a Hash of children which is not
     # Thread-safe. For Thread-safety, all access should semaphore through the NamespaceManager.
     class NamespaceNode
-      
+
       attr_reader :name
       def initialize(name)
         @name = name.freeze
         @children  = {}
         @callbacks = []
       end
-      
+
       def register_namespace_name(name)
         @children[name] ||= NamespaceNode.new(name)
       end
-      
+
       def register_callback(callback)
         @callbacks << callback
         callback
       end
-      
+
       def callbacks
         @callbacks.clone
       end
-      
+
       def delete_callback(callback)
         @callbacks.delete callback
       end
-      
+
       def child_named(name)
         @children[name]
       end
-      
+
       def destroy_namespace(name)
         @children.delete name
       end
-      
+
       def root?
         false
       end
-      
+
     end
-    
+
     class RootNamespaceNode < NamespaceNode
       def initialize
         super :ROOT
@@ -141,13 +141,13 @@ module Theatre
         true
       end
     end
-    
+
   end
-  
+
   class NamespaceNotFound < Exception
     def initialize(full_path)
       super "Could not find #{full_path.inspect} in the namespace registry. Did you register it yet?"
     end
   end
-  
+
 end