adhearsion 0.8.3 → 0.8.4

data/app_generators/ahn/templates/components/disabled/sandbox/sandbox.rb

@@ -6,7 +6,7 @@ SANDBOX_VERSION = 1.0
 initialization do
   # We shouldn't start initializing until after the AGI server has initialized.
   Events.register_callback(:after_initialized) do
-    
+
     config = if COMPONENTS.sandbox.has_key? "connect_to"
       {"connect_to" => COMPONENTS.sandbox["connect_to"]}
     else
@@ -21,24 +21,24 @@ initialization do
         next
       end
     end
-    
+
     begin
       # The "connect_to" key is what this version supports
       if config.kind_of?(Hash) && config.has_key?("connect_to")
         config = config['connect_to']
-      
+
         host, port = config.values_at "host", "port"
-      
+
         username, password = COMPONENTS.sandbox["username"].to_s, COMPONENTS.sandbox["password"].to_s
-        
+
         if username.blank? || password.blank? || username == "user123"
           ahn_log.sandbox.error "You must specify your username and password in this component's config file!"
           next
         end
-        
+
         # Part of the AGI-superset protocol we use to log in.
         identifying_hash = MD5.md5(username + ":" + password).to_s
-        
+
         if host.nil? || port.nil?
           ahn_log.sandbox.error "Invalid YAML returned from server! Skipping sandbox initialization!"
           next
@@ -55,14 +55,14 @@ initialization do
                 next
               end
               response.chomp!
-              case 
-                when "authentication accepted" 
+              case
+                when "authentication accepted"
                   ahn_log.sandbox "Authentication accepted"
-                  
+
                   start_signal = socket.gets
                   next unless start_signal
                   start_signal.chomp!
-                  
+
                   if start_signal
                     ahn_log.sandbox "Incoming call from remote sandbox server!"
                     begin

data/app_generators/ahn/templates/components/disabled/stomp_gateway/README.markdown

@@ -37,7 +37,7 @@ Install the pure-Ruby Stomp server by doing "gem install stompserver". This will
 
 Open the `stomp_gateway.yml` file in the stomp_gateway component folder. Comment out the four settings at the top of the file named "user", "pass", "host" and "port" by prepending a "#" to their line. This will cause the component to choose defaults for those properties. The component's defaults will match the expected credentials for the experimental stompserver you're already running on your computer.
 
-You also need specify a subscription name in 
+You also need specify a subscription name in
 
     events.stomp.start_call.each do |event|
       # The "event" variable holds a Stomp::Message object.

data/app_generators/ahn/templates/components/disabled/stomp_gateway/stomp_gateway.rb

@@ -7,22 +7,22 @@ initialization do
   pass = COMPONENTS.stomp_gateway[:pass] || ""
   host = COMPONENTS.stomp_gateway[:host] || "localhost"
   port = COMPONENTS.stomp_gateway[:port] || 61613
-  
+
   ::StompGatewayConnection = Stomp::Client.open(user, pass, host, port)
-  
+
   subscriptions = COMPONENTS.stomp_gateway["subscriptions"]
-  
+
   ahn_log.stomp_gateway "Connection established. Subscriptions: #{subscriptions.inspect}"
-  
+
   Events.register_namespace_name "/stomp"
-  
+
   subscriptions.each do |subscription|
     Events.register_namespace_name "/stomp/#{subscription}"
     ::StompGatewayConnection.subscribe subscription do |event|
       Adhearsion::Events.trigger ["stomp", subscription], event
     end
   end
-  
+
 end
 
 methods_for :global do

data/app_generators/ahn/templates/components/simon_game/simon_game.rb

@@ -10,7 +10,7 @@ class SimonGame
     @call = call
     reset
   end
-  
+
   def start
     loop do
       say_number
@@ -37,7 +37,7 @@ class SimonGame
   end
 
   def verify_attempt
