simplepubsub 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bcf845ea9121b3f64cfa371a9848290a3e96b12
-  data.tar.gz: 983d1e48ec5d9a4298ac917a3d4f6b48d6162f65
+  metadata.gz: cb9c522f87754fb3b35dc8beabcdae04ac78e1ca
+  data.tar.gz: f36a883a542bfe73c180a51e279983fff2ae88d6
 SHA512:
-  metadata.gz: f901f2ae9edcae7ebca6105706a21a706b37d3fa29d4437e21f3ce5104c1714aca0932deb2016d8befd62f613abbdde658ac6e0b71f8033db38ed712dce6cad1
-  data.tar.gz: 1d724b8c5fcea4debe992c8b79ca5124c23644118ff258b2f446137f7f7c1d0d6fed840b0ae2920641a84d857b3bb3f3ae442c26cc69a21b4c21e615d3e7e4c2
+  metadata.gz: 11d4d4e480eb0edde819cc69fd8b98496ef6ccd013ef3d0212c56b795f92e711bc61de51c68f2d2f80a36dde69dbcdc10dfe1becd2d5cbfb406292095a3324d7
+  data.tar.gz: ac85bf1eb757ac9ec648e791e2e4f8b7d7f127954775d21b25d2836f99b0d3d2730b8b5636f37e12dbd838ff1952590fc776a2fb6da5431d9be4c5b69a60ca64

data/lib/simplepubsub.rb

@@ -7,7 +7,7 @@ require 'drb'
 require 'dws-registry'
 
 
-USER_AGENT = 'SimplePubSub client 0.3.1'
+USER_AGENT = 'SimplePubSub client 0.3.2'
 
 module SimplePubSub
 
@@ -67,7 +67,8 @@ module SimplePubSub
       # try to read the subscribers
       topics = @reg.get_key 'hkey_apps/simplepubsub/subscription_topics'
       
-      @subscribers = {'#' => []}     
+      @hostname = hostname
+      @subscribers, @bridges = {'#' => []}, {'#' => {}}     
             
       if topics then
         topics.elements.each do |topic_element|
@@ -76,10 +77,34 @@ module SimplePubSub
           @subscribers[topic] = topic_element.elements[0].elements.map(&:value)
         end
       end      
+
+      
+      all_topics = @reg.get_key 'hkey_apps/simplepubsub/subscription_all_topics'
+
+      if all_topics then
+        @subscribers['#'] = all_topics.elements[0].elements.map(&:value)
+      end                        
+      
+
+      bridge_topics = @reg.get_key 'hkey_apps/simplepubsub/bridge_topics'               
             
-      @hostname = hostname
+      if bridge_topics then
+        bridge_topics.elements.each do |topic_element|
+          topic = topic_element.name
+          @bridges[topic] = topic_element.elements[0].elements.inject({}) do |r,x|
+            r.merge({x.name.to_s => x.text('address')})
+          end
+        end
+      end
 
-      @bridges = {'#' => []}
+      bridge_all_topics = @reg.get_key 'hkey_apps/simplepubsub/bridge_all_topics'
+
+      if bridge_all_topics then
+        @bridges['#'] = bridge_all_topics.elements[0].elements.inject({}) do |r,x|
+          r.merge({x.name.to_s => x.text('address')})
+        end
+      end
+      'done'
     end
     
     def subscribe(topic, uri)
@@ -119,10 +144,19 @@ module SimplePubSub
           begin
             echo.message topic, msg
           rescue DRb::DRbConnError => e             
+            
             @subscribers[topic].delete uri
-            key = "hkey_apps/simplepubsub/subscription_topics/%s/subscribers/%s" % \
-                [topic, uri[/[^\/]+$/].sub(':','')]
+            
+            if @subscribers[topic].empty? then
+              @subscribers.delete topic 
+              key = "hkey_apps/simplepubsub/subscription_topics/%s" % [topic]
+            else
+              key = "hkey_apps/simplepubsub/subscription_topics/%s/subscribers/%s" % \
+                  [topic, uri[/[^\/]+$/].sub(':','')]              
+            end
+            
             @reg.delete_key key
+            
           end          
           
         end
@@ -134,16 +168,48 @@ module SimplePubSub
         
         begin
           echo.message topic, msg
-        rescue DRb::DRbConnError => e             
+        rescue DRb::DRbConnError => e
+          
           @subscribers['#'].delete uri
+          key = "hkey_apps/simplepubsub/subscription_all_topics/subscribers/%s" % \
+                [uri[/[^\/]+$/].sub(':','')]         
+          @reg.delete_key key          
         end          
 
       end
     end
     
     def add_bridge(topic, hostname, address)
-      @bridges[topic] ||= {}
-      @bridges[topic].merge!(hostname => address)
+      
+      if topic == '#' then
+
+        key = "hkey_apps/simplepubsub/bridge_all_topics/webserver/%s/address" % \
+            [hostname]        
+      else
+        topic.sub!('/','_')
+        @bridges[topic] ||= {}
+
+        key = "hkey_apps/simplepubsub/bridge_topics/%s/webserver/%s/address" % \
+            [topic, hostname]
+      end
+      
+      @bridges[topic].merge!(hostname => address)      
+      @reg.set_key key, address    
+    end
+    
+    def delete_bridge(topic, hostname)
+      
+      @bridges[topic].delete hostname
+      
+      if @bridges[topic].empty? and topic != '#' then        
+        @bridges.delete_key(topic)
+        key = "hkey_apps/simplepubsub/bridge_topics/%s" % [topic]
+      else
+        key = "hkey_apps/simplepubsub/bridge_topics/%s/webserver/%s/address" % \
+            [topic, hostname]                
+      end
+      
+      @reg.delete_key key      
     end
     
     def bridge_deliver(topic, message, excluded_host=nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplepubsub
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   i0PBE6fLwlIMk8jNNUcX3J1csSMgLNTwE8CwrlSZE8sueHj0pQzICM7lF0gGREO6
   hQHD0LljU3MusQ==
   -----END CERTIFICATE-----
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dws-registry