message_bus 2.0.0.beta.2 → 2.0.0.beta.3

data/spec/lib/message_bus/connection_manager_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative '../../spec_helper'
 require 'message_bus'
 
 class FakeAsync
@@ -38,11 +38,11 @@ describe MessageBus::ConnectionManager do
     m = MessageBus::Message.new(1,1,"test","data")
     m.site_id = 10
     @manager.notify_clients(m)
-    @client.cleanup_timer.cancelled.should == true
+    @client.cleanup_timer.cancelled.must_equal true
   end
 
   it "should be able to lookup an identical client" do
-    @manager.lookup_client(@client.client_id).should == @client
+    @manager.lookup_client(@client.client_id).must_equal @client
   end
 
   it "should be subscribed to a channel" do
@@ -53,14 +53,14 @@ describe MessageBus::ConnectionManager do
     m = MessageBus::Message.new(1,1,"test","data")
     m.site_id = 9
     @manager.notify_clients(m)
-    @resp.sent.should == nil
+    @resp.sent.must_equal nil
   end
 
   it "should notify clients on the correct site" do
     m = MessageBus::Message.new(1,1,"test","data")
     m.site_id = 10
     @manager.notify_clients(m)
-    @resp.sent.should_not == nil
+    @resp.sent.wont_equal nil
   end
 
   it "should strip site id and user id from the payload delivered" do
@@ -69,8 +69,8 @@ describe MessageBus::ConnectionManager do
     m.site_id = 10
     @manager.notify_clients(m)
     parsed = JSON.parse(@resp.sent)
-    parsed[0]["site_id"].should == nil
-    parsed[0]["user_id"].should == nil
+    parsed[0]["site_id"].must_equal nil
+    parsed[0]["user_id"].must_equal nil
   end
 
   it "should not deliver unselected" do
@@ -78,7 +78,7 @@ describe MessageBus::ConnectionManager do
     m.user_ids = [5]
     m.site_id = 10
     @manager.notify_clients(m)
-    @resp.sent.should == nil
+    @resp.sent.must_equal nil
   end
 end
 
@@ -93,7 +93,7 @@ describe MessageBus::ConnectionManager, "notifying and subscribing concurrently"
     manager.add_client(client2)
     manager.add_client(client1)
 
-    manager.lookup_client("a").should == client2
+    manager.lookup_client("a").must_equal client2
   end
 
   it "is thread-safe" do
@@ -102,29 +102,27 @@ describe MessageBus::ConnectionManager, "notifying and subscribing concurrently"
 
     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
+        @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
+        1
       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
+        m = MessageBus::Message.new(1,id,"test","data_#{id}")
+        m.site_id = 10
+        @manager.notify_clients(m)
+        1
       end
     end
 
-    client_threads.each(&:join)
-    subscriber_threads.each(&:join)
+    client_threads.each(&:join).map(&:value).must_equal([1] * 10)
+    subscriber_threads.each(&:join).map(&:value).must_equal([1] * 10)
   end
 
 end

data/spec/lib/message_bus/multi_process_spec.rb

@@ -1,10 +1,17 @@
-require 'spec_helper'
+require_relative '../../spec_helper'
 require 'message_bus'
 
-describe MessageBus::Redis::ReliablePubSub do
+describe PUB_SUB_CLASS do
+  def self.error!
+    @error = true
+  end
+
+  def self.error?
+    defined?(@error)
+  end
 
   def new_bus
-    MessageBus::Redis::ReliablePubSub.new(:db => 10)
+    PUB_SUB_CLASS.new(MESSAGE_BUS_CONFIG.merge(:db => 10))
   end
 
   def work_it
@@ -13,8 +20,10 @@ describe MessageBus::Redis::ReliablePubSub do
     $stderr.reopen("/dev/null", "w")
     # subscribe blocks, so we need a new bus to transmit
     new_bus.subscribe("/echo", 0) do |msg|
