adhearsion 0.8.3 → 0.8.4

data/lib/adhearsion/initializer/asterisk.rb

@@ -1,21 +1,27 @@
 require 'adhearsion/voip/asterisk'
 module Adhearsion
   class Initializer
-    
+
     class AsteriskInitializer
-      
+
       cattr_accessor :config, :agi_server, :ami_client
       class << self
-        
+
         def start
           self.config     = AHN_CONFIG.asterisk
           self.agi_server = initialize_agi
           self.ami_client = VoIP::Asterisk.manager_interface = initialize_ami if config.ami_enabled?
           join_server_thread_after_initialized
+
+          # Make sure we stop everything when we shutdown
+          Events.register_callback(:shutdown) do
+            ahn_log.info "Shutting down with #{Adhearsion.active_calls.size} active calls"
+            self.stop
+          end
         end
 
         def stop
-          agi_server.stop
+          agi_server.graceful_shutdown
           ami_client.disconnect! if ami_client
         end
 
@@ -25,7 +31,7 @@ module Adhearsion
           VoIP::Asterisk::AGI::Server.new :host => config.listening_host,
                                           :port => config.listening_port
         end
-        
+
         def initialize_ami
           options = ami_options
           start_ami_after_initialized
@@ -42,14 +48,14 @@ module Adhearsion
             end
           end
         end
-        
+
         def ami_options
           %w(host port username password events).inject({}) do |options, property|
             options[property.to_sym] = config.ami.send property
             options
           end
         end
-        
+
         def join_server_thread_after_initialized
           Events.register_callback(:after_initialized) do
             begin
@@ -61,7 +67,7 @@ module Adhearsion
           end
           IMPORTANT_THREADS << agi_server
         end
-        
+
         def start_ami_after_initialized
           Events.register_callback(:after_initialized) do
             begin
@@ -76,6 +82,6 @@ module Adhearsion
 
       end
     end
-    
+
   end
 end

data/lib/adhearsion/initializer/configuration.rb

@@ -21,7 +21,7 @@ module Adhearsion
       end
     end
     extend ConfigurationEntryPoint
-    
+
     class << self
       def configure(&block)
         if Adhearsion.const_defined?(:AHN_CONFIG)
@@ -31,22 +31,22 @@ module Adhearsion
         end
       end
     end
-    
+
     attr_accessor :automatically_answer_incoming_calls
     attr_accessor :end_call_on_hangup
     attr_accessor :end_call_on_error
-    
+
     def initialize
       @automatically_answer_incoming_calls = true
       @end_call_on_hangup                  = true
       @end_call_on_error                   = true
       yield self if block_given?
     end
-    
+
     def ahnrc
       @ahnrc
     end
-    
+
     ##
     # Load the contents of an .ahnrc file into this Configuration.
     #
@@ -62,11 +62,11 @@ module Adhearsion
           @ahnrc = YAML.load(new_ahnrc).freeze
       end
     end
-    
+
     def logging(options)
       Adhearsion::Logging.logging_level = options[:level]
     end
-    
+
     ##
     # Adhearsion's .ahnrc file is used to define paths to certain parts of the framework. For example, the name dialplan.rb
     # is actually specified in .ahnrc. This file can actually be just a filename, a filename with a glob (.e.g "*.rb"), an
@@ -89,64 +89,75 @@ module Adhearsion
       queried_nested_setting = Array queried_nested_setting
       queried_nested_setting.map { |filename| files_from_glob(filename) }.flatten.uniq
     end
-    
+
     private
-    
+
     def files_from_glob(glob)
       Dir.glob "#{AHN_ROOT}/#{glob}"
     end
-    
+
     class AbstractConfiguration
       extend ConfigurationEntryPoint
-      
+
       class << self
         private
           def abstract_method!
             raise "Must be implemented in subclasses"
           end
       end
-      
+
       def initialize(overrides = {})
         overrides.each_pair do |attribute, value|
           send("#{attribute}=", value)
         end
       end
     end
