adhearsion 0.8.3 → 0.8.4

data/lib/adhearsion/component_manager.rb

@@ -1,24 +1,24 @@
 module Adhearsion
   module Components
-    
+
     mattr_accessor :component_manager
-    
+
     class ConfigurationError < Exception; end
-    
+
     class ComponentManager
-      
+
       class << self
-        
+
         def scopes_valid?(*scopes)
           unrecognized_scopes = (scopes.flatten - SCOPE_NAMES).map(&:inspect)
           raise ArgumentError, "Unrecognized scopes #{unrecognized_scopes.to_sentence}" if unrecognized_scopes.any?
           true
         end
-        
+
       end
-      
+
       SCOPE_NAMES = [:dialplan, :events, :generators, :rpc, :global]
-      
+
       attr_reader :scopes, :lazy_config_loader
       def initialize(path_to_container_directory)
         @path_to_container_directory = path_to_container_directory
@@ -28,14 +28,14 @@ module Adhearsion
         end
         @lazy_config_loader = LazyConfigLoader.new(self)
       end
-      
+
       ##
       # Includes the anonymous Module created for the :global scope in Object, making its methods globally accessible.
       #
       def globalize_global_scope!
         Object.send :include, @scopes[:global]
       end
-      
+
       def load_components
         components = Dir.glob(File.join(@path_to_container_directory + "/*")).select do |path|
           File.directory?(path)
@@ -50,9 +50,9 @@ module Adhearsion
             ahn_log.warn "Component directory does not contain a matching .rb file! Was expecting #{component_file.inspect}"
           end
         end
-        
+
       end
-      
+
       ##
       # Loads the configuration file for a given component name.
       #
@@ -67,12 +67,12 @@ module Adhearsion
           return {}
         end
       end
-      
+
       def extend_object_with(object, *scopes)
         raise ArgumentError, "Must supply at least one scope!" if scopes.empty?
-        
+
         self.class.scopes_valid? scopes
-        
+
         scopes.each do |scope|
           methods = @scopes[scope]
           if object.kind_of?(Module)
@@ -83,7 +83,7 @@ module Adhearsion
         end
         object
       end
-    
+
       def load_code(code)
         load_container ComponentDefinitionContainer.load_code(code)
       end
@@ -91,9 +91,9 @@ module Adhearsion
       def load_file(filename)
         load_container ComponentDefinitionContainer.load_file(filename)
       end
-      
+
       protected
-      
+
       def load_container(container)
         container.constants.each do |constant_name|
           constant_value = container.const_get(constant_name)
@@ -101,9 +101,9 @@ module Adhearsion
         end
         metadata = container.metaclass.send(:instance_variable_get, :@metadata)
         metadata[:initialization_block].call if metadata[:initialization_block]
-        
+
         self.class.scopes_valid? metadata[:scopes].keys
-        
+
         metadata[:scopes].each_pair do |scope, method_definition_blocks|
           method_definition_blocks.each do |method_definition_block|
             @scopes[scope].module_eval(&method_definition_block)
@@ -113,45 +113,45 @@ module Adhearsion
       end
 
       class ComponentDefinitionContainer < Module
-        
+
         class << self
           def load_code(code)
             returning(new) do |instance|
               instance.module_eval code
             end
           end
-          
+
           def load_file(filename)
             returning(new) do |instance|
               instance.module_eval File.read(filename), filename
             end
           end
         end
-        
+
         def initialize(&block)
           # Hide our instance variables in the singleton class
           metadata = {}
           metaclass.send(:instance_variable_set, :@metadata, metadata)
-          
+
           metadata[:scopes] = ComponentManager::SCOPE_NAMES.inject({}) do |scopes, name|
             scopes[name] = []
             scopes
           end
-          
+
           super
-          
+
           meta_def(:initialize) { raise "This object has already been instantiated. Are you sure you didn't mean initialization()?" }
         end
-        
+
         def methods_for(*scopes, &block)
           raise ArgumentError if scopes.empty?
-          
+
           ComponentManager.scopes_valid? scopes
-          
+
           metadata = metaclass.send(:instance_variable_get, :@metadata)
           scopes.each { |scope| metadata[:scopes][scope] << block }
         end
-        
+
         def initialization(&block)
           # Raise an exception if the initialization block has already been set
           metadata = metaclass.send(:instance_variable_get, :@metadata)
@@ -162,18 +162,18 @@ module Adhearsion
           end
         end
         alias initialisation initialization
-        
+
         protected
-        
+
         class << self
           def self.method_added(method_name)
             @methods ||= []
             @methods << method_name
           end
         end
-        
+
       end
-    
+
       class ComponentMethodDefinitionContainer < Module
         class << self
           def method_added(method_name)
@@ -181,27 +181,27 @@ module Adhearsion
             @methods << method_name
           end
         end
-        
+
         attr_reader :scopes
         def initialize(*scopes, &block)
           @scopes = []
           super(&block)
         end