-      bus.publish("/response", Process.pid.to_s)
+      bus.publish("/response", "#{msg.data}-#{Process.pid.to_s}")
     end
+  ensure
+    exit!(0)
   end
 
   def spawn_child
@@ -26,33 +35,51 @@ describe MessageBus::Redis::ReliablePubSub do
     end
   end
 
-  it 'gets every response from child processes' do
-    Redis.new(:db => 10).flushdb
-    begin
-      pids = (1..10).map{spawn_child}
-      responses = []
-      bus = MessageBus::Redis::ReliablePubSub.new(:db => 10)
-      Thread.new do
-        bus.subscribe("/response", 0) do |msg|
-          responses << msg if pids.include? msg.data.to_i
+  n = ENV['MULTI_PROCESS_TIMES'].to_i
+  n = 1 if n < 1
+  n.times do 
+    it 'gets every response from child processes' do
+      skip("previous error") if self.class.error?
+      GC.start
+      new_bus.reset!
+      begin
+        pids = (1..10).map{spawn_child}
+        expected_responses = pids.map{|x| (0...10).map{|i| "#{i}-#{x}"}}.flatten
+        unexpected_responses = []
+        bus = new_bus
+        t = Thread.new do
+          bus.subscribe("/response", 0) do |msg|
+            if expected_responses.include?(msg.data)
+              expected_responses.delete(msg.data)
+            else
+              unexpected_responses << msg.data
+            end
+          end
         end
-      end
-      10.times{bus.publish("/echo", Process.pid.to_s)}
-      wait_for 4000 do
-        responses.count == 100
-      end
+        10.times{|i| bus.publish("/echo", i.to_s)}
+        wait_for 4000 do
+          expected_responses.empty?
+        end
+        bus.global_unsubscribe
+        t.join
 
-      # p responses.group_by(&:data).map{|k,v|[k, v.count]}
-      # p responses.group_by(&:global_id).map{|k,v|[k, v.count]}
-      responses.count.should == 100
-    ensure
-      if pids
-        pids.each do |pid|
-          Process.kill("KILL", pid)
-          Process.wait(pid)
+        expected_responses.must_be :empty?
+        unexpected_responses.must_be :empty?
+      rescue Exception
+        self.class.error!
+        raise
+      ensure
+        if pids
+          pids.each do |pid|
+            begin
+              Process.kill("KILL", pid)
+            rescue SystemCallError
+            end
+            Process.wait(pid)
+          end
         end
+        bus.global_unsubscribe
       end
-      bus.global_unsubscribe
     end
   end
 end

data/spec/lib/message_bus/rack/middleware_spec.rb

@@ -1,18 +1,22 @@
 # coding: utf-8
 
-require 'spec_helper'
+require_relative '../../../spec_helper'
 require 'message_bus'
 require 'rack/test'
 
 describe MessageBus::Rack::Middleware do
   include Rack::Test::Methods
+  let(:extra_middleware){nil}
 
   before do
     bus = @bus = MessageBus::Instance.new
+    @bus.redis_config = MESSAGE_BUS_CONFIG
     @bus.long_polling_enabled = false
 
+    e_m = extra_middleware
     builder = Rack::Builder.new {
       use FakeAsyncMiddleware, :message_bus => bus
+      use e_m if e_m
       use MessageBus::Rack::Middleware, :message_bus => bus
       run lambda {|env| [500, {'Content-Type' => 'text/html'}, 'should not be called' ]}
     }
@@ -31,24 +35,26 @@ describe MessageBus::Rack::Middleware do
     @async_middleware
   end
 
-  shared_examples "long polling" do
+  module LongPolling
+    extend Minitest::Spec::DSL
+    
     before do
       @bus.long_polling_enabled = true
     end
 
     it "should respond right away if dlp=t" do
       post "/message-bus/ABC?dlp=t", '/foo1' => 0
