c3s 0.2.7 → 0.3.2

data/Manifest

@@ -1,7 +1,7 @@
 Manifest
 README.rdoc
 Rakefile
-c3s.gemspec
+c3s
 lib/c3s.rb
 lib/c3s_logger.rb
 lib/component.rb
@@ -9,5 +9,25 @@ lib/component_connection.rb
 lib/configreader.rb
 lib/databaseadapter.rb
 lib/model.rb
-lib/nodetracker.rb
-lib/publisher.rb
+lib/pubsub/node.rb
+lib/pubsub/nodetracker.rb
+lib/pubsub/publisher.rb
+lib/pubsub/subscriber.rb
+pkg/c3s-0.3.2.gem
+pkg/c3s-0.3.2.tar.gz
+pkg/c3s-0.3.2/Manifest
+pkg/c3s-0.3.2/README.rdoc
+pkg/c3s-0.3.2/Rakefile
+pkg/c3s-0.3.2/c3s
+pkg/c3s-0.3.2/c3s.gemspec
+pkg/c3s-0.3.2/lib/c3s.rb
+pkg/c3s-0.3.2/lib/c3s_logger.rb
+pkg/c3s-0.3.2/lib/component.rb
+pkg/c3s-0.3.2/lib/component_connection.rb
+pkg/c3s-0.3.2/lib/configreader.rb
+pkg/c3s-0.3.2/lib/databaseadapter.rb
+pkg/c3s-0.3.2/lib/model.rb
+pkg/c3s-0.3.2/lib/pubsub/node.rb
+pkg/c3s-0.3.2/lib/pubsub/nodetracker.rb
+pkg/c3s-0.3.2/lib/pubsub/publisher.rb
+pkg/c3s-0.3.2/lib/pubsub/subscriber.rb

data/Rakefile

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

data/c3s

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+#
+# This is the command used to run the component
+
+require 'rubygems'
+
+# Check for gem versions
+gem 'c3s', '>=0.3.2'
+gem 'xmpp4r', '>=0.5'
+
+require 'c3s'
+require 'pathname'
+
+PROVIDERS_DIR = File.join(ENV['HOME'], "ptcb", "code", "providers")
+
+def usage
+  puts "Usage: provider [provider_dir]"
+  puts ""
+  puts "Available providers: #{available_providers}"
+  puts ""
+  exit
+end
+
+def available_providers
+  available_providers = []
+  Dir.glob(File.join(PROVIDERS_DIR, "*")) do |dir|
+    next unless File.directory?(dir)
+    conf = File.join(dir, "component.yml")
+    path = Pathname.new(dir)
+    available_providers << path.basename if File.exist?(conf)
+  end
+  available_providers.join(", ")
+end
+
+args = ARGV
+if (args.size!=1)
+  usage
+else
+  provider = File.join(PROVIDERS_DIR, args.last)
+  if (!File.directory?(provider))
+    puts "Couldn't find '#{args.last}' provider"
+    exit
+  end
+end
+
+# Set process name to provider
+$0 = args.last
+
+# Set the dir variables
+C3S_COMPONENT_DIR = File.join(PROVIDERS_DIR, args.last)
+C3S_LIB_DIR = File.join(C3S_COMPONENT_DIR, 'lib')
+C3S_LOG_DIR = File.join(C3S_COMPONENT_DIR, 'logs')
+
+# Power to the requires
+$:.unshift C3S_COMPONENT_DIR
+$:.unshift C3S_LIB_DIR
+$:.unshift File.join(C3S_LIB_DIR, args.last)
+
+require 'lib/runner'

data/c3s.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{c3s}
-  s.version = "0.2.7"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ricardo Otero"]
-  s.date = %q{2009-12-16}
+  s.date = %q{2010-02-11}
   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/nodetracker.rb", "lib/publisher.rb"]
-  s.files = ["Manifest", "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/nodetracker.rb", "lib/publisher.rb"]
+  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"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "c3s", "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", "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/c3s.rb

@@ -19,7 +19,7 @@ require 'databaseadapter'
 require 'c3s_logger'
 
 module C3s
-  VERSION = "0.2.7"
+  VERSION = "0.2.9"
   
   def self.included(base)
     base.extend ClassMethods

data/lib/c3s_logger.rb

@@ -5,7 +5,8 @@ module C3s
   class C3sLogger
     attr_accessor :logger    
     
-    def initialize(log_file)
+    def initialize
+      log_file = File.join(C3S_LOG_DIR, 'component.log')
       logger = Logger.new(log_file, "weekly")
       logger.formatter = C3sLogFormatter.new
       self.logger = logger

data/lib/component.rb

@@ -8,7 +8,9 @@ rescue Exception => e
 end
 require 'xmpp4r/discovery'
 require 'xmpp4r/pubsub/helper/nodebrowser'
-require 'publisher'
+require 'pubsub/publisher'
+require 'pubsub/subscriber'
+require 'pubsub/node'
 
 module C3s
   class Component < Jabber::Component
@@ -16,15 +18,21 @@ module C3s
     # Component configuration hash
     attr_accessor :config
     
+    ##
+    # Active record main class associated with component
+    attr_accessor :model
+    
     ##
     # Initializes the jabber component with
     # a configuration hash read with ConfigReader
     #
     # config:: [Hash] configuration hash
-    def initialize(config)
+    def initialize(config, model)
       super(config['jid'])
       self.config = config
+      self.model = model
       Jabber::debug = config['debug'].to_s.eql?"true"
+      config['pubsub'] = "pubsub.#{config['url']}"
     end
     
     ##
@@ -33,6 +41,7 @@ module C3s
     # Throws ClientAuthenticationFailure
     def connect
       super(config['url'], config['port'])
+
       if is_connected?
         auth(config['password'])
       else
@@ -45,7 +54,7 @@ module C3s
     # provides a callback named *handle_iq* for especific components
     # to use.
     def start
-      super()
+      super
 
       Thread.abort_on_exception = true
 
@@ -55,6 +64,84 @@ module C3s
         end
         t.join
       end
+      
+      add_message_callback do |msg|
+        t = Thread.new do
+          handle_msg(msg)
+        end
+        t.join
+      end
+    end
+    
+    ##
+    # Tries to send the message. It will repeat the process if
+    # sending the stanza fails, reconnecting the client. This should be used
+    # instead of the default send method.
+    # msg:: the stanza to send
+    def send!(msg)
+      attempts = 0
+      begin
+        attempts += 1
+        send(msg)
+      rescue Errno::EPIPE, IOError => e
+        sleep 1
+        disconnect
+        reconnect
+        retry unless attempts > 3
+        raise e
+      rescue Errno::ECONNRESET => e
+        sleep (attempts^2) * 60 + 60
+        disconnect
+        reconnect
+        retry unless attempts > 3
+        raise e
+      end
+    end
+    
+    ##
+    # Handles discovery, sets and gets
+    # iq:: [Jabber::IQ] the received IQ packet
+    def handle_iq(iq)
+      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
+        handle_set(iq) if iq.type == :set
+        handle_get(iq) if iq.type == :get
+      end
+    rescue Exception => e
+      $LOG.error("#{e.inspect} #{e.backtrace.join("\n")}")
+      send_error(iq, ['bad-request', nil])
+    end
+    
+    def handle_msg(msg)
+    end
+    
+    ##
+    # Handles set of information
+    # iq:: [Jabber::IQ] the received IQ packet
+    def handle_set(iq)
+      stanza = iq.query.first_element(config['name']) # TODO assuming that pubsubnode = xml root
+
+      # Build data for activerecord object. The jid is taken from
+      # the 'jid' attribute on the main tag under the <query>
+      data = {:jid => iq.from.to_s}
+      self.model.new.nodes.each do |node|
+        data.merge!(node => stanza.first_element_text(node))
+      end
+
+      changed = true
+      @object = self.model.find_by_jid(data[:jid]) || self.model.new
+
+      $LOG.info "Saving #{config['name']} context for #{data[:jid]} #{data.inspect}"
+      @object.update_attributes(data)
+      changed = @object.changed?
+      @object.save!
+
+      publish(iq, stanza, changed) if @object.errors.count == 0
+
+    rescue Exception => e
+      $LOG.error("#{e.inspect} #{e.backtrace.join("\n")}")
+      send_error(iq, ['bad-request', @object.errors.full_messages.first])
     end
     
     ##
@@ -67,13 +154,13 @@ module C3s
         send_error(iq, ['bad-request', nil])
         return
       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))
 
-      send(reply)
+      send!(reply)
     end
     
     ##
@@ -89,7 +176,7 @@ module C3s
       error = Jabber::ErrorResponse.new(err.first, err.last)
       reply.add error
 
-      send(reply) if iq.type != :error
+      send!(reply) if iq.type != :error
     end
     
     ##
@@ -98,27 +185,41 @@ module C3s
     # data:: what to publish
     # changed:: the data is different from last set operation?
     def publish(iq, data, changed)
-      jid = (iq.is_a?(Jabber::Iq)) ? iq.from.bare.to_s : iq
+      jid = (iq.is_a?(Jabber::Iq)) ? iq.from.to_s : iq
       if changed
-        pub = Publisher.new(self, "pubsub."+config['url'])
-        pub.create_nodes("/#{config['name']}/#{jid}")
+        pub = Publisher.new(self, config['pubsub'])
+        pub.create_nodes("#{config['name']}:#{jid}")
         pub.publish(jid, data)
       end
       
       send_ok(iq) if iq.is_a?(Jabber::Iq)
     end
     
+    def get_subscriptions
+      @pubsub = Jabber::PubSub::ServiceHelper.new(self, config['pubsub'])
+      subs = @pubsub.get_subscriptions_from_all_nodes
+      puts "SUBSCRIPTIONS: #{subs.inspect}"
+      subs
+    end
+
+    def unsubscribe_all
+      subscriptions = get_subscriptions
+      return if !@pubsub
+      subscriptions.each do |sub|
+        @pubsub.unsubscribe_from(sub.node, sub.subid)
+      end
+    end
+    
     ##
     # Sends an OK response to a given iq
     # iq:: the iq to respond to
     def send_ok(iq)
-      reply = Jabber::Iq.new()
+      reply = iq.answer
       reply.id = iq.id
       reply.to = iq.from
       reply.type = :result
-      reply.add(Jabber::IqQuery::new)
       
-      send(reply) if iq.type != :error
+      send!(reply) if iq.type != :error
     end
   end
   

data/lib/component_connection.rb

@@ -1,9 +1,5 @@
 module C3s
-  class ComponentConnection
-    ##
-    # The configuration file
-    CONFIG_FILE = "component.yml"
-    
+  class ComponentConnection    
     def initialize(componentclass, options={})
       @no_db = options[:no_db]
       if !componentclass.superclass.eql?(C3s::Component)
@@ -11,8 +7,8 @@ module C3s
         exit
       end
       
-      reader = C3s::ConfigReader.new(CONFIG_FILE, options)
-      puts "Reading configurations from '#{CONFIG_FILE}'..."
+      reader = C3s::ConfigReader.new(options)
+      puts "Reading configurations from yaml file..."
       @server_config = reader.section('server')
       @client_config = reader.section('client')
       
@@ -37,12 +33,12 @@ module C3s
           exit
         end
       end
-      connect()
+      connect
     end
     
     def connect
       puts "Connecting to #{@server_config['url']} (port #{@server_config['port']})..."
-      
+            
       begin
         @component.connect
       rescue Jabber::ComponentAuthenticationFailure => e
@@ -52,20 +48,22 @@ module C3s
         puts "Connection refused on #{@server_config['url']} (port #{@server_config['port']})"
         exit
       rescue Exception => e
-        puts "Error do fim do mundo!"
-        puts e.message
+        puts "ERROR: Couldn't connect to server!"
+        $LOG.error "Couldn't connect to server!"
         exit
       end
       puts "External component #{@client_config['jid']} connected successfully."
       
+      # TODO - never used?!
       @component.on_exception do |e, component, where|
-        $LOG.error "FATAL ERROR"
+        $LOG.error "**************FATAL ERROR"
         $LOG.error e.message
         $LOG.error e.backtrace.join("\n")
+        exit
       end
       
       puts "Starting messaging loop..."
-      @component.start()
+      @component.start
     end
     
     def self.stop

data/lib/configreader.rb

@@ -6,11 +6,12 @@ module C3s
   SECTIONS = ['client', 'server', 'db']
   
   class ConfigReader
+    
     ##
     # Reads the configuration file
-    # file::[String] the configuration file
-    def initialize(file, options={})
-      @config = YAML::load_file(File.join(file))
+    def initialize(options={})
+      config_file = File.join(C3S_COMPONENT_DIR, 'component.yml')
+      @config = YAML::load_file(config_file)
 
       SECTIONS.delete('db') if options[:no_db]
       check_config

data/lib/databaseadapter.rb

@@ -3,15 +3,18 @@ require 'active_record'
 module C3s
   class DatabaseAdapter
     def initialize(config)
+      log_file = File.join(C3S_LOG_DIR, "database.log")
+      db_file = File.join(C3S_COMPONENT_DIR, config['database'])
+      
       ActiveRecord::Base.colorize_logging = false
-      ActiveRecord::Base.logger = Logger.new(File.open('logs/database.log', 'a'))
+      ActiveRecord::Base.logger = Logger.new(File.open(log_file, 'a'))
       
       ActiveRecord::Base.establish_connection(
         :adapter  => config['adapter'],
         :host     => config['host'],
         :username => config['username'],
         :password => config['password'],
-        :database => config['database'],
+        :database => db_file, # TODO works only for sqlite3 dbs!
         :encoding => config['encoding']
       )
     end

data/lib/pubsub/node.rb

@@ -0,0 +1,47 @@
+module C3s
+  class Node
+    PATTERN = /^(?:([^@\/:]*):?)?(?:([^@]*)@)??([^@\/]*)(?:\/(.*?))?$/
+    
+    attr_reader :jid
+    attr_accessor :provider
+    
+    ##
+    # Create a new c3s pubsub node. If called as new('provider:jid') or
+    # new('provider:jid/resource') parse the string and split (provider, jid, resource)
+    def initialize(provider = "", jid = nil)
+      @jid = jid
+      @provider = provider
+      
+      if @jid.nil? and @provider
+        @provider, @node, @domain, @resource = @provider.to_s.scan(PATTERN).first
+        @jid = Jabber::JID.new(@node, @domain, @resource)
+      end
+      
+      @provider.downcase! if @provider
+    end
+    
+    ##
+    # Returns a string representation of the node
+    # * ""
+    # * "provider"
+    # * "provider:user@domain"
+    # * "provider:user@domain/resource"
+    def to_s
+      s = @provider
+      s = "#{s}:#{@jid.to_s}" if @jid
+    end
+    
+    ##
+    # Returns the resource for this node
+    def resource
+      return nil unless @jid
+      @jid.resource
+    end
+    
+    ##
+    # Checks if a node is a leaf node on c3s pubsub
+    def leaf?
+      resource ? true : false
+    end
+  end
+end

data/lib/pubsub/publisher.rb

