celluloid_pubsub 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f20d9bbd812fed2a19482a5d4f3451bc3f2e4260
-  data.tar.gz: da7fb4d8a9829821b93925d8cb8dc9187ee027a7
+  metadata.gz: 269b50c5760b451657e2203852797199925b3d98
+  data.tar.gz: aa6318fa2134008fa6750690223d3fa9f7ff07e9
 SHA512:
-  metadata.gz: b968c4769ab416975950a50958e5e8de65789207b497a0b36d28946cc9f44c37bcb1d7f38f92fe4c796e070858e79eb7da7c2ffd62a5167bb5c6ea18b9aa2443
-  data.tar.gz: 5f8ade42f08eb58f5c6d73acf53f723f017d271565f977a1810764f2a102a5e013a9a65c0642d8a756ebe0a506b43ac87a9ba971091d04a6337a556e1929f569
+  metadata.gz: 71114ae804ba8d00224a9fe1a831775c85ab9c6ac9a1af050f0dbb360c1e652cabcf6252f0c4eb32481d802b0c39efae22a8adfda43ee1ce7aa24b40efa7b38b
+  data.tar.gz: 4eacd46bd37575138ab7a8dff3272c8ebe25728aa9f48ed4bb379c9e0914f48c6b4fe2cbf53b1dbf1b5a9ed287db0e7c876b79593d7d2cdd85f2e3ade6184a26

data/lib/celluloid_pubsub/client_pubsub.rb

@@ -114,9 +114,7 @@ module CelluloidPubsub
       #
       # @api public
       def publish(channel, data)
-        publishing_data = { 'client_action' => 'publish', 'channel' => channel, 'data' => data }
-        debug(" #{self.class}  publishl to #{channel} message:  #{publishing_data}") if debug_enabled?
-        async.chat(publishing_data)
+        send_action('publish', channel, data)
       end
 
       # unsubscribes current client from a channel
@@ -127,9 +125,7 @@ module CelluloidPubsub
       #
       # @api public
       def unsubscribe(channel)
-        publishing_data = { 'client_action' => 'unsubscribe', 'channel' => channel }
-        debug(" #{self.class}  sends:  #{publishing_data}") if debug_enabled?
-        async.chat(publishing_data)
+        send_action('unsubscribe', channel)
       end
 
       # unsubscribes all clients subscribed to a channel
@@ -140,9 +136,7 @@ module CelluloidPubsub
       #
       # @api public
       def unsubscribe_clients(channel)
-        publishing_data = { 'client_action' => 'unsubscribe_clients', 'channel' => channel }
-        debug(" #{self.class}  sends:  #{publishing_data}") if debug_enabled?
-        async.chat(publishing_data)
+        send_action('unsubscribe_clients', channel)
       end
 
       # unsubscribes all clients from all channels
@@ -151,9 +145,7 @@ module CelluloidPubsub
       #
       # @api public
       def unsubscribe_all
-        publishing_data = { 'client_action' => 'unsubscribe_all' }
-        debug(" #{self.class}  sends:  #{publishing_data}") if debug_enabled?
-        async.chat(publishing_data)
+        send_action('unsubscribe_all')
       end
       #  callback executes after connection is opened and delegates action to actor
       #
@@ -199,6 +191,23 @@ module CelluloidPubsub
 
     private
 
+      # method used to send an action to the webserver reactor , to a chanel and with data
+      #
+      # @param [String] action
+      # @param [String] channel
+      # @param [Hash] data
+      #
+      # @return [void]
+      #
+      # @api private
+      def send_action(action, channel = nil, data = {})
+        publishing_data = { 'client_action' => action }
+        publishing_data = publishing_data.merge('channel' => channel) if channel.present?
+        publishing_data = publishing_data.merge('data' => data) if data.present?
+        debug(" #{self.class}  sends:  #{publishing_data}") if debug_enabled?
+        async.chat(publishing_data)
+      end
+
       # method used to send messages to the webserver
       # checks too see if the message is a hash and if it is it will transform it to JSON and send it to the webser
       # otherwise will construct a JSON object that will have the key action with the value 'message" and the key message witth the parameter's value

data/lib/celluloid_pubsub/reactor.rb

@@ -62,8 +62,8 @@ module CelluloidPubsub
       message = nil
       begin
         message = @websocket.read
-       rescue => e
-         debug(e) if @server.debug_enabled?
+      rescue => e
+        debug(e) if @server.debug_enabled?
       end
       message
     end
@@ -208,10 +208,7 @@ module CelluloidPubsub
     # @api public
     def unsubscribe_clients(channel)
       return if channel.blank? || @server.subscribers[channel].blank?
-      @server.subscribers[channel].each do |hash|
-        hash[:reactor].websocket.close
-        Celluloid::Actor.kill(hash[:reactor])
-      end
+      unsubscribe_from_channel(channel)
       @server.subscribers[channel] = []
     end
 
@@ -266,15 +263,25 @@ module CelluloidPubsub
     # @api public
     def unsubscribe_all
       CelluloidPubsub::Registry.channels.map do |channel|
-        @server.subscribers[channel].each do |hash|
-          hash[:reactor].websocket.close
-          Celluloid::Actor.kill(hash[:reactor])
-        end
+        unsubscribe_from_channel(channel)
         @server.subscribers[channel] = []
       end
 
       info 'clearing connections' if @server.debug_enabled?
       shutdown
     end
+
+    # unsubscribes all actors from the specified chanel
+    #
+    # @param [String] channel
+    # @return [void]
+    #
+    # @api public
+    def unsubscribe_from_channel(channel)
+      @server.subscribers[channel].each do |hash|
+        hash[:reactor].websocket.close
+        Celluloid::Actor.kill(hash[:reactor])
+      end
+    end
   end
 end

data/lib/celluloid_pubsub/version.rb

@@ -17,7 +17,7 @@ module CelluloidPubsub
     # minor release version
     MINOR = 0
     # tiny release version
-    TINY = 18
+    TINY = 19
     # prelease version ( set this only if it is a prelease)
     PRE = nil
 

data/spec/lib/celluloid_pubsub/reactor_spec.rb

@@ -16,6 +16,8 @@
      subject.stubs(:inspect).returns(subject)
      subject.stubs(:run)
      subject.work(websocket, server)
+     subject.stubs(:unsubscribe_from_channel).returns(true)
+     Celluloid::Actor.stubs(:kill).returns(true)
    end
 
    describe '#work' do
@@ -204,11 +206,8 @@
      let(:message) { { a: 'b' } }
 
      it 'adds subscribed' do
-       Celluloid::Actor.stubs(:kill).returns(true)
        CelluloidPubsub::Registry.stubs(:channels).returns([channel])
-       server.subscribers.stubs(:[]).with(channel).returns([{ reactor: subject, message: message }])
-       subject.websocket.expects(:close)
-       subject.expects(:shutdown)
+       subject.expects(:unsubscribe_from_channel).with(channel)
        subject.unsubscribe_all
      end
    end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid_pubsub
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - bogdanRada