c3s 0.4.1 → 0.4.2

data/Manifest

@@ -12,4 +12,22 @@ lib/pubsub/nodetracker.rb
 lib/pubsub/publisher.rb
 lib/pubsub/subscriber.rb
 lib/republisher.rb
+pkg/c3s-0.4.1.gem
+pkg/c3s-0.4.1.tar.gz
+pkg/c3s-0.4.1/Manifest
+pkg/c3s-0.4.1/README.rdoc
+pkg/c3s-0.4.1/Rakefile
+pkg/c3s-0.4.1/c3s.gemspec
+pkg/c3s-0.4.1/lib/c3s.rb
+pkg/c3s-0.4.1/lib/c3s_logger.rb
+pkg/c3s-0.4.1/lib/component.rb
+pkg/c3s-0.4.1/lib/component_connection.rb
+pkg/c3s-0.4.1/lib/configreader.rb
+pkg/c3s-0.4.1/lib/databaseadapter.rb
+pkg/c3s-0.4.1/lib/model.rb
+pkg/c3s-0.4.1/lib/pubsub/node.rb
+pkg/c3s-0.4.1/lib/pubsub/nodetracker.rb
+pkg/c3s-0.4.1/lib/pubsub/publisher.rb
+pkg/c3s-0.4.1/lib/pubsub/subscriber.rb
+pkg/c3s-0.4.1/lib/republisher.rb
 Manifest

data/Rakefile

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

data/c3s.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{c3s}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   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-29}
+  s.date = %q{2010-09-27}
   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"]
@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "C3s", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{c3s}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{C3s library gem.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/model.rb

@@ -36,6 +36,7 @@ module C3sModel
   def to_xml(options={})
     xml = first_element(options)
     self.attributes.each do |key, val|
+      # Don't include ignored attributes or foreign keys
       if !IGNORE_ATTR.include?(key) && !key.match(/.+_id/)
         xml.add REXML::Element.new(key).add_text(val.to_s)
       end

data/lib/pubsub/publisher.rb

@@ -37,6 +37,7 @@ module C3s
     def create_node(nodename, options={})
       return if node_exists?(nodename)
       config = Jabber::PubSub::NodeConfig.new
+      config = nil if !options || options.empty? # avoid creation of <configure/>
       
       if options[:father]
         config.options = config.options.merge({'pubsub#collection' => options[:father]})
@@ -68,6 +69,7 @@ module C3s
       $LOG.debug("Creating collection  node #{name}...")
       $LOG.debug("Node config: #{config.options.inspect}")
       return if node_exists?(name)
+      
       node = @pubsub.create_collection_node(name, config)
     end
     
@@ -78,11 +80,16 @@ module C3s
     # config:: [PubSub::NodeConfig] node configuration
     def create_leaf_node(name, config)
       $LOG.debug("Creating leaf node #{name}")
-      $LOG.debug("Node config: #{config.options.inspect}")
+      $LOG.debug("Node config: #{config.options.inspect}") if config
       return if node_exists?(name)
+      
       node = @pubsub.create_node(name, config)
     end
     
+    ##
+    # Grants node permissions to user admin@domain so that we
+    # can have an admin that can edit/delete every node.
+    # node:: [Pubsub::Node] the node to grant permissions to
     def grant_owner_to_admin(node)
       return unless node
       @pubsub.set_affiliations(node, "admin@#{@client.config['url']}", 'owner')

data/lib/republisher.rb

@@ -59,10 +59,11 @@ module C3s
               $LOG.debug("Node built: #{c3snode.to_s}")
               c3snode.provider = config['name'] # TODO - assuming that provider_name.eql?(pubsub_root_node)
               $LOG.debug("Call republish() from child")
-              
-              
+                  
               Thread.abort_on_exception = true
               t = Thread.new do
+                # This must be implemented on the republisher
+                # because the strategy may vary from component to component.
                 republish(c3snode, item)
               end
               t.join

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: c3s
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Ricardo Otero
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 +01:00
+date: 2010-09-27 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -70,16 +71,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -87,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: c3s
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: C3s library gem.