@@ -0,0 +1,118 @@
+require 'xmpp4r/pubsub'
+require 'pubsub/nodetracker'
+
+module C3s
+  class Publisher 
+    ##
+    # Initializes the publisher
+    # client:: [Jabber::Client] the client publishing
+    # service:: [String] pubsub service name (eg: pubsub.jabber)
+    def initialize(client, service_name)
+      @client = client
+      @service = service_name
+      @pubsub = Jabber::PubSub::ServiceHelper.new(@client, @service)
+    end
+    
+    ##
+    # Creates the collection node(s) and leaf node if needed
+    # nodetree:: [String] node tree (eg: location:user@jabber.com/resource)
+    def create_nodes(nodetree)
+      nodes = nodetree.split(":")
+      
+      # build array like this one:
+      # ['location', 'user@jabber.com', 'user@jabber.com/resource']
+      nodes.insert(1, nodes.last.split("/").first)
+      
+      collection = nodes.shift # collection (eg: location)
+      subcollection = "#{collection}:#{nodes.shift}" # subcollection (eg: location:user@jabber.com)
+      leaf = "#{collection}:#{nodes.shift}" # leaf node name (eg: location:user@jabber.com/resource)
+      leaf << "/default" unless leaf.match(/.*\/.*/)
+      
+      # create nodes
+      create_node(collection, {:collection => true})
+      create_node(subcollection, {:father => collection, :collection => true})
+      create_node(leaf, {:father => subcollection, :collection => false})
+    end
+    
+    ##
+    # Creates a pubsub node
+    # nodename:: [String] the node name
+    # options:: [Hash] hash with options. These can be:
+    # * :collection => true or false
+    # * :father => the father node or nil if its root
+    def create_node(nodename, options={})
+      return if node_exists?(nodename)
+      config = Jabber::PubSub::NodeConfig.new
+      
+      if options[:father]
+        config.options = config.options.merge({'pubsub#collection' => options[:father]})
+      end
+      
+      if options[:collection]
+        node = create_collection_node(nodename, config)
+      else
+        node = create_leaf_node(nodename, config)
+      end
+      
+      # grant owner to admin user (eg: admin@jabber.com)
+      grant_owner_to_admin(node)
+    end
+    
+    ##
+    # Creates the collection node if needed
+    # name:: [String] collection node name
+    # config:: [PubSub::NodeConfig] node configuration
+    def create_collection_node(name, config)
+      $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
+    
+    ##
+    # Creates a leaf node to publish if needed
+    # This node must be associated with the collection node
+    # name:: [String] the name of the leaf node
+    # config:: [PubSub::NodeConfig] node configuration
+    def create_leaf_node(name, config)
+      $LOG.debug("Creating leaf node #{name}")
+      $LOG.debug("Node config: #{config.options.inspect}")
+      return if node_exists?(name)
+      node = @pubsub.create_node(name, config)
+    end
+    
+    def grant_owner_to_admin(node)
+      return unless node
+      @pubsub.set_affiliations(node, "admin@#{@client.config['url']}", 'owner')
+    end
+    
+    ##
+    # Publishes content to the leaf node
+    # node:: [String] the node to plublish to
+    # content:: [REXML::Element] content xml to publish into node
+    def publish(node, content)
+      item = Jabber::PubSub::Item.new
+      item.add(content)
+      
+      node << "/default" unless node.match(/.*\/.*/)
+      node = [@client.config['name'], node].join(":")
+      @pubsub.publish_item_to(node, item)
+    end
+
+    ##
+    # Checks for existance of a node with a given name. This
+    # node can be a leaf or a collection
+    # name:: [String] the node name
+    def node_exists?(name)
+      return true if NodeTracker.include?(name)
+      nodebrowser = Jabber::PubSub::NodeBrowser.new(@client)
+      nodebrowser.get_info(@service, name)
+      # TODO this could be used instead
+      # nodebrowser.nodes(@client.jid).include?(name)
+      NodeTracker.add_node(name)
+      true
+    rescue Jabber::ServerError => error
+      return false if error.to_s.include?("item-not-found")
+    end
+  end
+end

data/lib/pubsub/subscriber.rb

@@ -0,0 +1,52 @@
+require 'xmpp4r/pubsub'
+require 'pubsub/nodetracker'
+
+module C3s
+  class Subscriber
+    ##
+    # Initializes the publisher
+    # client:: [Jabber::Client] the client publishing
+    # service:: [String] pubsub service name (eg: pubsub.jabber)
+    def initialize(client, service_name)
+      @client = client
+      @service = service_name
+      @pubsub = Jabber::PubSub::ServiceHelper.new(@client, @service)
+      @browser = Jabber::PubSub::NodeBrowser.new(@client)
+    end
+    
+    ##
+    # Subscribes to collection node.
+    # nodename:: [String] the node name
+    def subscribe_collection(nodename)
+      return if !is_collection?(nodename)
+      subscription = @pubsub.subscribe_to(nodename)
+      options = {
+        'pubsub#subscription_type' => 'items',
+        'pubsub#subscription_depth' => 'all'
+      }
+      @pubsub.set_options_for(nodename, @client.jid, options, subscription.subid)
+    end
+    
+    ##
+    # Unsubscribe node
+    # nodename:: [String] the node name
+    def unsubscribe_from(nodename)
+      @pubsub.unsubscribe_from(nodename)
+    end
+    
+    ##
+    # Checks if a node is a collection node
+    # nodename:: [String] the node name
+    def is_collection?(nodename)
+      info = @browser.get_info(@service, nodename)
+      info['type'].eql?('collection')
+    end
+    
+    ##
+    # Returns the last item from a node. This node must be a leaf node.
+    # nodename:: [String] the node name
+    def get_last_item(nodename)
+      @pubsub.get_items_from(nodename, 1)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: c3s
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ricardo Otero
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 +00:00
+date: 2010-02-11 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -28,13 +28,15 @@ extra_rdoc_files:
 - lib/configreader.rb
 - lib/databaseadapter.rb
 - lib/model.rb
