adhearsion 2.6.4 → 3.0.0.beta1

data/lib/adhearsion/logging.rb

@@ -48,39 +48,32 @@ module Adhearsion
 
       # Restore the default configured logging level
       def unsilence!
-        self.logging_level = Adhearsion.config.platform.logging['level']
+        self.logging_level = Adhearsion.config.core.logging['level']
       end
 
       # Toggle between the configured log level and :trace
       # Useful for debugging a live Adhearsion instance
       def toggle_trace!
-        if level == ::Logging.level_num(Adhearsion.config.platform.logging['level'])
+        if level == ::Logging.level_num(Adhearsion.config.core.logging['level'])
           logger.warn "Turning TRACE logging ON."
           self.level = :trace
         else
           logger.warn "Turning TRACE logging OFF."
-          self.level = Adhearsion.config.platform.logging['level']
+          self.level = Adhearsion.config.core.logging['level']
         end
       end
 
-      # Close logfiles and reopen them.  Useful for log rotation.
-      def reopen_logs
-        logger.info "Closing logfiles."
-        ::Logging.reopen
-        logger.info "Logfiles reopened."
-      end
-
       def init
         ::Logging.init LOG_LEVELS
 
         LOG_LEVELS.each do |level|
           Adhearsion::Logging.const_defined?(level) or Adhearsion::Logging.const_set(level, ::Logging::LEVELS[::Logging.levelify(level)])
         end
-      end
 
-      def start(_appenders = nil, level = :info, formatter = nil)
-        ::Logging.logger.root.appenders = _appenders.nil? ? default_appenders : _appenders
+        ::Logging.logger.root.appenders = default_appenders
+      end
 
+      def start(level = :info, formatter = nil)
         ::Logging.logger.root.level = level
 
         self.formatter = formatter if formatter
@@ -119,18 +112,6 @@ module Adhearsion
         name.to_s.gsub(/\W/, '').downcase
       end
 
-      def outputters=(outputters)
-        ::Logging.logger.root.appenders = outputters
-      end
-
-      alias :appenders= :outputters=
-
-      def outputters
-        ::Logging.logger.root.appenders
-      end
-
-      alias :appenders :outputters
-
       def formatter=(formatter)
         ::Logging.logger.root.appenders.each do |appender|
           appender.layout = formatter

data/lib/adhearsion/outbound_call.rb

@@ -49,7 +49,7 @@ module Adhearsion
     end
 
     def client
-      PunchblockPlugin::Initializer.client
+      Adhearsion::Rayo::Initializer.client
     end
 
     def accept(*args)
@@ -84,9 +84,9 @@ module Adhearsion
       uri = client.new_call_uri
       options[:uri] = uri
 
-      @dial_command = Punchblock::Command::Dial.new(options)
+      @dial_command = Adhearsion::Rayo::Command::Dial.new(options)
 
-      ref = Punchblock::Ref.new uri: uri
+      ref = Adhearsion::Rayo::Ref.new uri: uri
       @transport = ref.scheme
       @id = ref.call_id
       @domain = ref.domain
@@ -119,13 +119,13 @@ module Adhearsion
     end
 
     def run_router_on_answer
-      register_event_handler Punchblock::Event::Answered do |event|
+      register_event_handler Adhearsion::Event::Answered do |event|
         run_router
       end
     end
 
     def on_answer(&block)
-      register_event_handler Punchblock::Event::Answered, &block
+      register_event_handler Adhearsion::Event::Answered, &block
     end
 
     def execute_controller_or_router_on_answer(controller, metadata = {}, &controller_block)

data/lib/adhearsion/plugin.rb

@@ -2,6 +2,7 @@
 
 require 'loquacious'
 require 'active_support/inflector'
