celluloid_pubsub 0.7.9 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a3359e6bed373e2823baba89ebc16b1c23a7854
-  data.tar.gz: 8863612bacc3f790b801fb5ee83a2cc64448de1b
+  metadata.gz: f9a9695736f77a9058642129bc301b000da27ed4
+  data.tar.gz: 5d626707aec391b2e7e409a402a8da9cc2dbfb98
 SHA512:
-  metadata.gz: 2d3d910f4eb374c47bfe50073c59f4e10e2b3cf01de8a33a7e7870dae3b55d72a91ae0522a7f0ee0e427f47a7aaae5cf79937f67561e629f8a3eae5d06c690ca
-  data.tar.gz: d43bbebe970d977110d1096edc17f30167f95fdbe43c0ffc5d5193f819c970d521545da864a084d725c6c51c40409e44ebfe685d79faa17ebab14ac7cfdbc56b
+  metadata.gz: b583c4c34ff483903aaf081d8a204e67514112210c76976b17ab4809dfade9f7a90dd763d04955da135361b497d4291a312ed1a4a8c6ba88f5f199bc3c49172f
+  data.tar.gz: 7424cf9bf1ebc91c08e334f3da91736ef7c2f531310823283e531d0eab7b46bf89be1f791e1df1e5ca741d3b96110d562ab37c14a9673661d8c66c51c85a6500

data/lib/celluloid_pubsub/base_actor.rb

@@ -33,7 +33,7 @@ module CelluloidPubsub
       end
 
       def version_less_than_seventeen?
-        verify_gem_version('celluloid', '0.17', operator: '<')
+        verify_gem_version(celluloid_version, '0.17', operator: '<')
       end
 
       def setup_actor_supervision(class_name, options)

data/lib/celluloid_pubsub/helper.rb

@@ -71,7 +71,7 @@ module CelluloidPubsub
     #
     # @api private
     def setup_celluloid_exception_handler
-      Celluloid.task_class = Celluloid::TaskThread
+      Celluloid.task_class = defined?(Celluloid::TaskThread) ? Celluloid::TaskThread : Celluloid::Task::Threaded
       Celluloid.exception_handler do |ex|
         puts ex unless filtered_error?(ex)
       end

data/lib/celluloid_pubsub/reactor.rb

@@ -165,18 +165,18 @@ module CelluloidPubsub
     def delegate_action(json_data)
       channel = json_data.fetch('channel', nil)
       case json_data['client_action']
-        when 'unsubscribe_all'
-          unsubscribe_all
-        when 'unsubscribe_clients'
-          async.unsubscribe_clients(channel)
-        when 'unsubscribe'
-          async.unsubscribe(channel)
-        when 'subscribe'
-          async.start_subscriber(channel, json_data)
-        when 'publish'
-          async.publish_event(channel, json_data['data'].to_json)
-        else
-          handle_unknown_action(json_data)
+      when 'unsubscribe_all'
+        unsubscribe_all
+      when 'unsubscribe_clients'
+        async.unsubscribe_clients(channel)
+      when 'unsubscribe'
+        async.unsubscribe(channel)
+      when 'subscribe'
+        async.start_subscriber(channel, json_data)
+      when 'publish'
+        async.publish_event(channel, json_data['data'].to_json)
+      else
+        handle_unknown_action(json_data)
       end
     end
 
@@ -221,8 +221,10 @@ module CelluloidPubsub
       log_debug "#{self.class} runs 'unsubscribe' method with  #{channel}"
       return unless channel.present?
       forget_channel(channel)
-      (@server.subscribers[channel] || []).delete_if do |hash|
-        hash[:reactor] == Actor.current
+      @server.mutex.synchronize do
+        (@server.subscribers[channel].dup || []).delete_if do |hash|
+          hash[:reactor] == Actor.current
+        end
       end
     end
 
@@ -295,7 +297,9 @@ module CelluloidPubsub
       registry_channels = CelluloidPubsub::Registry.channels
       @channels << channel
       registry_channels << channel unless registry_channels.include?(channel)
-      @server.subscribers[channel] = channel_subscribers(channel).push(reactor: Actor.current, message: message)
+      @server.mutex.synchronize do
+        @server.subscribers[channel] = channel_subscribers(channel).push(reactor: Actor.current, message: message)
+      end
     end
 
     #  method for publishing data to a channel
@@ -308,8 +312,11 @@ module CelluloidPubsub
     # @api public
     def publish_event(current_topic, message)
       return if current_topic.blank? || message.blank?
-      (@server.subscribers[current_topic].dup || []).pmap do |hash|
-        hash[:reactor].websocket << message
+      log_debug "#{self.class} tries to publish  to #{current_topic} with #{message} into subscribers #{@server.subscribers[current_topic].inspect}"
+      @server.mutex.synchronize do
+        (@server.subscribers[current_topic].dup || []).pmap do |hash|
+          hash[:reactor].websocket << message
+        end
       end
     rescue => exception
       log_debug("could not publish message #{message} into topic #{current_topic} because of #{exception.inspect}")
@@ -337,10 +344,12 @@ module CelluloidPubsub
     # @api public
     def unsubscribe_from_channel(channel)
       log_debug "#{self.class} runs 'unsubscribe_from_channel' method with #{channel}"
-      (@server.subscribers[channel].dup || []).pmap do |hash|
-        reactor = hash[:reactor]
-        reactor.websocket.close
-        Celluloid::Actor.kill(reactor)
+      @server.mutex.synchronize do
+        (@server.subscribers[channel].dup || []).pmap do |hash|
+          reactor = hash[:reactor]
+          reactor.websocket.close
+          Celluloid::Actor.kill(reactor)
+        end
       end
     end
   end

data/lib/celluloid_pubsub/version.rb

@@ -15,9 +15,9 @@ module CelluloidPubsub
     # major release version
     MAJOR = 0
     # minor release version
-    MINOR = 7
+    MINOR = 8
     # tiny release version
-    TINY = 9
+    TINY = 0
     # prelease version ( set this only if it is a prelease)
     PRE = nil
 

data/lib/celluloid_pubsub/web_server.rb

@@ -25,7 +25,7 @@ module CelluloidPubsub
       # The name of the default adapter
     CLASSIC_ADAPTER = 'classic'
 
-    attr_accessor :server_options, :subscribers
+    attr_accessor :server_options, :subscribers, :mutex
     finalizer :shutdown
     #  receives a list of options that are used to configure the webserver
     #
@@ -44,6 +44,7 @@ module CelluloidPubsub
       Celluloid.boot unless Celluloid.running?
       @server_options = parse_options(options)
       @subscribers = {}
+      @mutex = Mutex.new
       setup_celluloid_logger
       log_debug "CelluloidPubsub::WebServer example starting on #{hostname}:#{port}"
       super(hostname, port, { spy: spy, backlog: backlog }, &method(:on_connection))

data/spec/lib/celluloid_pubsub/client_pubsub_spec.rb

@@ -115,10 +115,18 @@ describe CelluloidPubsub::Client do
     let(:data) { 'some_message' }
     it 'chats with the server' do
       JSON.expects(:parse).with(data).returns(data)
+       @worker.actor.expects(:respond_to?).returns(true)
       @worker.actor.expects(:async).returns(actor)
       @worker.actor.expects(:on_message).with(data)
       @worker.on_message(data)
     end
+
+    it 'chats with the server without async' do
+      JSON.expects(:parse).with(data).returns(data)
+       @worker.actor.expects(:respond_to?).returns(false)
+       @worker.actor.expects(:on_message).with(data)
+      @worker.on_message(data)
+    end
   end
 
   describe '#on_close' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid_pubsub
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid