c3s 0.3.5 → 0.3.6

data/Manifest

@@ -1,6 +1,5 @@
 README.rdoc
 Rakefile
-c3s.gemspec
 lib/c3s.rb
 lib/c3s_logger.rb
 lib/component.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('c3s', '0.3.5') do |p|
+Echoe.new('c3s', '0.3.6') 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.5"
+  s.version = "0.3.6"
 
   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-12}
+  s.date = %q{2010-04-19}
   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", "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.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.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

@@ -162,9 +162,10 @@ module C3s
       end
       
       reply.type = :result
+      
       reply.query.add(Jabber::Discovery::Identity.new(config['category'], config['description'], config['type']))
       reply.query.add(Jabber::Discovery::Feature.new(Jabber::Discovery::IqQueryDiscoInfo.new.namespace))
-      reply.query.add(Jabber::Discovery::Feature.new(Jabber::Discovery::IqQueryDiscoItems.new.namespace))
+      #reply.query.add(Jabber::Discovery::Feature.new(Jabber::Discovery::IqQueryDiscoItems.new.namespace))
 
       send!(reply)
     end

data/lib/component_connection.rb

@@ -63,7 +63,7 @@ module C3s
       end
       
       puts "Starting messaging loop..."
-      @component.start
+      Thread.stop
     end
     
     def self.stop

data/lib/republisher.rb

@@ -25,22 +25,27 @@ module C3s
       super
     end
     
+    ##
+    # Subscribes to all nodes
+    #
+    def subscribe_nodes
+      @subscribing_nodes.each do |node|
+        begin
+          @subscriber.subscribe_collection(node)
+        rescue Exception => e
+          $LOG.error "Could not subscribe to node #{node}"
+          next
+        end
+      end
+    end
+    
     ##
     # Handles messages. This can be subscribe or unsubscribe messages
     # and pubsub events (most likely).
     def handle_msg(msg)
-      puts "----------------- MESSAGE -------------------"
-      puts "#{msg.inspect}"
-      puts "----------------- MESSAGE -------------------"
       if msg.body.eql?("sub")
         $LOG.info "Subscribing nodes: #{@subscribing_nodes.join(", ")}"
-        @subscribing_nodes.each do |node|
-          begin
-            @subscriber.subscribe_collection(node)
-          rescue Exception => e
-            $LOG.erro "Could not subscribe node #{node}!"
-          end
-        end
+        subscribe_nodes()
       elsif msg.body.eql?("unsub")
         @subscriber.unsubscribe_all
       else

metadata

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