adhearsion 0.8.3 → 0.8.4

data/lib/adhearsion/voip/asterisk/config_generators/agents.conf.rb

@@ -12,7 +12,7 @@ module Adhearsion
             @agent_section         = {}
             @agent_section_special = {} # Uses => separator
             @agent_definitions     = []
-            
+
             super
           end
 
@@ -26,7 +26,7 @@ module Adhearsion
             end
           end
           alias conf to_s # Allows "agents.conf" if agents.kind_of?(Agents)
-          
+
           def agent(id, properties)
             agent_definitions << {:id => id}.merge(properties)
           end
@@ -36,7 +36,7 @@ module Adhearsion
           def groups(*args)
             agent_section[:group] = args.join(",")
           end
-          
+
           # Define whether callbacklogins should be stored in astdb for
           # persistence. Persistent logins will be reloaded after
           # Asterisk restarts.
@@ -49,7 +49,7 @@ module Adhearsion
           def allow_multiple_logins_per_extension(yes_or_no)
             general_section[:multiplelogin] = boolean_to_yes_no yes_or_no
           end
-          
+
           # Define maxlogintries to allow agent to try max logins before
           # failed. Default to 3
           def max_login_tries(number_of_tries)
@@ -97,7 +97,7 @@ module Adhearsion
           end
 
           # TODO: I'm not exactly sure what this even does....
-          
+
           # Define the default good bye sound file for agents
           # default to vm-goodbye
           def play_on_agent_goodbye(sound_file_name)
@@ -119,16 +119,16 @@ module Adhearsion
           def record_agent_calls(yes_or_no)
             agent_section[:recordagentcalls] = boolean_to_yes_no yes_or_no
           end
-          
+
           def recording_format(symbol)
             raise ArgumentError, "Unrecognized format #{symbol}" unless [:wav, :wav49, :gsm].include? symbol
             agent_section[:recordformat] = symbol
           end
-          
+
           def recording_prefix(string)
             agent_section[:urlprefix] = string
           end
-          
+
           def save_recordings_in(path_to_directory)
             agent_section[:savecallsin] = path_to_directory
           end

data/lib/adhearsion/voip/asterisk/config_generators/config_generator.rb

@@ -2,12 +2,12 @@ module Adhearsion
   module VoIP
     module Asterisk
       module ConfigFileGenerators
-        class AsteriskConfigGenerator 
-          
+        class AsteriskConfigGenerator
+
           SECTION_TITLE = /(\[[\w_-]+\])/
-          
+
           class << self