-- lib/nodetracker.rb
-- lib/publisher.rb
+- lib/pubsub/node.rb
+- lib/pubsub/nodetracker.rb
+- lib/pubsub/publisher.rb
+- lib/pubsub/subscriber.rb
 files: 
 - Manifest
 - README.rdoc
 - Rakefile
-- c3s.gemspec
+- c3s
 - lib/c3s.rb
 - lib/c3s_logger.rb
 - lib/component.rb
@@ -42,8 +44,11 @@ files:
 - lib/configreader.rb
 - lib/databaseadapter.rb
 - lib/model.rb
-- lib/nodetracker.rb
-- lib/publisher.rb
+- lib/pubsub/node.rb
+- lib/pubsub/nodetracker.rb
+- lib/pubsub/publisher.rb
+- lib/pubsub/subscriber.rb
+- c3s.gemspec
 has_rdoc: true
 homepage: http://github.com/rikas/c3s
 licenses: []

data/lib/publisher.rb

@@ -1,95 +0,0 @@
-require 'xmpp4r/pubsub'
-require 'nodetracker'
-
-module C3s
-  class Publisher 
-    ##
-    # Initializes the publisher
-    # client:: [Jabber::Client] the client publishing
-    # service:: [String] pubsub service name (eg: pubsub.jabber)
-    def initialize(client, service_name)
-      @client = client
-      @service = service_name
-      @pubsub = Jabber::PubSub::ServiceHelper.new(@client, @service)
-    end
-    
-    ##
-    # Creates the collection node(s) and leaf node if needed
-    # nodetree:: [String] node tree (eg: /location/user@jabber.com)
-    def create_nodes(nodetree)
-      nodes = nodetree.split("/")
-      nodes.delete("")
-      
-      # all nodes except the last are assumed as collection nodes
-      last_collection = nil
-      nodes[0..nodes.size-2].each do |name|
-        create_collection_node(name) if !node_exists?(name)
-        last_collection = name
-      end
-      
-      # last node is assumed as a leaf node
-      leaf = nodetree[1..nodetree.size-1] if nodetree[0..0].eql?"/"
-      leaf.gsub!("/", ":")
-      create_leaf_node(leaf, last_collection) if !node_exists?(leaf)
-    end
-    
-    ##
-    # Creates the collection node if needed
-    # name:: [String] collection node name
-    def create_collection_node(name)
-      config = Jabber::PubSub::NodeConfig.new
-      node = @pubsub.create_collection_node(name, config)
-      grant_owner_to_admin(node)
-    end
-    
-    ##
-    # Creates a leaf node to publish if needed
-    # This node must be associated with the collection node
-    # name:: [String] the name of the leaf node
-    # collection:: [String] the collection node that contains the node
-    def create_leaf_node(name, collection)
-      config = Jabber::PubSub::NodeConfig.new
-      config.options = config.options.merge({'pubsub#collection' => collection})
-      node = @pubsub.create_node(name, config)
-      grant_owner_to_admin(node)
-    end
-    
-    def grant_owner_to_admin(node)
-      return unless node
-      @pubsub.set_affiliations(node, "admin@#{@client.config['url']}", 'owner')
-    end
-    
-    ##
-    # Publishes content to the leaf node
-    # node:: [String] the node to plublish to
-    # content:: [REXML::Element] content xml to publish into node
-    def publish(node, content)
-      item = Jabber::PubSub::Item.new
-      item.add(content)
-      node = [@client.config['name'], node].join(":")
-      @pubsub.publish_item_to(node, item)
-    end
-    
-    def fix_permissions
-      nodebrowser = Jabber::PubSub::NodeBrowser.new(@client)
-      nodes = nodebrowser.nodes_names(@service)
-      nodes.each do |node|
-        grant_owner_to_admin(node['node'])
-      end
-    end
-
-    ##
-    # Checks for existance of a node with a given name. This
-    # node can be a leaf or a collection
-    # name:: [String] the node name
-    def node_exists?(name)
-      return true if NodeTracker.include?(name)
-      nodebrowser = Jabber::PubSub::NodeBrowser.new(@client)
-      nodebrowser.get_info(@service, name)
-      NodeTracker.add_node(name)
-      true
-    rescue Jabber::ServerError => error
-      return false if error.to_s.include?("item-not-found")
-    end
-  end
-end