-    
+
     # Abstract superclass for AsteriskConfiguration and FreeSwitchConfiguration.
     class TelephonyPlatformConfiguration < AbstractConfiguration
       attr_accessor :listening_port
       attr_accessor :listening_host
-      
+
       class << self
         def default_listening_port
           abstract_method!
         end
-        
+
         def default_listening_host
           '0.0.0.0'
         end
       end
-        
+
       def initialize(overrides = {})
         @listening_port = self.class.default_listening_port
         @listening_host = self.class.default_listening_host
         super
       end
     end
-    
+
     class AsteriskConfiguration < TelephonyPlatformConfiguration
+      attr_accessor :speech_engine
+      attr_accessor :argument_delimiter
+
       class << self
-        attr_accessor :speech_engine
-        
         def default_listening_port
           4573
         end
+
+        def default_argument_delimiter
+          # Keep Asterisk 1.4 (and prior) as the default to protect upgraders
+          '|'
+        end
       end
-      
+
+      def initialize(overrides = {})
+        @argument_delimiter = self.class.default_argument_delimiter
+        super
+      end
+
       class AMIConfiguration < AbstractConfiguration
         attr_accessor :port, :username, :password, :events, :host
-        
+
         class << self
           def default_port
             5038
@@ -155,12 +166,12 @@ module Adhearsion
           def default_events
             false
           end
-          
+
           def default_host
             'localhost'
           end
         end
-        
+
         def initialize(overrides = {})
           self.host   = self.class.default_host
           self.port   = self.class.default_port
@@ -171,7 +182,7 @@ module Adhearsion
       add_configuration_for :AMI
     end
     add_configuration_for :Asterisk
-    
+
     class FreeswitchConfiguration < TelephonyPlatformConfiguration
       class << self
         def default_listening_port
@@ -180,7 +191,7 @@ module Adhearsion
       end
     end
     add_configuration_for :Freeswitch
-    
+
     class DatabaseConfiguration < AbstractConfiguration
       attr_accessor :connection_options, :orm
       def initialize(options)
@@ -189,7 +200,15 @@ module Adhearsion
       end
     end
     add_configuration_for :Database
-    
+
+    class LdapConfiguration < AbstractConfiguration
+      attr_accessor :connection_options
+      def initialize(options)
+        @connection_options = options
+      end
+    end
+    add_configuration_for :Ldap
+
     class DrbConfiguration < AbstractConfiguration
       attr_accessor :port
       attr_accessor :host
@@ -201,17 +220,17 @@ module Adhearsion
         def default_port
           9050
         end
-        
+
         def default_host
           'localhost'
         end
       end
-      
+
       def initialize(overrides = {})
         self.port = overrides[:port] || self.class.default_port
         self.host = overrides[:host] || self.class.default_host
         self.acl  = overrides[:raw_acl]
-        
+
         unless acl
           self.acl = []
           overrides[ :deny].to_a.each { |ip| acl << 'deny' << ip }
@@ -221,22 +240,18 @@ module Adhearsion
       end
     end
     add_configuration_for :Drb
-    
+
     class RailsConfiguration < AbstractConfiguration
-      
-      SUPPORTED_RAILS_ENVIRONMENTS = [:development, :test, :production]
-      
+
       attr_accessor :rails_root, :environment
       def initialize(options)
         path_to_rails, environment = check_options options
         @rails_root = File.expand_path(path_to_rails)
         @environment = environment.to_sym
-        raise ArgumentError, "Unrecognized environment type #@environment. Supported: " +
-          SUPPORTED_RAILS_ENVIRONMENTS.to_sentence unless SUPPORTED_RAILS_ENVIRONMENTS.include?(@environment)
       end
-    
+
       private
-      
+
       def check_options(options)
         options = options.clone
         path    = options.delete :path
@@ -246,9 +261,9 @@ module Adhearsion
         raise ArgumentError, "Must supply an :path argument to the Rails initializer!" unless path
         [path, env]
       end
-    
+
     end
     add_configuration_for :Rails
-    
+
   end
 end

data/lib/adhearsion/initializer/database.rb

@@ -2,9 +2,9 @@
 
 module Adhearsion
   class Initializer