-            
+
             # Converts a config file into a Hash of contexts mapping to two dimensional array of pairs
             def create_sanitary_hash_from(config_file_content)
               almost_sanitized = Hash[*config_file_content.
@@ -20,24 +20,24 @@ module Adhearsion
                 map { |token| token =~ /^#{SECTION_TITLE}$/ ? token : token.split(/\n+/).sort }
               ]
             end
-            
+
             def warning_message
               %{;; THIS FILE WAS GENERATED BY ADHEARSION ON #{Time.now.ctime}!\n} +
               %{;; ANY CHANGES MADE BELOW WILL BE BLOWN AWAY WHEN THE FILE IS REGENERATED!\n\n}
             end
-            
+
           end
-          
+
           def initialize
             yield self if block_given?
           end
-          
+
           def to_sanitary_hash
             self.class.create_sanitary_hash_from to_s
           end
-          
+
           protected
-          
+
           def boolean(options)
             cache = options.delete(:with) || properties
             options.each_pair do |key, value|
@@ -72,7 +72,7 @@ module Adhearsion
               cache[key] = [true, false].include?(value) ? boolean_to_yes_no(value) : value
             end
           end
-          
+
           def one_of_and_translate(criteria, options)
             cache = options.delete(:with) || properties
             options.each_pair do |key, value|
@@ -84,12 +84,12 @@ module Adhearsion
               cache[key] = criteria[value]
             end
           end
-          
+
           private
-          
+
           def boolean_to_yes_no(boolean)
             unless boolean.equal?(boolean) || boolean.equal?(boolean)
-              raise "#{boolean.inspect} is not true/false!" 
+              raise "#{boolean.inspect} is not true/false!"
             end
             boolean ? 'yes' : 'no'
           end

data/lib/adhearsion/voip/asterisk/config_generators/queues.conf.rb

@@ -4,7 +4,7 @@ module Adhearsion
   module VoIP
     module Asterisk
       module ConfigFileGenerators
-        
+
         # This will generate a queues.conf file. If there is no documentation on what a method
         # actually does, take a look at the documentation for its original key/value pair in
         # an unedited queues.conf file. WARNING! Don't get too embedded with these method names.
@@ -22,7 +22,7 @@ module Adhearsion
             @queue_definitions = []
             super
           end
-          
+
           def queue(name)
             new_queue = QueueDefinition.new name
             yield new_queue if block_given?
@@ -36,17 +36,17 @@ module Adhearsion
             queue_definitions.map(&:to_s).join("\n\n")
           end
           alias conf to_s
-          
+
           def persistent_members(yes_no)
             boolean :persistentmembers => yes_no, :with => general_section
           end
-          
+
           def monitor_type(symbol)
             criteria = {:monitor => "Monitor", :mix_monitor => "MixMonitor"}
             one_of_and_translate criteria, 'monitor-type' => symbol, :with => general_section
           end
-          
-          
+
+
           class QueueDefinition < AsteriskConfigGenerator
 
             DEFAULT_QUEUE_PROPERTIES = {
@@ -57,7 +57,7 @@ module Adhearsion
             }
 
             SUPPORTED_RING_STRATEGIES = [:ringall, :roundrobin, :leastrecent, :fewestcalls, :random, :rrmemory]
-            
+
             DEFAULT_SOUND_FILES = {
               'queue-youarenext'   => 'queue-youarenext',
               'queue-thereare'     => 'queue-thereare',
@@ -91,7 +91,7 @@ module Adhearsion
               @properties  = DEFAULT_QUEUE_PROPERTIES.clone
               @sound_files = DEFAULT_SOUND_FILES.clone
             end
-            
+
             def to_s
               "[#{name}]\n" +
               properties.merge(@sound_files).map { |key, value| "#{key}=#{value}" }.sort.join("\n") + "\n\n" +
@@ -144,7 +144,7 @@ module Adhearsion
               int :wrapuptime => seconds
             end
 
-            
+
             def autopause(yes_no)
               boolean :autopause => yes_no
             end
@@ -159,7 +159,7 @@ module Adhearsion
 
             def periodically_announce(sound_file, options={})
               frequency = options.delete(:every) || 1.minute
-              
+
               string 'periodic-announce' => sound_file
               int 'periodic-announce-frequency' => frequency
             end
@@ -175,7 +175,7 @@ module Adhearsion
             def monitor_format(symbol)
               one_of [:wav, :gsm, :wav49], 'monitor-format' => symbol
             end
-            
+
             def monitor_type(symbol)
               criteria = {:monitor => "Monitor", :mix_monitor => "MixMonitor"}
               one_of_and_translate criteria, 'monitor-type' => symbol
@@ -186,7 +186,7 @@ module Adhearsion
             def join_empty(yes_no_or_strict)
               one_of [true, false, :strict], :joinempty => yes_no_or_strict
             end
-            
+
             def leave_when_empty(yes_no)
               boolean :leavewhenempty => yes_no
             end
@@ -194,7 +194,7 @@ module Adhearsion
             def report_hold_time(yes_no)
               boolean :reportholdtime => yes_no
             end
-            
+
             def ring_in_use(yes_no)
               boolean :ringinuse => yes_no
             end
@@ -204,11 +204,11 @@ module Adhearsion
             def delay_connection_by(seconds)
               int :memberdelay => seconds
             end
-            
+
             def timeout_restart(yes_no)
               boolean :timeoutrestart => yes_no
             end
-            
+
             # Give a Hash argument here to override the default sound files for this queue.
             #
             # Usage:
@@ -236,7 +236,7 @@ module Adhearsion
                 @sound_files[SOUND_FILE_SYMBOL_INTERPRETATIONS[key]] = value
               end
             end
-            
+
             def member(driver)
               members << (driver.kind_of?(String) && driver =~ %r'/' ? driver : "Agent/#{driver}")
             end

data/lib/adhearsion/voip/asterisk/config_generators/voicemail.conf.rb

@@ -5,11 +5,11 @@ module Adhearsion
     module Asterisk
       module ConfigFileGenerators
         class Voicemail < AsteriskConfigGenerator
-          
+
           DEFAULT_GENERAL_SECTION = {
             :format => :wav
           }
-          
+
           # Don't worry. These will be overridable soon.
           STATIC_ZONEMESSAGES_CONTEXT = %{
             [zonemessages]
@@ -19,7 +19,7 @@ module Adhearsion
             military=Zulu|'vm-received' q 'digits/at' H N 'hours' 'phonetic/z_p'
             european=Europe/Copenhagen|'vm-received' a d b 'digits/at' HM
           }.unindent
-          
+
           attr_reader :properties, :context_definitions
           def initialize
             @properties = DEFAULT_GENERAL_SECTION.clone
@@ -27,31 +27,31 @@ module Adhearsion
             @context_definitions = []
             super
           end
-          
+
           def context(name)
             raise ArgumentError, "Name cannot be 'general'!" if name.to_s.downcase == 'general'
-            raise ArgumentError, "A name can only be characters, numbers, and underscores!" if name.to_s !~ /^[\w_]+$/            
-            
+            raise ArgumentError, "A name can only be characters, numbers, and underscores!" if name.to_s !~ /^[\w_]+$/
+
             returning ContextDefinition.new(name) do |context_definition|
               yield context_definition
               context_definitions << context_definition
             end
           end
-          
+
           def greeting_maximum(seconds)
             int "maxgreet" => seconds
           end
-          
+
           def execute_on_pin_change(command)
-            string "externpass" => command 
+            string "externpass" => command
           end
-          
+
           def recordings
             @recordings ||= RecordingDefinition.new
             yield @recordings if block_given?
             @recordings
           end
-          
+
           def emails
             @emails ||= EmailDefinition.new
             if block_given?
@@ -60,7 +60,7 @@ module Adhearsion
               @emails
             end
           end
-          
+
           def to_s
             email_properties = @emails ? @emails.properties : {}
             AsteriskConfigGenerator.warning_message +
@@ -69,39 +69,39 @@ module Adhearsion
             STATIC_ZONEMESSAGES_CONTEXT +
             context_definitions.map(&:to_s).join("\n\n")
           end
-          
+
           private
-          
+
           class ContextDefinition < AsteriskConfigGenerator
-            
+
             attr_reader :mailboxes
             def initialize(name)
               @name      = name
               @mailboxes = []
               super()
             end
-            
+
             # TODO: This will hold a lot of the methods from the [general] section!
-            
+
             def to_s
               (%W[[#@name]] + mailboxes.map(&:to_s)).join "\n"
             end
-            
+
             def mailbox(mailbox_number)
               box = MailboxDefinition.new(mailbox_number)
               yield box
               mailboxes << box
             end
-            
+
             private
-            
+
             def mailbox_entry(options)
               returning MailboxDefinition.new do |mailbox|
                 yield mailbox if block_given?
                 mailboxes << definition
               end
             end
-            
+
             class MailboxDefinition
 
               attr_reader :mailbox_number
@@ -128,20 +128,20 @@ module Adhearsion
               def to_hash
                 @definition
               end
-              
+
               def to_s
                 %(#{mailbox_number} => #{@definition[:pin_number]},#{@definition[:name]},#{@definition[:email]})[/^(.+?),*$/,1]
               end
 
               private
-              
+
               def check_numeric(number)
                 raise ArgumentError, number.inspect + " is not numeric!" unless number.to_s =~ /^\d+$/
               end
 
             end
           end
-          
+
           class EmailDefinition < AsteriskConfigGenerator
             EMAIL_VARIABLE_CONVENIENCES = {
               :name             => '${VM_NAME}',
@@ -153,13 +153,13 @@ module Adhearsion
               :caller_id_number => '${VM_CIDNUM}',
               :caller_id_name   => '${VM_CIDNAME}'
             }
-            
+
             attr_reader :properties
             def initialize
               @properties = {}
               super
             end
-            
+
             def [](email_variable)
               if EMAIL_VARIABLE_CONVENIENCES.has_key? email_variable
                 EMAIL_VARIABLE_CONVENIENCES[email_variable]
@@ -167,25 +167,25 @@ module Adhearsion
                 raise ArgumentError, "Unrecognized variable #{email_variable.inspect}"
               end
             end
-            
+
             def disable!
               raise NotImpementedError
             end
-            
+
             def from(options)
               name, email = options.values_at :name, :email
               string :serveremail => email
               string :fromstring  => name
             end
-            
+
             def attach_recordings(true_or_false)
               boolean :attach => true_or_false
             end
-            
+
             def attach_recordings?
               properties[:attach] == 'yes'
             end
-            
+
             def body(str)
               str = str.gsub("\r", '').gsub("\n", '\n')
               if str.length > 512
@@ -194,29 +194,29 @@ module Adhearsion
               end
               string :emailbody => str
             end
-            
+
             def subject(str)
               string :emailsubject => str
             end
-            
+
             def command(cmd)
               string :mailcmd => cmd
             end
-            
+
           end
-          
+
           class RecordingDefinition < AsteriskConfigGenerator
-            
+
             attr_reader :properties
             def initialize
               @properties = {}
               super
             end
-            
+
             def format(symbol)
               one_of [:gsm, :wav49, :wav], :format => symbol
             end
-            
+
             def allowed_length(seconds)
               case seconds
                 when Fixnum
@@ -228,7 +228,7 @@ module Adhearsion
                   raise ArgumentError, "Argument must be a Fixnum or Range!"
               end
             end
-            
+
             def maximum_silence(seconds)
               int :maxsilence => seconds
             end