c3s 0.4.2 → 0.4.3a

data/Manifest

@@ -12,22 +12,4 @@ 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.2') do |p|
+Echoe.new('c3s', '0.4.3a') 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.2"
+  s.version = "0.4.3a"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ricardo Otero"]
-  s.date = %q{2010-09-27}
+  s.date = %q{2010-11-10}
   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"]

data/lib/c3s.rb

@@ -27,7 +27,7 @@ rescue Exception => e
 end
 
 module C3s
-  VERSION = "0.3.3"
+  VERSION = "0.4.3a"
   
   def self.included(base)
     base.extend ClassMethods

data/lib/component.rb

@@ -125,12 +125,17 @@ module C3s
       end
 
       changed = true
-      object = self.model.find_by_jid(data[:jid]) || self.model.new
+      if self.is_a?(ActiveRecord::Base)
+        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!
+        $LOG.info "Saving #{config['name']} context for #{data[:jid]} #{data.inspect}"
+        object.update_attributes(data)
+        changed = object.changed?
+        object.save!
+      else
+        object = self.model.new
+        object.update_attributes(data)
+      end
       
       if object.errors.count == 0
         $LOG.info "Publishing data to node #{config['name']}:#{data[:jid]} (data changed: #{changed})"

data/lib/model.rb

@@ -1,10 +1,44 @@
 require 'active_record'
 
 module C3sModel
+  def self.included(base)
+    if !base.ancestors.include?(ActiveRecord::Base)
+      base.class_eval do
+        cattr_accessor :attrs
+        def attributes
+          attr_hash = {}
+          attrs.each do |a|
+            attr_hash[a.to_s] = self.send(a.to_s) if self.respond_to?(a.to_s)
+          end
+          attr_hash
+        end
+        
+        def attributes=(att, guard_protected_attributes)
+          att.each do |key, val|
+            self.attrs << key.to_s
+            self.send("#{key.to_s}=", val) if self.respond_to?(key.to_s)
+          end
+        end
+      end
+    end
+    base.extend(ClassMethods)
+  end
+  
+  module ClassMethods
+    def attribute(attribute)
+      self.attrs ||= []
+      self.attrs << attribute.to_s
+      attr_accessor attribute
+    end
+  end
+  
   ##
   # Attributes ignored and not included on model xml by default
   IGNORE_ATTR = ["created_at", "updated_at", "id", "jid"]
   
+  def is_AR?
+  end
+  
   ##
   # Updates multiple attributes at once
   # attributes:: [Hash] the attributes hash
@@ -57,6 +91,6 @@ module C3sModel
   ##
   # Returns a default namespace based on class name
   def xmlns
-    "http://c3s.hng.av.it.pt/#{self._class_name}"
+    "http://c3s.av.it.pt/#{self._class_name}"
   end
 end

data/lib/pubsub/subscriber.rb

@@ -1,4 +1,5 @@
 require 'xmpp4r/pubsub'
+require 'xmpp4r/pubsub/iq/pubsub'
 require 'pubsub/nodetracker'
 
 module C3s
@@ -15,16 +16,42 @@ module C3s
     end
     
     ##
-    # Subscribes to collection node.
+    # Subscribes to a collection node.
     # nodename:: [String] the node name
     def subscribe_collection(nodename, options={})
-      return if !is_collection?(nodename)
-      subscription = @pubsub.subscribe_to(nodename)
+      $LOG.info "Going to subscribe #{nodename}"
+      iq = basic_pubsub_query(:set)
+      sub = REXML::Element.new('subscribe')
+      sub.attributes['node'] = nodename
+      sub.attributes['jid'] = @client.config['jid']
+      iq.pubsub.add(sub)
+      
+      # Set the options to subscribe collection node
       options = {
         'pubsub#subscription_type' => options[:subscription_type] || 'items',
         'pubsub#subscription_depth' => options[:subscription_depth] || 'all'
       }
-      @pubsub.set_options_for(nodename, @client.jid, options, subscription.subid)
+      iq.pubsub.add(Jabber::PubSub::SubscriptionConfig.new(nodename, @client.jid, options))
+      
+      res = nil
+      @client.send_with_id(iq) do |reply|
+        pubsubanswer = reply.pubsub
+        if pubsubanswer.first_element('subscription')
+          res = PubSub::Subscription.import(pubsubanswer.first_element('subscription'))
+        end
+      end
+      res
+    end
+    
+    def basic_pubsub_query(type,ownerusecase = false)
+      iq = Jabber::Iq.new(type, @client.config['pubsub'])
+      if ownerusecase
+        iq.add(Jabber::PubSub::IqPubSubOwner.new)
+      else
+        iq.add(Jabber::PubSub::IqPubSub.new)
+      end
+      iq.from = @client.jid
+      iq
     end
     
     ##

data/lib/republisher.rb

@@ -12,6 +12,14 @@ module C3s
       super()
     end
     
+    ##
+    # When connects our republisher must subscribe nodes from which
+    # will receive context.
+    def connect
+      super
+      #subscribe_nodes()
+    end
+    
     ##
     # Block the set iqs because this provider doesn't receive iq's
     # directly to set the information.
@@ -27,50 +35,45 @@ module C3s
     
     ##
     # 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}"
+          $LOG.error "Could not subscribe to node #{node} (#{e.inspect})"
           next
         end
       end
     end
     
     ##
-    # Handles messages. This can be subscribe or unsubscribe messages
+    # Handles messages. I only deal with pubsub messages (publication notify)
     # and pubsub events (most likely).
+    # msg:: The message received
     def handle_msg(msg)
-      if msg.body.eql?("sub")
-        $LOG.info "Subscribing nodes: #{@subscribing_nodes.join(", ")}"
-        subscribe_nodes()
-      elsif msg.body.eql?("unsub")
-        @subscriber.unsubscribe_all
-      else
-        event = msg.first_element("event")
-        if event.kind_of?(Jabber::PubSub::Event)
-          event.each_element("//item/") do |item|
-            $LOG.debug("Received item from pubsub")
-            begin
-              c3snode = C3s::Node.new(item.attributes['node'])
-              next unless c3snode
-              $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
-            rescue Exception => e
-              $LOG.error "Error on published item: #{e}"
-            end
+      event = msg.first_element("event")
+      return if !event.kind_of?(Jabber::PubSub::Event)
+      event.each_element("//items/") do |items|
+        c3snode = C3s::Node.new(items.attributes['node'])
+        next unless c3snode
+        handle_items_publication(items)
+      end
+    end
+    
+    ##
+    # Handles the publicated items and the republishing on new node(s)
+    def handle_items_publication(items)
+      items.each_element("//item/") do |item|
+        begin
+          c3snode.provider = config['name'] # TODO - assuming that provider_name.eql?(pubsub_root_nodes)
+          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
+        rescue Exception => e
+          $LOG.error "Error on published item: #{e}"
         end
       end
     rescue Exception => e

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: c3s
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 3450203
+  prerelease: true
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3a
+  version: 0.4.3a
 platform: ruby
 authors: 
 - Ricardo Otero
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 +01:00
+date: 2010-11-10 00:00:00 +00:00
 default_executable: 
 dependencies: []