c3s 0.3.6 → 0.4.0

data/Manifest

@@ -12,4 +12,5 @@ lib/pubsub/nodetracker.rb
 lib/pubsub/publisher.rb
 lib/pubsub/subscriber.rb
 lib/republisher.rb
+test.pcap
 Manifest

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('c3s', '0.3.6') do |p|
+Echoe.new('c3s', '0.4.0') do |p|
   p.description    = "C3s library gem."
   p.url            = "http://github.com/rikas/c3s"
   p.author         = "Ricardo Otero"

data/c3s.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{c3s}
-  s.version = "0.3.6"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ricardo Otero"]
-  s.date = %q{2010-04-19}
+  s.date = %q{2010-04-23}
   s.description = %q{C3s library gem.}
   s.email = %q{oterosantos@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "lib/c3s.rb", "lib/c3s_logger.rb", "lib/component.rb", "lib/component_connection.rb", "lib/configreader.rb", "lib/databaseadapter.rb", "lib/model.rb", "lib/pubsub/node.rb", "lib/pubsub/nodetracker.rb", "lib/pubsub/publisher.rb", "lib/pubsub/subscriber.rb", "lib/republisher.rb"]
-  s.files = ["README.rdoc", "Rakefile", "c3s.gemspec", "lib/c3s.rb", "lib/c3s_logger.rb", "lib/component.rb", "lib/component_connection.rb", "lib/configreader.rb", "lib/databaseadapter.rb", "lib/model.rb", "lib/pubsub/node.rb", "lib/pubsub/nodetracker.rb", "lib/pubsub/publisher.rb", "lib/pubsub/subscriber.rb", "lib/republisher.rb", "Manifest"]
+  s.files = ["README.rdoc", "Rakefile", "lib/c3s.rb", "lib/c3s_logger.rb", "lib/component.rb", "lib/component_connection.rb", "lib/configreader.rb", "lib/databaseadapter.rb", "lib/model.rb", "lib/pubsub/node.rb", "lib/pubsub/nodetracker.rb", "lib/pubsub/publisher.rb", "lib/pubsub/subscriber.rb", "lib/republisher.rb", "Manifest", "c3s.gemspec"]
   s.homepage = %q{http://github.com/rikas/c3s}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "C3s", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/component.rb

@@ -42,26 +42,20 @@ module C3s
     end
     
     ##
-    # Starts listening for packets and waits for activity. Also
+    # Adds callbacks to listen for
     # provides a callback named *handle_iq* for especific components
     # to use.
-    def start
-      super
-      
-      Thread.abort_on_exception = true
-
+    def add_callbacks
       add_iq_callback do |iq|
         t1 = Thread.new do
           handle_iq(iq)
         end
-        t1.join
       end
       
       add_message_callback do |msg|
         t2 = Thread.new do
           handle_msg(msg)
         end
-        t2.join
       end
     end
     
@@ -94,6 +88,7 @@ module C3s
     # Handles discovery, sets and gets
     # iq:: [Jabber::IQ] the received IQ packet
     def handle_iq(iq)
+      $LOG.info "Got an iq: #{iq.id}"
       if iq.query.kind_of?(Jabber::Discovery::IqQueryDiscoInfo)
         handle_disco_info(iq)
       elsif iq.query.first_element(config['name']) # TODO assuming that pubsubnode = xml root
@@ -141,7 +136,7 @@ module C3s
       if object.errors.count == 0
         $LOG.info "Publishing data to node #{config['name']}:#{data[:jid]} (data changed: #{changed})"
         c3snode = C3s::Node.new("#{config['name']}:#{data[:jid]}")
-        publish(c3snode, stanza, changed)
+        self.publish_to_pubsub(c3snode, stanza, changed)
         send_ok(iq)
       end
 
@@ -191,7 +186,7 @@ module C3s
     # c3snode:: [C3s::Node] the pubsub node
     # data:: [String] what to publish
     # changed:: [Boolean] the data is different from last set operation?
-    def publish(c3snode, data, changed)
+    def publish_to_pubsub(c3snode, data, changed)
       if changed
         $LOG.info "Information for node '#{c3snode.to_s}' changed. Publishing data..."
         pub = Publisher.new(self, config['pubsub'])
@@ -199,7 +194,9 @@ module C3s
         pub.publish(c3snode, data)
       end
       
-      #send_ok(iq) if iq.is_a?(Jabber::Iq)
+      send_ok(iq) if iq.is_a?(Jabber::Iq)
+    rescue Exception => e
+      $LOG.error("#{e.inspect} #{e.backtrace.join("\n")}")
     end
     
     ##

data/lib/component_connection.rb

@@ -63,6 +63,8 @@ module C3s
       end
       
       puts "Starting messaging loop..."
+      Thread.abort_on_exception = true
+      @component.add_callbacks
       Thread.stop
     end
     

data/lib/pubsub/publisher.rb

@@ -96,6 +96,8 @@ module C3s
       item = Jabber::PubSub::Item.new
       item.add(content)
       @pubsub.publish_item_to(c3snode.to_s, item)
+    rescue Exception => e
+      $LOG.error("#{e.inspect} #{e.backtrace.join("\n")}")
     end
 
     ##
@@ -108,8 +110,8 @@ module C3s
       nodebrowser.get_info(@service, name)
       NodeTracker.add_node(name)
       true
-    rescue Jabber::ServerError => error
-      return false if error.to_s.include?("item-not-found")
+    rescue Jabber::ServerError => e
+      return false if e.to_s.include?("item-not-found")
     end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 6
-  version: 0.3.6
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ricardo Otero
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +01:00
+date: 2010-04-23 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -41,7 +41,6 @@ extra_rdoc_files:
 files: 
 - README.rdoc
 - Rakefile
-- c3s.gemspec
 - lib/c3s.rb
 - lib/c3s_logger.rb
 - lib/component.rb
@@ -55,6 +54,7 @@ files:
 - lib/pubsub/subscriber.rb
 - lib/republisher.rb
 - Manifest
+- c3s.gemspec
 has_rdoc: true
 homepage: http://github.com/rikas/c3s
 licenses: []