message_bus 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f276c95da4b72d4c4ed5710fd1af3883116ee77a
-  data.tar.gz: ace4ed261e91e1efa464c4a30eec2ffed0a05291
+  metadata.gz: f439c4637f8f2b6271244a4ed2e3ab2637ff6c79
+  data.tar.gz: a35a858e95c8b3b218ba29e0773296420bf9f69b
 SHA512:
-  metadata.gz: fe593ca357284143f1ab125a4dea02eb8060414830f8b613e2cabca8bbbdfb4746c9a9df83529d318bf233b00bc84d297d191e0185dbd4782d1cf7388e40cf8b
-  data.tar.gz: 0af4fe02cd3479d72285b6e3b7d6f937279c6defc02a4bcf0603a2e832ee240da78e12c4d8ccf08fa5ff54a7e0799dda5d6a72ea9a18829e4ca82b8e6611016f
+  metadata.gz: 9ad5513fdaaadb637035aab15cc4d8edf76e5c8bee0774cdf90a90e3f5eb725abb987de5a4072213ba447b77f600113755330772d7169c75104e9bba816a8f6e
+  data.tar.gz: 72e05629c7e15d6d19cd3bf78238a3def6cb96007668ca4031e930f0b6fbb66f19524c55028ce9fdbc16aa9a3bb8e47ded98434e70ba60445731e5e599fe82b1

data/lib/message_bus/connection_manager.rb

@@ -1,6 +1,29 @@
 require 'json' unless defined? ::JSON
 
 class MessageBus::ConnectionManager
+  require 'monitor'
+
+  class SynchronizedSet
+    include MonitorMixin
+
+    def initialize
+      super
+      @set = Set.new
+    end
+
+    def self.synchronize(methods)
+      methods.each do |method|
+        define_method method do |*args, &blk|
+          synchronize do
+            @set.send method,*args,&blk
+          end
+        end
+      end
+    end
+
+    synchronize(Set.new.methods - Object.new.methods)
+
+  end
 
   def initialize(bus = nil)
     @clients = {}
@@ -75,7 +98,7 @@ class MessageBus::ConnectionManager
   def subscribe_client(client,channel)
     set = @subscriptions[client.site_id][channel]
     unless set
-      set = Set.new
+      set = SynchronizedSet.new
       @subscriptions[client.site_id][channel] = set
     end
     set << client.client_id

data/lib/message_bus/version.rb

@@ -1,3 +1,3 @@
 module MessageBus
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/spec/lib/client_spec.rb

@@ -31,18 +31,18 @@ describe MessageBus::Client do
 
       it "denies users that are not members of group" do
         @client.group_ids = [77,0,10]
-        @client.allowed?(@message).should be_false
+        @client.allowed?(@message).should == false
       end
 
       it "allows users that are members of group" do
         @client.group_ids = [1,2,3]
-        @client.allowed?(@message).should be_true
+        @client.allowed?(@message).should == true
       end
 
       it "allows all users if groups not set" do
         @message.group_ids = nil
         @client.group_ids = [77,0,10]
-        @client.allowed?(@message).should be_true
+        @client.allowed?(@message).should == true
       end
     end
   end

data/spec/lib/connection_manager_spec.rb

@@ -6,6 +6,7 @@ class FakeAsync
   attr_accessor :cleanup_timer
 
   def <<(val)
+    sleep 0.01 # simulate IO
     @sent ||= ""
     @sent << val
   end
@@ -79,6 +80,39 @@ describe MessageBus::ConnectionManager do
     @manager.notify_clients(m)
     @resp.sent.should == nil
   end
+end
+
+describe MessageBus::ConnectionManager, "notifying and subscribing concurrently" do
+
+  it "is thread-safe" do
+    @bus = MessageBus
+    @manager = MessageBus::ConnectionManager.new(@bus)
 
+    client_threads = 10.times.map do |id|
+      Thread.new do
+        expect {
+          @client = MessageBus::Client.new(client_id: "xyz_#{id}", site_id: 10)
+          @resp = FakeAsync.new
+          @client.async_response = @resp
+          @client.subscribe("test", -1)
+          @manager.add_client(@client)
+          @client.cleanup_timer = FakeTimer.new
+        }.not_to raise_error
+      end
+    end
+
+    subscriber_threads = 10.times.map do |id|
+      Thread.new do
+        expect {
+          m = MessageBus::Message.new(1,id,"test","data_#{id}")
+          m.site_id = 10
+          @manager.notify_clients(m)
+        }.not_to raise_error
+      end
+    end
+
+    client_threads.each(&:join)
+    subscriber_threads.each(&:join)
+  end
 
 end

data/spec/spec_helper.rb

@@ -1,6 +1,15 @@
 require 'thin'
 require 'lib/fake_async_middleware'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :should
+  end
+end
+
 def wait_for(timeout_milliseconds)
   timeout = (timeout_milliseconds + 0.0) / 1000
   finish = Time.now + timeout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack