message_bus 2.1.6 → 2.2.0.pre

data/spec/lib/message_bus/connection_manager_spec.rb

@@ -2,7 +2,6 @@ require_relative '../../spec_helper'
 require 'message_bus'
 
 class FakeAsync
-
   attr_accessor :cleanup_timer
 
   def <<(val)
@@ -12,7 +11,9 @@ class FakeAsync
   end
 
   def sent; @sent; end
+
   def done; @done = true; end
+
   def done?; @done; end
 end
 
@@ -22,7 +23,6 @@ class FakeTimer
 end
 
 describe MessageBus::ConnectionManager do
-
   before do
     @bus = MessageBus
     @manager = MessageBus::ConnectionManager.new(@bus)
@@ -35,7 +35,7 @@ describe MessageBus::ConnectionManager do
   end
 
   it "should cancel the timer after its responds" do
-    m = MessageBus::Message.new(1,1,"test","data")
+    m = MessageBus::Message.new(1, 1, "test", "data")
     m.site_id = 10
     @manager.notify_clients(m)
     @client.cleanup_timer.cancelled.must_equal true
@@ -45,26 +45,22 @@ describe MessageBus::ConnectionManager do
     @manager.lookup_client(@client.client_id).must_equal @client
   end
 
-  it "should be subscribed to a channel" do
-    @manager.stats[:subscriptions][10]["test"].length == 1
-  end
-
   it "should not notify clients on incorrect site" do
-    m = MessageBus::Message.new(1,1,"test","data")
+    m = MessageBus::Message.new(1, 1, "test", "data")
     m.site_id = 9
     @manager.notify_clients(m)
     assert_nil @resp.sent
   end
 
   it "should notify clients on the correct site" do
-    m = MessageBus::Message.new(1,1,"test","data")
+    m = MessageBus::Message.new(1, 1, "test", "data")
     m.site_id = 10
     @manager.notify_clients(m)
     @resp.sent.wont_equal nil
   end
 
   it "should strip site id and user id from the payload delivered" do
-    m = MessageBus::Message.new(1,1,"test","data")
+    m = MessageBus::Message.new(1, 1, "test", "data")
     m.user_ids = [1]
     m.site_id = 10
     @manager.notify_clients(m)
@@ -74,7 +70,7 @@ describe MessageBus::ConnectionManager do
   end
 
   it "should not deliver unselected" do
-    m = MessageBus::Message.new(1,1,"test","data")
+    m = MessageBus::Message.new(1, 1, "test", "data")
     m.user_ids = [5]
     m.site_id = 10
     @manager.notify_clients(m)
@@ -83,7 +79,6 @@ describe MessageBus::ConnectionManager do
 end
 
 describe MessageBus::ConnectionManager, "notifying and subscribing concurrently" do
-
   it "does not subscribe incorrect clients" do
     manager = MessageBus::ConnectionManager.new
 
@@ -114,7 +109,7 @@ describe MessageBus::ConnectionManager, "notifying and subscribing concurrently"
 
     subscriber_threads = 10.times.map do |id|
       Thread.new do
-        m = MessageBus::Message.new(1,id,"test","data_#{id}")
+        m = MessageBus::Message.new(1, id, "test", "data_#{id}")
         m.site_id = 10
         @manager.notify_clients(m)
         1
@@ -124,5 +119,4 @@ describe MessageBus::ConnectionManager, "notifying and subscribing concurrently"
     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/distributed_cache_spec.rb

@@ -4,7 +4,6 @@ require 'message_bus'
 require 'message_bus/distributed_cache'
 
 describe MessageBus::DistributedCache do
-
   before :all do
     @bus = MessageBus::Instance.new
     @bus.configure(backend: :memory)
@@ -29,7 +28,6 @@ describe MessageBus::DistributedCache do
   end
 
   it 'supports arrays with hashes' do
-
     c1 = cache("test1")
     c2 = cache("test1")
 
@@ -81,7 +79,6 @@ describe MessageBus::DistributedCache do
 
     Thread.pass
     assert_nil(@cache1["hi"])
-
   end
 
   it 'allows coerces symbol keys to strings' do
@@ -129,5 +126,4 @@ describe MessageBus::DistributedCache do
       @cache2["boom"] == nil
     end
   end
-
 end

data/spec/lib/message_bus/multi_process_spec.rb

@@ -1,7 +1,6 @@
 require_relative '../../spec_helper'
 require 'message_bus'
 
-unless MESSAGE_BUS_CONFIG[:backend] == :memory
 describe PUB_SUB_CLASS do
   def self.error!
     @error = true
@@ -12,7 +11,7 @@ describe PUB_SUB_CLASS do
   end
 
   def new_bus
-    PUB_SUB_CLASS.new(MESSAGE_BUS_CONFIG.merge(:db => 10))
+    PUB_SUB_CLASS.new(MESSAGE_BUS_CONFIG.merge(db: 10))
   end
 
   def work_it
