adhearsion 0.8.4 → 0.8.5

data/lib/adhearsion/voip/dsl/dialing_dsl.rb

@@ -142,7 +142,7 @@ module Adhearsion
             patterns.unshift pattern
           end
 
-          class RouteException < Exception; end
+          class RouteException < StandardError; end
 
         end
       end

data/lib/adhearsion/voip/dsl/dialplan/control_passing_exception.rb

@@ -9,7 +9,7 @@ module Adhearsion
         # particular context. The serve() method in the servlet_container actually
         # rescues these exceptions specifically and then does +e.target to execute
         # that code.
-        class ControlPassingException < Exception
+        class ControlPassingException < StandardError
 
           attr_reader :target
 
@@ -20,7 +20,7 @@ module Adhearsion
 
         end
 
-        class ContextNotFoundException < Exception; end
+        class ContextNotFoundException < StandardError; end
       end
     end
   end

data/lib/adhearsion/voip/dsl/dialplan/dispatcher.rb

@@ -3,7 +3,7 @@ module Adhearsion
     module DSL
       module Dialplan
 
-        class ReturnValue < Exception
+        class ReturnValue < StandardError
           attr_reader :obj
           def initialize(obj)
             @obj = obj
@@ -11,7 +11,7 @@ module Adhearsion
           end
         end
 
-        class Hangup < Exception; end
+        class Hangup < StandardError; end
 
         # Instantiated and returned in every dialplan command
         class EventCommand

data/lib/adhearsion/voip/menu_state_machine/menu_class.rb

@@ -102,9 +102,9 @@ module Adhearsion
         raise MenuGetAnotherDigitOrTimeout
       end
 
-      # The superclass from which all message-like exceptions decend. It should never
+      # The superclass from which all message-like exceptions descend. It should never
       # be instantiated directly.
-      class MenuResult < Exception; end
+      class MenuResult < StandardError; end
 
       # Raised when the user's input matches
       class MenuResultFound < MenuResult

data/lib/adhearsion/xmpp/connection.rb

@@ -0,0 +1,61 @@
+module Adhearsion
+  module XMPP
+    module Connection
+
+      mattr_accessor :client
+      class << self
+
+        # Open the XMPP connection
+        #
+        # @param [String] jid the client/component JID to connect to
+        # @param [String] password
+        # @param [String] server
+        # @param [Integer] port
+        def start(jid, password, server, port)
+          Blather.logger = ahn_log.xmpp
+          setup_client_object(jid, password, server, port)
+          register_event_namespaces
+          register_default_client_handlers
+          Events.register_callback(:after_initialized) do
+            connect
+          end
+        end
+
+        # Close the XMPP connection
+        def stop
+          shutdown
+        end
+
+        private
+
+        def setup_client_object(jid, password, server, port)
+          self.client = Blather::Client.setup(jid, password, server, port)
+        end
+
+        def connect
+          EventMachine.run {client.connect}
+        end
+
+        def register_event_namespaces
+          Events.register_namespace_name "/xmpp"
+        end
+
+        def register_default_client_handlers
+          client.register_handler(:ready) do
+            ahn_log.xmpp.info "Connected to XMPP server! Send messages to #{client.jid.stripped}."
+          end
+
+          client.register_handler(:disconnected) do
+            if Adhearsion.status == :running
+              ahn_log.xmpp.warning "XMPP Disconnected. Reconnecting."
+              connect
+            end
+            # TODO: fix this to reconnect XMPP cleanly
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/theatre/invocation.rb

@@ -11,7 +11,7 @@ module Theatre
 
     attr_reader :queued_time, :started_time, :finished_time, :unique_id, :callback, :namespace, :error, :returned_value
 
-    class InvalidStateError < Exception; end
+    class InvalidStateError < StandardError; end
 
     ##
     # Create a new Invocation.

data/lib/theatre/namespace_manager.rb

@@ -144,7 +144,7 @@ module Theatre
 
   end
 
-  class NamespaceNotFound < Exception
+  class NamespaceNotFound < StandardError
     def initialize(full_path)
       super "Could not find #{full_path.inspect} in the namespace registry. Did you register it yet?"
     end

metadata

@@ -1,21 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: adhearsion
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Jay Phillips
+- Jason Goecke
+- Ben Klang
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 -07:00
+date: 2010-08-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,7 +69,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 description: Adhearsion is an open-source telephony development framework
-email: Jay&Adhearsion.com
+email: dev&Adhearsion.com
 executables: 
 - ahn
 - ahnctl
@@ -92,6 +94,9 @@ files:
 - app_generators/ahn/templates/components/disabled/restful_rpc/README.markdown
 - app_generators/ahn/templates/components/disabled/restful_rpc/restful_rpc.rb
 - app_generators/ahn/templates/components/disabled/restful_rpc/spec/restful_rpc_spec.rb
+- app_generators/ahn/templates/components/disabled/xmpp_gateway/xmpp_gateway.rb
+- app_generators/ahn/templates/components/disabled/xmpp_gateway/xmpp_gateway.yml
+- app_generators/ahn/templates/components/disabled/xmpp_gateway/README.markdown
 - app_generators/ahn/templates/components/simon_game/simon_game.rb
 - app_generators/ahn/templates/config/startup.rb
 - app_generators/ahn/templates/dialplan.rb
@@ -116,7 +121,6 @@ files:
 - lib/adhearsion/foundation/custom_daemonizer.rb
 - lib/adhearsion/foundation/event_socket.rb
 - lib/adhearsion/foundation/future_resource.rb
-- lib/adhearsion/foundation/global.rb
 - lib/adhearsion/foundation/metaprogramming.rb
 - lib/adhearsion/foundation/numeric.rb
 - lib/adhearsion/foundation/pseudo_guid.rb
@@ -133,6 +137,7 @@ files:
 - lib/adhearsion/initializer/drb.rb
 - lib/adhearsion/initializer/freeswitch.rb
 - lib/adhearsion/initializer/rails.rb
+- lib/adhearsion/initializer/xmpp.rb
 - lib/adhearsion/logging.rb
 - lib/adhearsion/tasks.rb
 - lib/adhearsion/tasks/database.rb
@@ -178,6 +183,7 @@ files:
 - lib/adhearsion/voip/menu_state_machine/matchers.rb
 - lib/adhearsion/voip/menu_state_machine/menu_builder.rb
 - lib/adhearsion/voip/menu_state_machine/menu_class.rb
+- lib/adhearsion/xmpp/connection.rb
 - lib/theatre.rb
 - lib/theatre/callback_definition_loader.rb
 - lib/theatre/guid.rb

data/lib/adhearsion/foundation/global.rb

@@ -1 +0,0 @@
-Infinity = 1.0/0.0