-      @async_middleware.in_async?.should == false
-      last_response.should be_ok
+      @async_middleware.in_async?.must_equal false
+      last_response.ok?.must_equal true
     end
 
     it "should respond right away to long polls that are polling on -1 with the last_id" do
       post "/message-bus/ABC", '/foo' => -1
-      last_response.should be_ok
+      last_response.ok?.must_equal true
       parsed = JSON.parse(last_response.body)
-      parsed.length.should == 1
-      parsed[0]["channel"].should == "/__status"
-      parsed[0]["data"]["/foo"].should == @bus.last_id("/foo")
+      parsed.length.must_equal 1
+      parsed[0]["channel"].must_equal "/__status"
+      parsed[0]["data"]["/foo"].must_equal @bus.last_id("/foo")
     end
 
     it "should respond to long polls when data is available" do
@@ -66,12 +72,12 @@ describe MessageBus::Rack::Middleware do
 
       post "/message-bus/ABC", '/foo' => nil
 
-      last_response.should be_ok
+      last_response.ok?.must_equal true
       parsed = JSON.parse(last_response.body)
-      parsed.length.should == 1
-      parsed[0]["data"].should == "םוֹלשָׁ"
+      parsed.length.must_equal 1
+      parsed[0]["data"].must_equal "םוֹלשָׁ"
 
-      last_response.headers["FOO"].should == "BAR"
+      last_response.headers["FOO"].must_equal "BAR"
     end
 
     it "should timeout within its alloted slot" do
@@ -80,7 +86,7 @@ describe MessageBus::Rack::Middleware do
         s = Time.now.to_f * 1000
         post "/message-bus/ABC", '/foo' => nil
         # allow for some jitter
-        (Time.now.to_f * 1000 - s).should < 50
+        (Time.now.to_f * 1000 - s).must_be :<, 100
       ensure
         @bus.long_polling_interval = 5000
       end
@@ -91,7 +97,8 @@ describe MessageBus::Rack::Middleware do
     before do
       @async_middleware.simulate_thin_async
     end
-    it_behaves_like "long polling"
+
+    include LongPolling
   end
 
   describe "hijack" do
@@ -99,27 +106,28 @@ describe MessageBus::Rack::Middleware do
       @async_middleware.simulate_hijack
       @bus.rack_hijack_enabled = true
     end
-    it_behaves_like "long polling"
+
+    include LongPolling
   end
 
   describe "diagnostics" do
 
     it "should return a 403 if a user attempts to get at the _diagnostics path" do
       get "/message-bus/_diagnostics"
-      last_response.status.should == 403
+      last_response.status.must_equal 403
     end
 
     it "should get a 200 with html for an authorized user" do
-      @bus.stub(:is_admin_lookup).and_return(lambda{|env| true })
+      def @bus.is_admin_lookup; proc{|_| true} end
       get "/message-bus/_diagnostics"
-      last_response.status.should == 200
+      last_response.status.must_equal 200
     end
 
     it "should get the script it asks for" do
-      @bus.stub(:is_admin_lookup).and_return(lambda{|env| true })
+      def @bus.is_admin_lookup; proc{|_| true} end
       get "/message-bus/_diagnostics/assets/message-bus.js"
-      last_response.status.should == 200
-      last_response.content_type.should == "text/javascript;"
+      last_response.status.must_equal 200
+      last_response.content_type.must_equal "text/javascript;"
     end
 
   end
@@ -142,7 +150,7 @@ describe MessageBus::Rack::Middleware do
         '/bar' => nil
       }
 
-      last_response.headers["FOO"].should == "BAR"
+      last_response.headers["FOO"].must_equal "BAR"
     end
 
     it "should respond with a 200 to a subscribe" do
@@ -153,7 +161,7 @@ describe MessageBus::Rack::Middleware do
         '/foo' => nil,
         '/bar' => nil
       }
-      last_response.should be_ok
+      last_response.ok?.must_equal true
     end
 
     it "should correctly understand that -1 means stuff from now onwards" do