-    
+
     class DatabaseInitializer
-      
+
       class << self
 
         def start
@@ -38,13 +38,13 @@ module Adhearsion
             load model
           end
         end
-        
+
         def establish_connection
           ActiveRecord::Base.establish_connection @@config.connection_options
         end
 
       end
     end
-    
+
   end
 end

data/lib/adhearsion/initializer/drb.rb

@@ -8,23 +8,23 @@ module Adhearsion
     class DrbInitializer
 
       class << self
-        
+
         def start
           config = Adhearsion::AHN_CONFIG.drb
           DRb.install_acl ACL.new(config.acl) if config.acl
-          
+
           drb_door = Object.new
           Components.component_manager.extend_object_with(drb_door, :rpc)
-          
+
           DRb.start_service "druby://#{config.host}:#{config.port}", drb_door
-          
+
           ahn_log "Starting DRb on #{config.host}:#{config.port}"
         end
-        
+
         def stop
           DRb.stop_service
         end
-        
+
       end
     end
   end

data/lib/adhearsion/initializer/freeswitch.rb

@@ -6,7 +6,7 @@ require "adhearsion/voip/freeswitch/inbound_connection_manager"
 require "adhearsion/voip/dsl/dialplan/control_passing_exception"
 
 oes_enabled = Adhearsion::Configuration.core.voip.freeswitch.oes && Adhearsion::Configuration.core.voip.freeswitch.oes.port
-                
+
 
 if oes_enabled
 

data/lib/adhearsion/initializer/ldap.rb

@@ -0,0 +1,51 @@
+# TODO: Have all of the initializer modules required and then traverse the subclasses, asking them if they're enabled. If they are enabled, then they should do their initialization stuff. Is this really necessary to develop this entirely new system when the components system exists?
+
+module Adhearsion
+  class Initializer
+
+    class LdapInitializer
+
+      class << self
+
+        def start
+          require_dependencies
+          require_models
+          @@config = Adhearsion::AHN_CONFIG.ldap
+          # You may need to uncomment the following line for older versions of ActiveRecord
+          # ActiveRecord::Base.allow_concurrency = true
+          establish_connection
+        end
+
+        def stop
+          ActiveLdap::Base.remove_connection
+        end
+
+        private
+
+        # TODO: It appears that ActiveLdap does not have a connection validation
+        # or reconnection routine.
+        #def create_call_hook_for_connection_cleanup
+        #  Events.register_callback([:asterisk, :before_call]) do
+        #    ActiveLdap::Base.verify_active_connections!
+        #  end
+        #end
+
+        def require_dependencies
+          require 'active_ldap'
+        end
+
+        def require_models
+          AHN_CONFIG.files_from_setting("paths", "models").each do |model|
+            load model
+          end
+        end
+
+        def establish_connection
+          ActiveLdap::Base.setup_connection @@config.connection_options
+        end
+
+      end
+    end
+
+  end
+end

data/lib/adhearsion/initializer/rails.rb

@@ -1,16 +1,16 @@
 require 'adhearsion/voip/asterisk'
 
 module Adhearsion
-  class Initializer    
+  class Initializer
     class RailsInitializer
-      
+
       cattr_accessor :rails_root, :config, :environment
       class << self
-        
+
         def start
           ahn_config       = Adhearsion::AHN_CONFIG
           self.config      = ahn_config.rails
-          self.rails_root  = config.rails_root 
+          self.rails_root  = config.rails_root
           self.environment = config.environment
           raise "You cannot enable the database and Rails at the same time!" if ahn_config.database_enabled?
           raise "Error loading Rails environment in #{rails_root.inspect}. "  +
@@ -24,18 +24,18 @@ module Adhearsion
             end
           end
         end
-        
+
         private
-        
+
         def load_rails
           environment_file = File.expand_path(rails_root + "/config/environment.rb")
           raise "There is no config/environment.rb file!" unless File.exists?(environment_file)
           ENV['RAILS_ENV'] = environment.to_s
           require environment_file
         end
-        
+
       end
-      
+
     end
   end
 end