xmpp4r-observable 0.5.3 → 0.5.4

data/lib/observable_thing.rb

@@ -15,7 +15,7 @@ module ObservableThing
 		unless observer.respond_to? func
 			raise NoMethodError, "observer does not respond to `#{func.to_s}'"
 		end
-		@things[thing][observer] = func
+		@things[thing][observer] = func unless @things[thing].include?(observer)
 	end
 
 	# Deletes an observer for some "thing".

data/lib/xmpp4r-observable.rb

@@ -101,6 +101,11 @@ module Jabber
 				@observable = observable
 
 				@helper = @service_jid = nil
+				@disco = Jabber::Discovery::Helper.new(@observable.client)
+				attach!
+			end
+
+			def attach!
 				begin
 					domain = Jabber::JID.new(@observable.jid).domain
 					@service_jid = "pubsub." + domain
@@ -108,6 +113,7 @@ module Jabber
 				rescue
 					@helper = @service_jid = nil
 				end
+				return has_service?
 			end
 
 			def inspect	#:nodoc:
@@ -123,23 +129,27 @@ module Jabber
 				! @helper.nil?
 			end
 	
-			# Sets the PubSub service. Just one service is allowed.
+			# Sets the PubSub service. Just one service is allowed. If nil, reset.
 			def set_service(service)
-				raise NotConnected, "You are not connected" if ! @observable.connected?
-				raise AlreadySet, "You already have a PubSub service (#{@service_jid})." if has_service?
-				@helper = Jabber::PubSub::ServiceHelper.new(@observable.client, service)
-				@service_jid = service
-	
-				@helper.add_event_callback do |event|
-					@observable.changed(:event)
-					@observable.notify_observers(:event, event)
+				if service.nil?
+					@helper = @service_jid = nil
+				else
+					raise NotConnected, "You are not connected" if ! @observable.connected?
+					raise AlreadySet, "You already have a PubSub service (#{@service_jid})." if has_service?
+					@helper = Jabber::PubSub::ServiceHelper.new(@observable.client, service)
+					@service_jid = service
+
+					@helper.add_event_callback do |event|
+						@observable.changed(:event)
+						@observable.notify_observers(:event, event)
+					end
 				end
 			end
 	
 			# Subscribe to a node.
 			def subscribe_to(node)
 				raise_noservice if ! has_service?
-				@helper.subscribe_to(node)
+				@helper.subscribe_to(node) unless is_subscribed_to?(node)
 			end
 	
 			# Unsubscribe from a node.
@@ -190,7 +200,7 @@ module Jabber
 				node
 			end
 	
-			# Return an array of noes I own
+			# Return an array of nodes I own
 			def my_nodes
 				if ! defined? @my_nodes
 					ret = []
@@ -202,6 +212,30 @@ module Jabber
 				return @my_nodes
 			end
 
+			# Return true if a given node exists
+			def node_exists?(node)
+				ret = []
+				if ! defined? @existing_nodes or ! @existing_nodes.include?(node)
+					# We'll renew @existing_nodes if we haven't got it the first time
+					reply = @disco.get_items_for(@service_jid)
+					reply.items.each do |item|
+						ret << item.node
+					end
+					@existing_nodes = ret
+				end
+				return @existing_nodes.include?(node)
+			end
+
+			# Returns an array of nodes I am subscribed to
+			def subscribed_nodes
+				ret = []
+				subscriptions.each do |sub|
+					next if sub.node.nil?
+					ret << sub.node if sub.attributes['subscription'] == 'subscribed' and ! my_nodes.include?(sub.node)
+				end
+				return ret
+			end
+
 			# Return true if we're subscribed to that node
 			def is_subscribed_to?(node)
 				ret = false
@@ -628,6 +662,12 @@ module Jabber
 			# Post-connect
 			register_default_callbacks
 			status(@presence, @status_message)
+			if ! @pubsub.nil?
+				@pubsub.attach!
+			else
+				@pubsub = PubSub.new(self)
+			end
+
 			@connect_mutex.unlock
 		end
 
@@ -641,6 +681,7 @@ module Jabber
 				end
 			end
 			client = nil
+			@pubsub.set_service(nil)
 			@disconnected = auto_reconnect
 		end
 
@@ -693,6 +734,7 @@ module Jabber
 			@deferred_delivery_thread = Thread.new {
 				loop {
 					sleep 3 while @deferred_messages.empty?
+					sleep 3
 					message = @deferred_messages.deq
 					if @subs.subscribed_to?(message[:to])
 						deliver(message[:to], message[:message], message[:type])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xmpp4r-observable
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Pablo Lorenzoni
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 -03:00
+date: 2009-10-27 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.0
     version: 
-description: "    Jabber::Observable builds on the strong foundation of XMPP4R and use\n    a customized version of Ruby's builtin Observer pattern to expose\n    XMPP observable things (as messages, pubsub events, presence, etc).\n"
+description: Jabber::Observable builds on the strong foundation of XMPP4R and use a customized version of Ruby's builtin Observer pattern to expose XMPP observable things (as messages, pubsub events, presence, etc).
 email: pablo@propus.com.br
 executables: []
 
@@ -43,8 +43,6 @@ files:
 - test/tc_xmpp4r-observable.rb
 has_rdoc: true
 homepage: http://www.nardol.org/
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -65,9 +63,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: An observable Jabber client library.
 test_files: 
 - test/tc_observable_thing.rb