@@ -163,11 +171,11 @@ describe MessageBus::Rack::Middleware do
       post "/message-bus/ABCD", {
         '/foo' => -1
       }
-      last_response.should be_ok
+      last_response.ok?.must_equal true
       parsed = JSON.parse(last_response.body)
-      parsed.length.should == 1
-      parsed[0]["channel"].should == "/__status"
-      parsed[0]["data"]["/foo"].should ==@bus.last_id("/foo")
+      parsed.length.must_equal 1
+      parsed[0]["channel"].must_equal "/__status"
+      parsed[0]["data"]["/foo"].must_equal@bus.last_id("/foo")
 
     end
 
@@ -184,9 +192,9 @@ describe MessageBus::Rack::Middleware do
       }
 
       parsed = JSON.parse(last_response.body)
-      parsed.length.should == 2
-      parsed[0]["data"].should == "barbs"
-      parsed[1]["data"].should == "borbs"
+      parsed.length.must_equal 2
+      parsed[0]["data"].must_equal "barbs"
+      parsed[1]["data"].must_equal "borbs"
     end
 
     it "should have no cross talk" do
@@ -205,7 +213,7 @@ describe MessageBus::Rack::Middleware do
       }
 
       parsed = JSON.parse(last_response.body)
-      parsed.length.should == 0
+      parsed.length.must_equal 0
 
     end
 
@@ -223,7 +231,7 @@ describe MessageBus::Rack::Middleware do
       }
 
       parsed = JSON.parse(last_response.body)
-      parsed.length.should == 1
+      parsed.length.must_equal 1
     end
 
     it "should not get consumed messages" do
@@ -236,7 +244,7 @@ describe MessageBus::Rack::Middleware do
       }
 
       parsed = JSON.parse(last_response.body)
-      parsed.length.should == 0
+      parsed.length.must_equal 0
     end
 
     it "should filter by user correctly" do
@@ -251,7 +259,7 @@ describe MessageBus::Rack::Middleware do
       }
 
       parsed = JSON.parse(last_response.body)
-      parsed.length.should == 0
+      parsed.length.must_equal 0
 
       @bus.user_id_lookup do |env|
         1
@@ -262,7 +270,7 @@ describe MessageBus::Rack::Middleware do
       }
 
       parsed = JSON.parse(last_response.body)
-      parsed.length.should == 1
+      parsed.length.must_equal 1
     end
 
     it "should filter by group correctly" do
@@ -277,7 +285,7 @@ describe MessageBus::Rack::Middleware do
       }
 
       parsed = JSON.parse(last_response.body)
-      parsed.length.should == 0
+      parsed.length.must_equal 0
 
       @bus.group_ids_lookup do |env|
         [1,7,4,100]
@@ -288,8 +296,43 @@ describe MessageBus::Rack::Middleware do
       }
 
       parsed = JSON.parse(last_response.body)
-      parsed.length.should == 1
+      parsed.length.must_equal 1
     end
-  end
 
+    describe "messagebus.channels env support" do
+      let(:extra_middleware) do
+        Class.new do
+          attr_reader :app
+
+          def initialize(app)
+            @app = app
+          end
+
+          def call(env)
+            @app.call(env.merge('message_bus.channels'=>{'/foo'=>0}))
+          end
+        end
+      end
+
+      it "should respect messagebus.channels in the environment to force channels" do
+        @message_bus_middleware = @async_middleware.app.app
+        foo_id = @bus.publish("/foo", "testfoo")
+        bar_id = @bus.publish("/bar", "testbar")
+
+        post "/message-bus/ABCD", {
+          '/foo' => foo_id - 1
+        }
+
+        parsed = JSON.parse(last_response.body)
+        parsed.first['data'].must_equal 'testfoo'
+
+        post "/message-bus/ABCD", {
+          '/bar' => bar_id - 1
+        }
+
+        parsed = JSON.parse(last_response.body)
+        parsed.first['data'].must_equal 'testfoo'
+      end
+    end
+  end
 end