simplepubsub 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d900a96af9a7e45304f1cf25193a619b6a09ea69
-  data.tar.gz: 074182bcf709b23c432b45a1298f17d7eee8433f
+  metadata.gz: 7a2ebdb4745d554e759c762bec5a725dc9133bd5
+  data.tar.gz: 5345a4d9741104cc47a2f17c8ca94e19d8e76057
 SHA512:
-  metadata.gz: 43fcd46034de9636033bf24ae6e40746201d547f8582b80d2f02232f112ba202c5701768b51787220525293505ed7d7d4979ff29e0ba2a466e2dadbee2c56369
-  data.tar.gz: 316b94f9395578f798b72eabc7a7aedf4aac58e18e8d9bfdd7a29db835af04bba166ed95f205a90380988ac26bb4de0fda566681dec31df764ca4d4bb8ebfe0a
+  metadata.gz: 39e3993b0ea25c2ef5122216963b8c867771f9dee266933733c6ca37cd9a1bec645ef6a6e9143084f4398c90aefd2f2d88e07c82a91c32fe622bd7393c5b1cb6
+  data.tar.gz: 74b44f7215feea756bede94891f4f1727f01e189a0f34b04a91aa3bb5eacdd1210d5d45c1448859487e70d53d7042d373e5b150fbd0be6c315b8b17ef83d07a1

data/lib/simplepubsub.rb

@@ -33,7 +33,7 @@ module SimplePubSub
            
             if a.first == 'subscribe to topic' then
 
-              topic = a.last
+              topic = a.last.rstrip
               subscribers[topic] ||= []
               subscribers[topic] << ws 
 
@@ -46,12 +46,13 @@ module SimplePubSub
 
                 connections = subscribers[topic]
                 connections += subscribers['#'] if subscribers['#']
-                connections.each {|c| c.send message }
+                connections.each {|c| c.send topic + ': ' + message }
               end
 
+            ws.send msg, :type => type
+
             end
 
-            ws.send msg, :type => type
           end
 
           ws.onclose do
@@ -99,7 +100,7 @@ module SimplePubSub
 
         ws.onmessage do |msg, type|
 
-          a = msg.split(/\s*,\s*/,2)
+          a = msg.split(/\s*:\s*/,2)
           topic, message = a
           r = pubsub.proc.call topic, message
           (ws.close; EM.stop) if r == :stop
@@ -121,7 +122,22 @@ end
 
 if __FILE__ == $0 then
 
-  # Subscribe example
+  # Server example
   SimplePubSub::Server.new.start
 
+=begin
+
+  # Subscribe example
+  SimplePubSub::Client.connect('localhost') do |client|
+    client.get('test') do |topic, message|
+      puts "#{topic}: #{message}"
+    end 
+  end
+
+  # Publish example
+  SimplePubSub::Client.connect('localhost') do |client|
+    client.publish('test', Time.now.to_s)
+  end
+
+=end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplepubsub
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   i0PBE6fLwlIMk8jNNUcX3J1csSMgLNTwE8CwrlSZE8sueHj0pQzICM7lF0gGREO6
   hQHD0LljU3MusQ==
   -----END CERTIFICATE-----
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-server