+require 'adhearsion/foundation/object'
 require 'adhearsion/configuration'
 %w(
   collection

data/lib/adhearsion/protocol_error.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+require 'adhearsion/error'
+
+module Adhearsion
+  ##
+  # This exception may be raised if a transport error is detected.
+  class ProtocolError < Error
+    attr_accessor :name, :text, :call_id, :component_id
+
+    def setup(name = nil, text = nil, call_id = nil, component_id = nil)
+      @name, @text, @call_id, @component_id = name, text, call_id, component_id
+      self
+    end
+
+    def to_s
+      "#<#{self.class}: name=#{name.inspect} text=#{text.inspect} call_id=#{call_id.inspect} component_id=#{component_id.inspect}>"
+    end
+    alias :inspect :to_s
+
+    def eql?(other)
+      other.is_a?(self.class) && [:name, :text, :call_id, :component_id].all? { |f| self.__send__(f) == other.__send__(f) }
+    end
+    alias :== :eql?
+  end
+end

data/lib/adhearsion/rayo.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+module Adhearsion
+  module Rayo
+    BASE_RAYO_NAMESPACE     = 'urn:xmpp:rayo'
+    BASE_ASTERISK_NAMESPACE = 'urn:xmpp:rayo:asterisk'
+    RAYO_VERSION            = '1'
+    RAYO_NAMESPACES         = {:core => [BASE_RAYO_NAMESPACE, RAYO_VERSION].compact.join(':')}
+
+    [:ext, :record, :output, :input, :prompt, :cpa, :fax].each do |ns|
+      RAYO_NAMESPACES[ns] = [BASE_RAYO_NAMESPACE, ns.to_s, RAYO_VERSION].compact.join(':')
+      RAYO_NAMESPACES[:"#{ns}_complete"] = [BASE_RAYO_NAMESPACE, ns.to_s, 'complete', RAYO_VERSION].compact.join(':')
+    end
+
+    [:agi, :ami].each do |ns|
+      RAYO_NAMESPACES[ns] = [BASE_ASTERISK_NAMESPACE, ns.to_s, RAYO_VERSION].compact.join(':')
+      RAYO_NAMESPACES[:"#{ns}_complete"] = [BASE_ASTERISK_NAMESPACE, ns.to_s, 'complete', RAYO_VERSION].compact.join(':')
+    end
+  end
+end
+
+require 'adhearsion/rayo/client'
+require 'adhearsion/rayo/connection'
+require 'adhearsion/rayo/command'
+require 'adhearsion/rayo/command_node'
+require 'adhearsion/rayo/component'
+require 'adhearsion/rayo/disconnected_error'
+require 'adhearsion/rayo/initializer'
+require 'adhearsion/rayo/rayo_node'
+require 'adhearsion/rayo/ref'

data/lib/adhearsion/rayo/client.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+require 'has_guarded_handlers'
+require 'active_support/core_ext/module/delegation'
+
+module Adhearsion
+  module Rayo
+    class Client
+      include HasGuardedHandlers
+
+      attr_reader :connection, :component_registry
+
+      delegate :run, :stop, :send_message, :new_call_uri, :to => :connection
+
+      # @param [Hash] options
+      # @option options [Connection::XMPP] :connection The connection to use for this session
+      #
+      def initialize(options = {})
+        @connection = options[:connection]
+        @connection.event_handler = lambda { |event| self.handle_event event } if @connection
+        @component_registry = ComponentRegistry.new
+      end
+
+      def handle_event(event)
+        event.client = self
+        if event.source
+          event.source.add_event event
+        else
+          trigger_handler :event, event
+        end
+      end
+
+      def register_event_handler(*guards, &block)
+        register_handler :event, *guards, &block
+      end
+
+      def register_component(component)
+        component_registry << component
+      end
+
+      def find_component_by_uri(uri)
+        component_registry.find_by_uri uri
+      end
+
+      def delete_component_registration(component)
+        component_registry.delete component
+      end
+
+      def execute_command(command, options = {})
+        command.client = self
+        if command.respond_to?(:register_handler)
+          command.register_handler :internal do |event|
+            trigger_handler :event, event
+          end
+        end
+        connection.write command, options
+      end
+    end
+  end
+end
+
+require 'adhearsion/rayo/client/component_registry'

data/lib/adhearsion/rayo/client/component_registry.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+module Adhearsion
+  module Rayo
+    class Client
+      class ComponentRegistry
+        def initialize
+          @mutex = Mutex.new
+          @components = Hash.new
+        end
+
+        def <<(component)
+          @mutex.synchronize do
+            @components[component.source_uri] = component
+          end
+        end
+
+        def find_by_uri(uri)
+          @mutex.synchronize do
+            @components[uri]
+          end
+        end
+
+        def delete(component)
+          @mutex.synchronize do
+            uri = @components.key component
+            @components.delete uri
+          end
+        end
+      end
+    end
+  end
+end

data/lib/adhearsion/rayo/command.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+module Adhearsion
+  module Rayo
+    module Command
+    end
+  end
+end
+
+%w{
+  accept
+  answer
+  dial
+  hangup
+  join
+  mute
+  redirect
+  reject
+  unjoin
+  unmute
+}.each { |event| require "adhearsion/rayo/command/#{event}" }

data/lib/adhearsion/rayo/command/accept.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+
+require 'adhearsion/rayo/command_node'
+require 'adhearsion/has_headers'
+
+module Adhearsion
+  module Rayo
+    module Command
+      class Accept < CommandNode
+        register :accept, :core
+
+        include HasHeaders
+      end
+    end
+  end
+end

data/lib/adhearsion/rayo/command/answer.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+
+require 'adhearsion/rayo/command_node'
+require 'adhearsion/has_headers'
+
+module Adhearsion
+  module Rayo
+    module Command
+      class Answer < CommandNode
+        register :answer, :core
+
+        include HasHeaders
+      end
+    end
+  end
+end

data/lib/adhearsion/rayo/command/dial.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+require 'adhearsion/rayo/command_node'
+require 'adhearsion/has_headers'
+require 'adhearsion/rayo/command/join'
+
+module Adhearsion
+  module Rayo
+    module Command
+      class Dial < CommandNode
+        register :dial, :core
+
+        include HasHeaders
+
+        # @return [String] destination to dial
+        attribute :to
+
+        # @return [String] the caller ID
+        attribute :from
+
+        # @return [String] the requested URI for the resulting call
+        attribute :uri
+
+        # @return [Integer] timeout in milliseconds
+        attribute :timeout, Integer
+
+        # @return [Join] the nested join
+        attribute :join, Join
+
+        def inherit(xml_node)
+          if join_element = xml_node.at_xpath('ns:join', ns: Join.registered_ns)
+            self.join = Join.from_xml(join_element)
+          end
+          super
+        end
+
+        def rayo_attributes
+          {to: to, from: from, uri: uri, timeout: timeout}
+        end
+
+        def rayo_children(root)
+          join.to_rayo(root.parent) if join
+          super
+        end
+
+        def response=(other)
+          if other.is_a?(Ref)
+            @transport = other.scheme
+            @target_call_id = other.call_id
+            @domain = other.domain
+          end
+          super
+        end
+      end
+    end
+  end
+end

data/lib/adhearsion/rayo/command/hangup.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+
+require 'adhearsion/rayo/command_node'
+require 'adhearsion/has_headers'
+
+module Adhearsion
+  module Rayo
+    module Command
+      class Hangup < CommandNode
+        register :hangup, :core
+
+        include HasHeaders
+      end
+    end
+  end
+end

data/lib/adhearsion/rayo/command/join.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+require 'adhearsion/rayo/command_node'
+
+module Adhearsion
+  module Rayo
+    module Command
+      class Join < CommandNode
+        register :join, :core
+
+        VALID_DIRECTIONS = [:duplex, :send, :recv].freeze
+
+        # @return [String] the call ID to join
+        attribute :call_uri
+        alias :call_id= :call_uri=
+
+        # @return [String] the mixer name to join
+        attribute :mixer_name
+
+        # @param [#to_sym] other the direction in which media should flow. Can be :duplex, :recv or :send
+        attribute :direction, Symbol
+        def direction=(other)
+          if other && !VALID_DIRECTIONS.include?(other.to_sym)
+            raise ArgumentError, "Invalid Direction (#{other.inspect}), use: #{VALID_DIRECTIONS*' '}"
+          end
+          super
+        end
+
+        # @return [#to_sym] the method by which to negotiate media
+        attribute :media, Symbol
+
+        def rayo_attributes
+          {
+            'call-uri' => call_uri,
+            'mixer-name' => mixer_name,
+            'direction' => direction,
+            'media' => media
+          }
+        end
+      end
+    end
+  end
+end

data/lib/adhearsion/rayo/command/mute.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+require 'adhearsion/rayo/command_node'
+
+module Adhearsion
+  module Rayo
+    module Command
+      class Mute < CommandNode
+        register :mute, :core
+      end
+    end
+  end
+end