@@ -38,14 +37,15 @@ describe PUB_SUB_CLASS do
 
   n = ENV['MULTI_PROCESS_TIMES'].to_i
   n = 1 if n < 1
-  n.times do 
+  n.times do
     it 'gets every response from child processes' do
+      test_never :memory
       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| "0#{i}-#{x}"}}.flatten
+        pids = (1..10).map { spawn_child }
+        expected_responses = pids.map { |x| (0...10).map { |i| "0#{i}-#{x}" } }.flatten
         unexpected_responses = []
         bus = new_bus
         t = Thread.new do
@@ -57,7 +57,7 @@ describe PUB_SUB_CLASS do
             end
           end
         end
-        10.times{|i| bus.publish("/echo", "0#{i}")}
+        10.times { |i| bus.publish("/echo", "0#{i}") }
         wait_for 4000 do
           expected_responses.empty?
         end
@@ -84,4 +84,3 @@ describe PUB_SUB_CLASS do
     end
   end
 end
-end

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

@@ -18,7 +18,7 @@ describe MessageBus::Rack::Middleware do
       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' ] }
+      run lambda { |_env| [500, { 'Content-Type' => 'text/html' }, 'should not be called'] }
     }
 
     @async_middleware = builder.to_app
@@ -62,7 +62,7 @@ describe MessageBus::Rack::Middleware do
       middleware = @async_middleware
       bus = @bus
 
-      @bus.extra_response_headers_lookup do |env|
+      @bus.extra_response_headers_lookup do |_env|
         { "FOO" => "BAR" }
       end
 
@@ -111,8 +111,20 @@ describe MessageBus::Rack::Middleware do
     include LongPolling
   end
 
-  describe "diagnostics" do
+  describe "start listener" do
+    let(:app) { ->(_) { [200, {}, []] } }
+
+    it "never subscribes" do
+      bus = MessageBus::Instance.new
+      bus.off
+
+      middleware = MessageBus::Rack::Middleware.new(app, message_bus: bus)
+
+      middleware.started_listener.must_equal false
+    end
+  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.must_equal 403
@@ -130,7 +142,6 @@ describe MessageBus::Rack::Middleware do
       last_response.status.must_equal 200
       last_response.content_type.must_equal "text/javascript;"
     end
-
   end
 
   describe "polling" do
@@ -139,7 +150,7 @@ describe MessageBus::Rack::Middleware do
     end
 
     it "should include access control headers" do
-      @bus.extra_response_headers_lookup do |env|
+      @bus.extra_response_headers_lookup do |_env|
         { "FOO" => "BAR" }
       end
 
@@ -147,8 +158,8 @@ describe MessageBus::Rack::Middleware do
 
       # client always keeps a list of channels with last message id they got on each
       post "/message-bus/#{client_id}",
-        '/foo' => nil,
-        '/bar' => nil
+           '/foo' => nil,
+           '/bar' => nil
 
       last_response.headers["FOO"].must_equal "BAR"
     end
@@ -158,8 +169,8 @@ describe MessageBus::Rack::Middleware do
 
       # client always keeps a list of channels with last message id they got on each
       post "/message-bus/#{client_id}",
-        '/foo' => nil,
-        '/bar' => nil
+           '/foo' => nil,
+           '/bar' => nil
 
       last_response.ok?.must_equal true
     end
@@ -171,9 +182,9 @@ describe MessageBus::Rack::Middleware do
       @bus.publish('/boom', 'bang')
 
       post "/message-bus/ABCD",
-        '/foo' => 1_000_000,
-        '/baz' => @bus.last_id('/baz') + 1,
-        '/boom' => 1_000_000
+           '/foo' => 1_000_000,
+           '/baz' => @bus.last_id('/baz') + 1,
+           '/boom' => 1_000_000
 
       last_response.ok?.must_equal true
       parsed = JSON.parse(last_response.body)
@@ -185,7 +196,6 @@ describe MessageBus::Rack::Middleware do
     end
 
     it "should correctly understand that -1 means stuff from now onwards" do
-
       # even if allow chunked
       @bus.chunked_encoding_enabled = true
 
@@ -194,9 +204,9 @@ describe MessageBus::Rack::Middleware do
       @bus.publish('/boom', 'bang')
 
       post "/message-bus/ABCD",
-        '/foo' => -1,
-        '/baz' => @bus.last_id('/baz') + 1,
-        '/boom' => -1
+           '/foo' => -1,
+           '/baz' => @bus.last_id('/baz') + 1,
+           '/boom' => -1
 
       last_response.ok?.must_equal true
       parsed = JSON.parse(last_response.body)
@@ -205,7 +215,6 @@ describe MessageBus::Rack::Middleware do
       parsed[0]["channel"].must_equal "/__status"
       parsed[0]["data"]["/foo"].must_equal @bus.last_id("/foo")
       parsed[0]["data"]["/boom"].must_equal @bus.last_id("/boom")
-
     end
 
     it "should respond with the data if messages exist in the backlog" do