-        
+
       end
-    
+
       class LazyConfigLoader
         def initialize(component_manager)
           @component_manager = component_manager
         end
-        
+
         def method_missing(component_name)
           config = @component_manager.configuration_for_component_named(component_name.to_s)
           (class << self; self; end).send(:define_method, component_name) { config }
           config
         end
       end
-    
+
     end
   end
 end

data/lib/adhearsion/component_manager/component_tester.rb

@@ -1,7 +1,7 @@
 module ComponentTester
-  
+
   class << self
-    
+
     ##
     #
     #
@@ -10,46 +10,46 @@ module ComponentTester
     def new(component_name, component_directory)
       component_directory = File.expand_path component_directory
       main_file = component_directory + "/#{component_name}/#{component_name}.rb"
-      
+
       component_manager = Adhearsion::Components::ComponentManager.new(component_directory)
       component_module  = Adhearsion::Components::ComponentManager::ComponentDefinitionContainer.load_file main_file
-      
+
       Module.new do
-        
+
         extend ComponentTester
-        
+
         (class << self; self; end).send(:define_method, :component_manager)   { component_manager   }
         (class << self; self; end).send(:define_method, :component_name)      { component_name      }
         (class << self; self; end).send(:define_method, :component_module)    { component_module    }
         (class << self; self; end).send(:define_method, :component_directory) { component_directory }
-        
-        
+
+
         define_method(:component_manager)   { component_manager   }
         define_method(:component_name)      { component_name      }
         define_method(:component_module)    { component_module    }
         define_method(:component_directory) { component_directory }
-        
+
         def self.const_missing(name)
           component_module.const_get name
         end
-        
+
       end
     end
   end
-  
+
   def helper_method(name)
     Object.new.extend(component_module).method(name)
   end
-  
+
   def config
     component_manager.configuration_for_component_named component_name
   end
-  
+
   def initialize!
     metadata = component_module.metaclass.send(:instance_variable_get, :@metadata)
     if metadata && metadata[:initialization_block].kind_of?(Proc)
       metadata[:initialization_block].call
     end
   end
-  
+
 end

data/lib/adhearsion/component_manager/spec_framework.rb

@@ -8,7 +8,7 @@ end
 begin
   require 'rr'
 rescue LoadError
-  abort 'You do not have the "rr" gem installed! You must install it to continue.\n\nsudo gem install rr\n\n'  
+  abort 'You do not have the "rr" gem installed! You must install it to continue.\n\nsudo gem install rr\n\n'
 end
 
 module ComponentConfigurationSpecHelper

data/lib/adhearsion/events_support.rb

@@ -22,7 +22,7 @@ require 'theatre'
 
 module Adhearsion
   module Events
-    
+
     DEFAULT_FRAMEWORK_EVENT_NAMESPACES = %w[
       /after_initialized
       /shutdown
@@ -32,21 +32,21 @@ module Adhearsion
       /asterisk/hungup_call
       /asterisk/failed_call
     ]
-    
+
     class << self
-      
+
       def framework_theatre
         defined?(@@framework_theatre) ? @@framework_theatre : reinitialize_theatre!
       end
-      
+
       def trigger(*args)
         framework_theatre.trigger(*args)
       end
-      
+
       def trigger_immediately(*args)
         framework_theatre.trigger_immediately(*args)
       end
-      
+
       def reinitialize_theatre!
         @@framework_theatre.gracefully_stop! if defined? @@framework_theatre
       rescue
@@ -59,26 +59,26 @@ module Adhearsion
         end
         return @@framework_theatre
       end
-      
+
       def register_namespace_name(name)
         framework_theatre.register_namespace_name name
       end
-      
+
       def stop!
         Events.trigger :shutdown
         framework_theatre.graceful_stop!
         framework_theatre.join
       end
-      
+
       def register_callback(namespace, block_arg=nil, &method_block)
         raise ArgumentError, "Cannot supply two blocks!" if block_arg && block_given?
         block = method_block || block_arg
         raise ArgumentError, "Must supply a callback!" unless block
-        
+
         framework_theatre.register_callback_at_namespace(namespace, block)
       end
-      
+
     end
-    
+
   end
 end

data/lib/adhearsion/foundation/blank_slate.rb

@@ -1,5 +1,5 @@
 class BlankSlate
-  instance_methods.each do |method| 
+  instance_methods.each do |method|
     undef_method method unless method =~ /^__/ || method == 'instance_eval'
   end
 end

data/lib/adhearsion/foundation/custom_daemonizer.rb

@@ -3,7 +3,7 @@
 # meet Adhearsion's quality standards.
 module Adhearsion
   module CustomDaemonizer
-  
+
     # Try to fork if at all possible retrying every 5 sec if the
     # maximum process limit for the system has been reached
     def safefork
@@ -38,7 +38,7 @@ module Adhearsion
 
       STDIN.reopen "/dev/null"
       STDOUT.reopen '/dev/null', "a"
