simplepubsub 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 626fcee6f8e26aa37b762038a1ba3d5efdb5da29
-  data.tar.gz: 342869bcb6244aedf9ab02d4f426f152d975cb0c
+  metadata.gz: a2214fa2f3b252ab64e52061e6aada2fee996510
+  data.tar.gz: 6ec485dc699141d8d37f2648f4efde55abb7ff80
 SHA512:
-  metadata.gz: 435d8f8ab1b9ce32e172ad838742ec367129e01f6af376e8c96b22d7fa71083740041a8d23150598e6e832042d2d5e94e2677f1ff31ee59a5732e6e9acc70186
-  data.tar.gz: 087c66b65bc5a9b322023eaf3d211f8d27c74d5de627af8e57a68e6b6d81f732e69495719aa0d218b386cae66668aa4da1d50cf651632f9e24d8ae20c17e4b70
+  metadata.gz: 077aec88f5af2dc1e86369f60404185dfda397d74d11e1026daa905a5dd5e78f45d03ccd1e8ee18a865c286763e46334a44e2138d13a9ab925f0643143296471
+  data.tar.gz: a61df4f17cabf07785dd2867fc4061955eef86303e3dc570b750617fead67bd1161cb70c1c9934597a56f2707dccacaed8dc1845cf2360b744faa5c796bb7a4c

data/lib/simplepubsub.rb

@@ -7,7 +7,7 @@ require 'drb'
 require 'dws-registry'
 require 'socket'
 
-USER_AGENT = 'SimplePubSub client 0.4'
+USER_AGENT = 'SimplePubSub client 0.5'
 
 module SimplePubSub
 
@@ -70,49 +70,39 @@ module SimplePubSub
     def initialize(raw_reg='simplepubsub.xml')
 
 
-      h = {DWSRegistry: ->{raw_reg}, String: ->{DWSRegistry.new raw_reg}}
+      h = {DWSRegistry: ->{raw_reg}, String: ->{DWSRegistry.new raw_reg},:'RSC::Package' => ->{raw_reg}}
 
       @reg = h[raw_reg.class.to_s.to_sym].call
+      
+      doc = Rexle.new(@reg.xml('hkey_apps/simplepubsub'))
 
+      root = doc.root
       # try to read the subscribers
-      topics = @reg.get_key 'hkey_apps/simplepubsub/subscription_topics'
-      
+      topics = root.xpath 'subscription_topics/*'
+
       @hostname = Socket.gethostname
       @subscribers, @bridges = {'#' => []}, {'#' => {}}     
             
-      if topics then
-        topics.elements.each do |topic_element|
-          topic = topic_element.name
-          @subscribers[topic] ||= []
-          @subscribers[topic] = topic_element.elements[0].elements.map(&:value)
-        end
-      end      
-
-      
-      all_topics = @reg.get_key 'hkey_apps/simplepubsub/subscription_all_topics'
+      topics.each do |topic_element|
+        topic = topic_element.name
+        @subscribers[topic] ||= []
+        @subscribers[topic] = topic_element.xpath 'subscribers/*/text()'
+      end
 
-      if all_topics then
-        @subscribers['#'] = all_topics.elements[0].elements.map(&:value)
-      end                        
-      
+      @subscribers['#'] = root.xpath 'subscription_all_topics' + \
+          '/subscribers/*/text()'                            
 
-      bridge_topics = @reg.get_key 'hkey_apps/simplepubsub/bridge_topics'               
-            
-      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
+      root.xpath('bridge_topics/*').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
 
-      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
+      @bridges['#'] = root.xpath('bridge_all_topics/subscribers/*')
+          .inject({}) do |r,x|
+        r.merge({x.name.to_s => x.text('address')})
       end
       'done'
     end

metadata

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