-    if attempt_correct? 
+    if attempt_correct?
       @call.play 'good'
     else
       @call.play %W[#{@number.length-1} times wrong-try-again-smarty]
@@ -48,9 +48,9 @@ class SimonGame
   def attempt_correct?
     @attempt == @number
   end
-  
+
   def reset
     @attempt, @number = '', ''
   end
-  
+
 end

data/app_generators/ahn/templates/config/startup.rb

@@ -3,7 +3,7 @@ unless defined? Adhearsion
     # If you wish to freeze a copy of Adhearsion to this app, simply place a copy of Adhearsion
     # into a folder named "adhearsion" within this app's main directory.
     require File.dirname(__FILE__) + "/../adhearsion/lib/adhearsion.rb"
-  else  
+  else
     require 'rubygems'
     gem 'adhearsion', '>= 0.8.2'
     require 'adhearsion'
@@ -11,40 +11,55 @@ unless defined? Adhearsion
 end
 
 Adhearsion::Configuration.configure do |config|
-  
+
   # Supported levels (in increasing severity) -- :debug < :info < :warn < :error < :fatal
   config.logging :level => :info
-  
+
   # Whether incoming calls be automatically answered. Defaults to true.
   # config.automatically_answer_incoming_calls = false
-  
+
   # Whether the other end hanging up should end the call immediately. Defaults to true.
   # config.end_call_on_hangup = false
-  
+
   # Whether to end the call immediately if an unrescued exception is caught. Defaults to true.
   # config.end_call_on_error = false
-  
-  # By default Asterisk is enabled with the default settings
-  config.enable_asterisk
+
+  # NOTE: Pay special attention to the argument_delimiter field below:
+  # For Asterisk <= 1.4, use "|" (default)
+  # For Asterisk >= 1.6, use ","
+  # This setting applies to AMI and AGI
+  config.enable_asterisk :argument_delimiter => '|'
   # config.asterisk.enable_ami :host => "127.0.0.1", :username => "admin", :password => "password", :events => true
-  
+
   # config.enable_drb
-  
-  # Streamlined Rails integration! The first argument should be a relative or absolute path to 
-  # the Rails app folder with which you're integrating. The second argument must be one of the 
+
+  # Streamlined Rails integration! The first argument should be a relative or absolute path to
+  # the Rails app folder with which you're integrating. The second argument must be one of the
   # the following: :development, :production, or :test.
-  
+
   # config.enable_rails :path => 'gui', :env => :development
-  
+
   # Note: You CANNOT do enable_rails and enable_database at the same time. When you enable Rails,
   # it will automatically connect to same database Rails does and load the Rails app's models.
-  
+
   # Configure a database to use ActiveRecord-backed models. See ActiveRecord::Base.establish_connection
   # for the appropriate settings here.
   # config.enable_database :adapter  => 'mysql',
-  #                        :username => 'joe', 
+  #                        :username => 'joe',
   #                        :password => 'secret',
   #                        :host     => 'db.example.org'
+
+  # Configure an LDAP connection using ActiveLdap.  See ActiveLdap::Base.establish_connect
+  # for the appropriate settings here.
+  # config.enable_ldap :host => 'ldap.dataspill.org',
+  #                    :port => 389,
+  #                    :base => 'dc=dataspill,dc=org',
+  #                    :logger => ahn_log.ldap,
+  #                    :bind_dn => "uid=drewry,ou=People,dc=dataspill,dc=org",
+  #                    :password => 'password12345',
+  #                    :allow_anonymous => false,
+  #                    :try_sasl => false
+
 end
 
 Adhearsion::Initializer.start_from_init_file(__FILE__, File.dirname(__FILE__) + "/..")

data/bin/ahn

@@ -4,17 +4,17 @@
 
 # Adhearsion, open source collaboration framework
 # Copyright (C) 2006,2007,2008 Jay Phillips
-# 
+#
 # This library is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Lesser General Public License as published by the Free
 # Software Foundation; either version 2.1 of the License, or (at your option)
 # any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
 # details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public License along
 # with this library; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

data/bin/ahnctl

@@ -1,25 +1,25 @@
 #!/usr/bin/env ruby
-# 
+#
 #  ahnctl - Adhearsion daemon controller
 #
 # Adhearsion, open source collaboration framework
 # Copyright (C) 2006,2007,2008 Jay Phillips
-# 
+#
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-USAGE = "Usage: ahnctl start|stop|restart /path/to/adhearsion/app [--pid-file=/path/to/pid_file.pid]" 
+USAGE = "Usage: ahnctl start|stop|restart /path/to/adhearsion/app [--pid-file=/path/to/pid_file.pid]"
 
 # Blow up if the CLI arguments are invalid
 abort USAGE unless (2..3).include?(ARGV.size) && %w[start stop restart].include?(ARGV.first)
@@ -51,14 +51,14 @@ puts "Stopping Adhearsion app at #{app_dir}" if %w[stop restart].include? ARGV.f
 if File.exists?(pid_file)
   # An Adhearsion process may still be running. Let's kill the other one as cleanly as possible
   pid = File.read(pid_file).to_i
-  
+
   # Time to spend waiting for Adhearsion to exit
   waiting_timeout = Time.now + 15
-  
+
   terminate pid
   sleep 0.25 until `ps -p #{pid} | sed -e '1d'`.strip.empty? || Time.now > waiting_timeout
   kill pid
-  
+
   `rm -f #{pid_file}`
 end
 

data/bin/jahn

@@ -4,17 +4,17 @@
 
 # Adhearsion, open source collaboration framework
 # Copyright (C) 2006,2007,2008 Jay Phillips
-# 
+#
 # This library is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Lesser General Public License as published by the Free
 # Software Foundation; either version 2.1 of the License, or (at your option)
 # any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
 # details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public License along
 # with this library; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

data/examples/asterisk_manager_interface/standalone.rb

@@ -40,10 +40,10 @@ if sip_peers.any?
   sip_peers.each do |peer|
     # Uncomment the following line to view all the headers for each peer.
     # p peer.headers
-    
+
     peer_name   = peer.headers["ObjectName"]
     peer_status = peer.headers["Status"]
-    
+
     puts "#{peer_name}: #{peer_status}"
   end
 else

data/lib/adhearsion.rb

@@ -24,14 +24,16 @@ require 'adhearsion/voip/asterisk/commands'
 require 'adhearsion/voip/dsl/dialing_dsl'
 require 'adhearsion/voip/call_routing'
 
+require 'active_support/core_ext'
+
 module Adhearsion
   # Sets up the Gem require path.
   AHN_INSTALL_DIR = File.expand_path(File.dirname(__FILE__) + "/..")
   AHN_CONFIG = Configuration.new
-  
+
   ##
   # This Array holds all the Threads whose life matters. Adhearsion will not exit until all of these have died.
   #
   IMPORTANT_THREADS = []
-  
+
 end

data/lib/adhearsion/cli.rb

@@ -9,25 +9,25 @@ Usage:
    ahn start [daemon] [/path/to/directory]
    ahn version|-v|--v|-version|--version
    ahn help|-h|--h|--help|-help
-   
+
    ahn  enable component COMPONENT_NAME
    ahn disable component COMPONENT_NAME
    ahn  create component COMPONENT_NAME
 USAGE
-    
+
       def self.execute!
         CommandHandler.send(*parse_arguments)
       rescue CommandHandler::CLIException => error
         fail_and_print_usage error
       end
-      
+
       ##
       # Provides a small abstraction of Kernel::abort().
       #
       def self.fail_and_print_usage(error)
         Kernel.abort "#{error.message}\n\n#{USAGE}"
       end
-      
+
       def self.parse_arguments(args=ARGV.clone)
         action = args.shift
         case action
@@ -45,7 +45,7 @@ USAGE
             else
               pid_file = nil
             end
-            
+
             if args.first == 'daemon' && args.size == 2
               path   = args.last
               daemon = true
@@ -69,10 +69,10 @@ USAGE
             [action, *args]
         end
       end
-      
+
       module CommandHandler
         class << self
-          
+
           def create(*args)
             if args.size.zero?
               raise CommandHandler::UnknownCommand.new("Must specify something to create!")
@@ -81,7 +81,7 @@ USAGE
               path = args.first
               require 'rubigen'
               require 'rubigen/scripts/generate'
-              source = RubiGen::PathSource.new(:application, 
+              source = RubiGen::PathSource.new(:application,
                 File.join(File.dirname(__FILE__), "../../app_generators"))
               RubiGen::Base.reset_sources
               RubiGen::Base.append_sources source
@@ -89,24 +89,24 @@ USAGE
             elsif args.size == 2
               # We're creating a feature (e.g. a component)
               feature_type, component_name = args
-              
+
               if feature_type != "component"
                 # At the moment, only components can be created.
-                raise CommandHandler::UnknownCommand.new("Don't know how to create '#{feature_type}'") 
+                raise CommandHandler::UnknownCommand.new("Don't know how to create '#{feature_type}'")
               end
-              
+
               if component_name !~ /^[a-z][\w_]+$/
                 raise CommandHandler::ComponentError.new("Component name must be lowercase alphanumeric characters " +
                     "and begin with a character")
               end
-              
+
               app_path = PathString.from_application_subdirectory Dir.pwd
-              
+
               raise PathInvalid.new(Dir.pwd) if app_path.nil?
-              
+
               new_component_dir = app_path + "/components/#{component_name}"
               raise ComponentError.new("Component #{component_name} already exists!") if File.exists?(new_component_dir)
-              
+
               # Everything's good. Let's create the component
               Dir.mkdir new_component_dir
               File.open(new_component_dir + "/#{component_name}.rb","w") do |file|
@@ -123,20 +123,20 @@ USAGE
               raise CommandHandler::UnknownCommand.new("Provided too many arguments to 'create'")
             end
           end
-        
+
           def start(path, daemon=false, pid_file=nil)
             raise PathInvalid, path unless File.exists? path + "/.ahnrc"
             Adhearsion::Initializer.start path, :daemon => daemon, :pid_file => pid_file
           end
-        
+
           def version
             puts "Adhearsion v#{Adhearsion::VERSION::STRING}"
           end
-        
+
           def help
             puts USAGE
           end
-        
+
           def enable(type, name)
             case type
               when "component"
@@ -157,19 +157,19 @@ USAGE
                 raise UnknownCommand.new("enable #{type}")
             end
           end
-          
+
           def disable(type, name)
             case type
               when "component"
                 app_path = PathString.from_application_subdirectory Dir.pwd
                 if app_path
                   disabled_dir = File.join app_path, "components", "disabled"
-                  
+
                   disabled_component_path = File.join disabled_dir, name
                   enabled_component_path  = File.join app_path, "components", name
-                  
+
                   Dir.mkdir disabled_dir unless File.directory?(disabled_dir)
-                  
+
                   if File.directory? enabled_component_path
                     if File.directory?(disabled_component_path)
                       raise ComponentError.new("There is already a disabled component at #{disabled_component_path}")
@@ -187,31 +187,31 @@ USAGE
                 raise UnknownCommand.new("disable #{type}")
             end
           end
-          
+
           def method_missing(action, *args)
             raise UnknownCommand, [action, *args] * " "
           end
-          
+
           private
-          
+
         end
-        
+
         class CLIException < Exception; end
-        
+
         class UnknownCommand < CLIException
           def initialize(cmd)
             super "Unknown command: #{cmd}"
           end
         end
-        
+
         class ComponentError < CLIException; end
-        
+
         class UnknownProject < CLIException
           def initialize(project)
             super "Application #{project} does not exist! Have you installed it?"
           end
         end
-        
+
         class PathInvalid < CLIException
           def initialize(path)
             super "Directory #{path} does not belong to an Adhearsion project!"