adhearsion-xmpp 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,2 +1,5 @@
+# v1.0.1
+  * Bugfix: Get everything working in standalone connection mode (not sharing with Punchblock)
+
 # v1.0.0
   * First release

data/README.md

@@ -27,7 +27,7 @@ In your Adhearsion app configuration file, add the following values:
 Adhearsion.config do |config|
   config.xmpp.jid      = "valid-jid"
   config.xmpp.password = "valid-password"
-  config.xmpp.host     = "valid-host"
+  config.xmpp.server   = "valid-server"
   config.xmpp.port     = "valid-port"
 end
 ```

data/lib/adhearsion/xmpp/connection.rb

@@ -1,63 +1,33 @@
-require 'blather/client'
+require 'blather/client/client'
+require 'blather/client/dsl'
 
 module Adhearsion
   class XMPP
-    module Connection
+    class Connection
 
-      class << self
+      include Blather::DSL
 
-        attr_accessor :client
-
-        ##
-        # 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 = logger
-          setup_client_object jid, password, server, port
-          register_event_namespaces
-          register_default_client_handlers
-          Adhearsion::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 initialize
+        Blather.logger = logger
+        Blather.default_log_level = :trace if Blather.respond_to? :default_log_level
+        register_default_client_handlers
+        Adhearsion::Events.after_initialized { connect }
+        Adhearsion::Events.shutdown { shutdown }
+      end
 
-        def connect
-          EventMachine.run {client.connect}
-        end
+      private
 
-        def register_event_namespaces
-          Adhearsion::Events.register_namespace_name "/xmpp"
+      def connect
+        logger.info "Connecting to XMPP"
+        Adhearsion::Process.important_threads << Thread.new do
+          EventMachine.run { client.connect }
         end
+      end
 
-        def register_default_client_handlers
-          client.register_handler(:ready) do
-            logger.info "Connected to XMPP server! Send messages to #{client.jid.stripped}."
-          end
-
-          client.register_handler(:disconnected) do
-            if Adhearsion.status == :running
-              logger.warn "XMPP Disconnected. Reconnecting."
-              connect
-            end
-            # TODO: fix this to reconnect XMPP cleanly
-          end
+      def register_default_client_handlers
+        client.register_handler(:ready) do
+          logger.info "Connected to XMPP server! Send messages to #{client.jid.stripped}."
         end
-
       end
 
     end

data/lib/adhearsion/xmpp/plugin.rb

@@ -4,11 +4,11 @@ module Adhearsion
 
       # Default configuration for XMPP connection.
       config :xmpp do
-        use_punchblock true       , :desc => "Re-use Punchblock's XMPP connection. Boolean."
-        jid            nil        , :desc => "Client/component JID to connect to. String."
-        password       nil        , :desc => "Password identifier. String."
-        server         nil        , :desc => "XMPP server hostname. May be omitted if server can be determined from JID. String."
-        port           nil        , :desc => "XMPP server port. May be omitted if server can be determined from JID. Integer."
+        use_punchblock true,  :desc => "Re-use Punchblock's XMPP connection. Boolean."
+        jid            nil,   :desc => "Client/component JID to connect to. String."
+        password       nil,   :desc => "Password identifier. String."
+        server         nil,   :desc => "XMPP server hostname. May be omitted if server can be determined from JID. String."
+        port           nil,   :desc => "XMPP server port. May be omitted if server can be determined from JID. Integer."
       end
 
       # Include the XMPP service in plugins initialization process
@@ -19,50 +19,26 @@ module Adhearsion
         end unless Adhearsion::XMPP.handlers.nil?
       end
 
-      run :xmpp do
-        Adhearsion::XMPP.plugin.run_plugin
-      end
+      delegate :config, :to => self
+      delegate :use_punchblock, :to => :config
 
       def initialize
-        @config ||= Adhearsion.config[:xmpp]
-        init_blather unless @config.use_punchblock
-      end
-
-      def run_plugin
-        run_blather unless @config.use_punchblock
+        init_blather config.jid, config.password, config.server, config.port unless use_punchblock
       end
 
-      def start_punchblock
-        # Nothing needed here; everything is delegated
-        nil
-      end
-
-      def init_blather
-        raise "Must supply a jid argument to the XMPP configuration" if (@config.jid.nil? || @config.jid.empty?)
-        raise "Must supply a password argument to the XMPP configuration" if (@config.password.nil? || @config.password.empty?)
+      def init_blather(jid, password, server, port)
+        raise "Must supply a jid to the XMPP configuration" unless jid.present?
+        raise "Must supply a password to the XMPP configuration" unless password.present?
 
-        Connection.extend Blather::DSL
-        Connection.start @config.jid, @config.password, @config.server, @config.port
-      end
-
-      ##
-      # Stop the XMPP connection
-      def stop
-        stop_blather unless @config.use_punchblock
-      end
-
-      def stop_blather
-        Connection.stop
+        connection.setup jid, password, server, port
       end
 
       def connection
-        @config.use_punchblock ?
-          PunchblockPlugin.connection :
-          Connection
-      end
-
-      def client
-        @config.use_punchblock ? PunchblockPlugin.client : Connection.client
+        if use_punchblock
+          PunchblockPlugin.connection
+        else
+          @connection ||= Connection.new
+        end
       end
     end
   end

data/lib/adhearsion/xmpp/version.rb

@@ -1,5 +1,5 @@
 module Adhearsion
   class XMPP
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion-xmpp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2528149548247411603
+      hash: 844702008144568214
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -161,10 +161,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2528149548247411603
+      hash: 844702008144568214
 requirements: []
 rubyforge_project: adhearsion-xmpp
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Send and receive XMPP messages in your Adhearsion application