simplepubsub 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c6e71936113e7c6809d833f169db2c7c7650df5
-  data.tar.gz: d6f910581d9eec557b010b5e143663eae7104f6e
+  metadata.gz: e0375d7b69444d6c22a7ce555ed8009af1d837eb
+  data.tar.gz: f1ab4dc41fcfa2bf7db9dce8223c4f26755b53f0
 SHA512:
-  metadata.gz: 2ab5350b0ffd45933731bc231baa24569d7d8f25fbad9d6d18adaf70ee19bc10ecd6b8b53100ef5cfcc2685660086340ff60741b637a37e809eae7e1bcd4a231
-  data.tar.gz: eb9f27007292a36c67937939db5b268b88e8ef428d6b73713c1ac4520495df4b34cf4d28bd522c8167d1f0aa8d76353f26b4f4f086f18e733a0184fe3d41af77
+  metadata.gz: 112e3b99b33bebb463961e5299df7e12b4f807eaa403b4e1a79657eb24c1f67acd1d75daef826c26475a59189268d9d1a83e78c2959c10e4dccea573bea2f7b4
+  data.tar.gz: cbfd16c7036aa3325b475cf7784e19710aff59c89dddc886a2d77b40d8a6690daa9d4ca23ff31caec0bba03c64c77f1ef8ab24bbd9eb07285f26c503b7d9a6e6

checksums.yaml.gz.sig

@@ -1 +1 @@
-���v�z�%\A�!��#F��)jH`��rr�b���D3X@�<`��䫇��5�fW�����؆n߶)��&a��=�OF�R�SA稥��TЙ��o�8]?~�æ�R"o_��#�Il�E�����9��W8p���(Ju;�=��ahx��m�#
+�h����"Қ�w�4������~6e���)à����V[��Rs`Eg������L({P0��
`r�n�Ǫ����Na�1j
Wt��Delu�����/Mi��Gȸb)������DYZ��~���

data.tar.gz.sig

@@ -1,3 +1 @@
-!��UT�!c&�\^��F/�9y�0�׌�#<8S��}uT��X����˄��������Z�`qD����k
-0V�ȑ�G>�aE�xgV��Nj͸�!�7K&K�Z&W�w���#�xN��
-�F9^Iv�B���
+Y�8���(�8V�SG	�[��̎}�1��EG��<(�XM��a�/�~�+
+/���u��cW֭u�g�v�2*�"��&~����<"M

data/lib/simplepubsub.rb

@@ -41,23 +41,25 @@ module SimplePubSub
               subscribers[topic] ||= []
               subscribers[topic] << ws
 
-              def ws.subscriber?() 
-                true
-              end
+              def ws.subscriber_topic=(topic)  @topic = topic     end
+              def ws.subscriber_topic()  @topic                   end
+
+              ws.subscriber_topic = topic
 
             elsif a.length > 1
 
               puts "publish this %s: %s" % a
               topic, message = a
 
-              if subscribers[topic] and subscribers[topic].any? then
+              if subscribers[topic] then
+                subscribers[topic].each {|c| c.send topic + ': ' + message }
+              end
 
-                connections = subscribers[topic]
-                connections += subscribers['#'] if subscribers['#']
-                connections.each {|c| c.send topic + ': ' + message }
+              if subscribers['#'] then
+                subscribers['#'].each {|c| c.send topic + ': ' + message }
               end
 
-              ws.send msg, :type => type
+              #ws.send msg, :type => type
 
             end
 
@@ -65,7 +67,9 @@ module SimplePubSub
 
           ws.onclose do
             puts "Client disconnected"
-            subscribers[topic].delete ws if ws.subscriber?
+            if ws.respond_to? :subscriber_topic then
+              subscribers[ws.subscriber_topic].delete ws 
+            end
           end
         end
 
@@ -97,7 +101,7 @@ module SimplePubSub
       pubsub = PubSub.new
       yield(pubsub)
 
-      blk = lambda do |ws, em_already_running|
+      blk = lambda do |ws, pubsub, em_already_running|
 
         ws.onopen do
           puts "Connected"
@@ -130,12 +134,12 @@ module SimplePubSub
         # attempt to run a websocket assuming the EventMachine is 
         #   already running
         ws = c.connect(params)
-        blk.call ws, em_already_running = true
+        blk.call ws, pubsub, em_already_running = true
       rescue
 
         EM.run do 
           ws = c.connect(params)
-          blk.call(ws, em_already_running = false)
+          blk.call(ws, pubsub, em_already_running = false)
         end
       end
 

metadata

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

metadata.gz.sig

@@ -1 +1 @@
-T�OL��f��
��d�i?�#%���s�q{ݯ+���Y��;�i�Rip;�'����,������u��g:D꓁{wW�
+�G_��u!�7U35ԍN�YZÇ!؜��c��hysҢ�Q��@����9�l$��	�<Ε�7:Qp�U��gr��x{����n֓u�����`�PS�{���������GM����F��aU�{���(�`.�ťdO��ͺ�.�A�@�rm���}?�px�Մ=�Zu�W�_�g���܅T�a��L��r�t�31n�b��C+�F��4 ��g��m���� ,oK-���‘��"�I��2B5��Lb�R��