simplepubsub 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a2ebdb4745d554e759c762bec5a725dc9133bd5
-  data.tar.gz: 5345a4d9741104cc47a2f17c8ca94e19d8e76057
+  metadata.gz: 6c6e71936113e7c6809d833f169db2c7c7650df5
+  data.tar.gz: d6f910581d9eec557b010b5e143663eae7104f6e
 SHA512:
-  metadata.gz: 39e3993b0ea25c2ef5122216963b8c867771f9dee266933733c6ca37cd9a1bec645ef6a6e9143084f4398c90aefd2f2d88e07c82a91c32fe622bd7393c5b1cb6
-  data.tar.gz: 74b44f7215feea756bede94891f4f1727f01e189a0f34b04a91aa3bb5eacdd1210d5d45c1448859487e70d53d7042d373e5b150fbd0be6c315b8b17ef83d07a1
+  metadata.gz: 2ab5350b0ffd45933731bc231baa24569d7d8f25fbad9d6d18adaf70ee19bc10ecd6b8b53100ef5cfcc2685660086340ff60741b637a37e809eae7e1bcd4a231
+  data.tar.gz: eb9f27007292a36c67937939db5b268b88e8ef428d6b73713c1ac4520495df4b34cf4d28bd522c8167d1f0aa8d76353f26b4f4f086f18e733a0184fe3d41af77

data/lib/simplepubsub.rb

@@ -30,12 +30,20 @@ module SimplePubSub
             puts "Received message: #{msg}"
 
             a = msg.split(/\s*:\s*/,2)
+
+            def ws.subscriber?() 
+              false
+            end
            
             if a.first == 'subscribe to topic' then
 
               topic = a.last.rstrip
               subscribers[topic] ||= []
-              subscribers[topic] << ws 
+              subscribers[topic] << ws
+
+              def ws.subscriber?() 
+                true
+              end
 
             elsif a.length > 1
 
@@ -49,7 +57,7 @@ module SimplePubSub
                 connections.each {|c| c.send topic + ': ' + message }
               end
 
-            ws.send msg, :type => type
+              ws.send msg, :type => type
 
             end
 
@@ -57,6 +65,7 @@ module SimplePubSub
 
           ws.onclose do
             puts "Client disconnected"
+            subscribers[topic].delete ws if ws.subscriber?
           end
         end
 
@@ -88,11 +97,7 @@ module SimplePubSub
       pubsub = PubSub.new
       yield(pubsub)
 
-      EM.run do
-
-        address = hostname + ':' + port
-
-        ws = WebSocket::EventMachine::Client.connect(:uri => 'ws://' + address)
+      blk = lambda do |ws, em_already_running|
 
         ws.onopen do
           puts "Connected"
@@ -103,7 +108,7 @@ module SimplePubSub
           a = msg.split(/\s*:\s*/,2)
           topic, message = a
           r = pubsub.proc.call topic, message
-          (ws.close; EM.stop) if r == :stop
+          (ws.close; EM.stop) if r == :stop and em_already_running == false
         end
 
         ws.onclose do
@@ -114,8 +119,26 @@ module SimplePubSub
           ws.send pubsub.topic + ': ' + pubsub.message
         end
 
+      end
+
+      address = hostname + ':' + port
+      params = {uri: 'ws://' + address}
+      c = WebSocket::EventMachine::Client
+
+      begin
 
+        # attempt to run a websocket assuming the EventMachine is 
+        #   already running
+        ws = c.connect(params)
+        blk.call ws, em_already_running = true
+      rescue
+
+        EM.run do 
+          ws = c.connect(params)
+          blk.call(ws, em_already_running = false)
+        end
       end
+
     end    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplepubsub
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - James Robertson