@@ -216,8 +225,8 @@ describe MessageBus::Rack::Middleware do
 
       client_id = "ABCD"
       post "/message-bus/#{client_id}",
-        '/foo' => id,
-        '/bar' => nil
+           '/foo' => id,
+           '/bar' => nil
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 2
@@ -226,7 +235,6 @@ describe MessageBus::Rack::Middleware do
     end
 
     it "should have no cross talk" do
-
       seq = 0
       @bus.site_id_lookup do
         (seq += 1).to_s
@@ -237,15 +245,13 @@ describe MessageBus::Rack::Middleware do
 
       # subscribed on channel 2
       post "/message-bus/ABCD",
-        '/foo' => (msg - 1)
+           '/foo' => (msg - 1)
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 0
-
     end
 
     it "should have global cross talk" do
-
       seq = 0
       @bus.site_id_lookup do
         (seq += 1).to_s
@@ -254,7 +260,7 @@ describe MessageBus::Rack::Middleware do
       msg = @bus.publish("/global/foo", "test")
 
       post "/message-bus/ABCD",
-        '/global/foo' => (msg - 1)
+           '/global/foo' => (msg - 1)
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 1
@@ -266,7 +272,7 @@ describe MessageBus::Rack::Middleware do
 
       client_id = "ABCD"
       post "/message-bus/#{client_id}",
-        '/foo' => id
+           '/foo' => id
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 0
@@ -274,13 +280,13 @@ describe MessageBus::Rack::Middleware do
 
     it "should filter by user correctly" do
       id = @bus.publish("/foo", "test", user_ids: [1])
-      @bus.user_id_lookup do |env|
+      @bus.user_id_lookup do |_env|
         0
       end
 
       client_id = "ABCD"
       post "/message-bus/#{client_id}",
-        '/foo' => id - 1
+           '/foo' => id - 1
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 1
@@ -290,12 +296,12 @@ describe MessageBus::Rack::Middleware do
       message["channel"].must_equal "/__status"
       message["data"].must_equal("/foo" => 1)
 
-      @bus.user_id_lookup do |env|
+      @bus.user_id_lookup do |_env|
         1
       end
 
       post "/message-bus/#{client_id}",
-        '/foo' => id - 1
+           '/foo' => id - 1
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 1
@@ -303,13 +309,13 @@ describe MessageBus::Rack::Middleware do
 
     it "should filter by group correctly" do
       id = @bus.publish("/foo", "test", group_ids: [3, 4, 5])
-      @bus.group_ids_lookup do |env|
+      @bus.group_ids_lookup do |_env|
         [0, 1, 2]
       end
 
       client_id = "ABCD"
       post "/message-bus/#{client_id}",
-        '/foo' => id - 1
+           '/foo' => id - 1
 
       parsed = JSON.parse(last_response.body)
       message = parsed.first
@@ -317,12 +323,12 @@ describe MessageBus::Rack::Middleware do
       message["channel"].must_equal "/__status"
       message["data"].must_equal("/foo" => 1)
 
-      @bus.group_ids_lookup do |env|
+      @bus.group_ids_lookup do |_env|
         [1, 7, 4, 100]
       end
 
       post "/message-bus/#{client_id}",
-        '/foo' => id - 1
+           '/foo' => id - 1
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 1
@@ -332,30 +338,28 @@ describe MessageBus::Rack::Middleware do
       id = @bus.last_id('/foo')
       @bus.publish("/foo", json: true)
       post("/message-bus/1234",
-            JSON.generate('/foo' => id),
-            "CONTENT_TYPE" => "application/json")
+           JSON.generate('/foo' => id),
+           "CONTENT_TYPE" => "application/json")
       JSON.parse(last_response.body).first["data"].must_equal('json' => true)
     end
 
     describe "on_middleware_error handling" do
       it "allows error handling of middleware failures" do
-
-        @bus.on_middleware_error do |env, err|
+        @bus.on_middleware_error do |_env, err|
           if ArgumentError === err
             [407, {}, []]
           end
         end
 
-        @bus.group_ids_lookup do |env|
+        @bus.group_ids_lookup do |_env|
           raise ArgumentError
         end
 
         post("/message-bus/1234",
-            JSON.generate('/foo' => 1),
-            "CONTENT_TYPE" => "application/json")
+             JSON.generate('/foo' => 1),
+             "CONTENT_TYPE" => "application/json")
 
         last_response.status.must_equal 407
-
       end
     end
 
@@ -380,13 +384,13 @@ describe MessageBus::Rack::Middleware do
         bar_id = @bus.publish("/bar", "testbar")
 
         post "/message-bus/ABCD",
-          '/foo' => foo_id - 1
+             '/foo' => foo_id - 1
 
         parsed = JSON.parse(last_response.body)
         parsed.first['data'].must_equal 'testfoo'
 
         post "/message-bus/ABCD",
-          '/bar' => bar_id - 1
+             '/bar' => bar_id - 1
 
         parsed = JSON.parse(last_response.body)
         parsed.first['data'].must_equal 'testfoo'