-      STDERR.reopen log_file 
+      STDERR.reopen log_file, "a"
       return oldmode ? sess_id : 0
     end
   end

data/lib/adhearsion/foundation/event_socket.rb

@@ -1,9 +1,9 @@
 ##
 # EventSocket is a small abstraction of TCPSocket which causes it to behave much like an EventMachine Connection object for
-# the sake of better testability. The EventMachine Connection paradigm (as well as other networking libraries such as the 
-# Objective-C HTTP library) uses callbacks to signal different stages of a socket's lifecycle. 
+# the sake of better testability. The EventMachine Connection paradigm (as well as other networking libraries such as the
+# Objective-C HTTP library) uses callbacks to signal different stages of a socket's lifecycle.
 #
-# A handler can be registered in one of two ways: through registrations on an object yielded by the constructor or 
+# A handler can be registered in one of two ways: through registrations on an object yielded by the constructor or
 # pre-defined on the object given as a constructor parameter. Below is an example definition which uses the block way:
 #
 #   EventSocket.new do |handler|
@@ -35,7 +35,7 @@
 #   end
 #   EventSocket.new(MyCallbackHandler.new)
 #
-# If you wish to ask the EventSocket what state it is in, you can call the Thread-safe EventSocket#state method. The 
+# If you wish to ask the EventSocket what state it is in, you can call the Thread-safe EventSocket#state method. The
 # supported states are:
 #
 #  - :new
@@ -43,10 +43,10 @@
 #  - :stopped
 #  - :connection_dropped
 #
-# Note: the EventSocket's state will be changed before these callbacks are executed. For example, if your "connected" 
+# Note: the EventSocket's state will be changed before these callbacks are executed. For example, if your "connected"
 # callback queried its own EventSocket for its state, it will have already transitioned to the connected() state.
 #
-# Warning: If an exception occurs in your EventSocket callbacks, they will be "eaten" and never bubbled up the call stack. 
+# Warning: If an exception occurs in your EventSocket callbacks, they will be "eaten" and never bubbled up the call stack.
 # You should always wrap your callbacks in a begin/rescue clause and handle exceptions explicitly.
 #
 require "thread"
@@ -55,7 +55,7 @@ require "socket"
 class EventSocket
 
   class << self
-    
+
     ##
     # Creates and returns a connected EventSocket instance.
     #
@@ -67,23 +67,23 @@ class EventSocket
   end
 
   MAX_CHUNK_SIZE = 256 * 1024
-  
+
   def initialize(host, port, handler=nil, &block)
     raise ArgumentError, "Cannot supply both a handler object and a block" if handler && block_given?
     raise ArgumentError, "Must supply either a handler object or a block" if !handler && !block_given?
-    
+
     @state_lock = Mutex.new
     @host  = host
     @port  = port
-    
+
     @state = :new
     @handler = handler || new_handler_from_block(&block)
   end
-  
+
   def state
     @state_lock.synchronize { @state }
   end
-  
+
   def connect!
     @state_lock.synchronize do
       if @state.equal? :connected
@@ -100,7 +100,7 @@ class EventSocket
     @state = :failed
     raise error
   end
-  
+
   ##
   # Thread-safe implementation of write.
   #
@@ -121,7 +121,7 @@ class EventSocket
       @state = :stopped
     end
   end
-  
+
   ##
   # Joins the Thread which reads data off the socket.
   #
@@ -134,13 +134,13 @@ class EventSocket
       end
     end
   end
-  
+
   def receive_data(data)
     @handler.receive_data(data)
   end
-  
+
   protected
-  
+
   def connection_dropped!
     @state_lock.synchronize do
       unless @state.equal? :connection_dropped
@@ -149,11 +149,11 @@ class EventSocket
       end
     end
   end
-  
+
   def spawn_reader_thread
     Thread.new(&method(:reader_loop))
   end
-  
+
   def reader_loop
     until state.equal? :stopped
       data = @socket.readpartial(MAX_CHUNK_SIZE)
@@ -167,7 +167,7 @@ class EventSocket
     handler = Object.new
     handler.metaclass.send :attr_accessor, :set_callbacks
     handler.set_callbacks = {:receive_data => false, :disconnected => false, :connected => false }
-    
+
     def handler.receive_data(&block)
       self.metaclass.send(:remove_method, :receive_data)
       self.metaclass.send(:define_method, :receive_data) { |data| block.call data }
@@ -183,21 +183,21 @@ class EventSocket
       self.metaclass.send(:define_method, :disconnected) { block.call }
       set_callbacks[:disconnected] = true
     end
-    
+
     def handler.singleton_method_added(name)
       set_callbacks[name.to_sym] = true
     end
-    
+
     yield handler
-    
+
     handler.set_callbacks.each_pair do |callback_name,was_set|
       handler.send(callback_name) {} unless was_set
     end
-    
+
     handler
-    
+
   end
 
   class ConnectionError < Exception; end
-  
+
 end