message_bus 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ab5f806affa121e66619143bef08f116e700722
-  data.tar.gz: 43e51a93bb2ac7fc232b89af04b08f25c526af0e
+  metadata.gz: 6e3233d29ea9404805798a4b1a4caddf2a50477c
+  data.tar.gz: f77eed645f31f2182dc28d94fdf80dc8746ffffd
 SHA512:
-  metadata.gz: 1ce530dbf86a71ae8d7f593446768d4090055cdcddc52335d2ba38482e959375c0165221cda880b1f5a5c2098e7fcdd5a4b28880e5b8161530fd99068da8ef35
-  data.tar.gz: 8b9b5cc7eff8bea4ae4d94d92fa09a24ff42eb348414d862415162103e97cb814f3e29306299ec9a9f4327f1b524373ef46da6d53c3d7db246a88ad67627341c
+  metadata.gz: 4a1b8e23c41ea624f21012e8c9f83be06217d1cfb103dd5c13417aff52bf49fab6dde813185f5186b8bdd226267bd5ac2aec859cdd49c35323e35f8c51a8af57
+  data.tar.gz: b1285bcba99c5263eba003781a8423245d198edb88bf2c1265d895a771d6b75bc1da89e119cb973d08a58fa4c98726d9bb75ed425c8b28f089c5fdbed70db8f1

data/CHANGELOG

@@ -1,6 +1,14 @@
+29-09-2017
+
+- Version 2.0.6
+
+- Fix: correct after_fork so it correctly disconnnects redis
+- Fix: correct message_bus #destroy used in tests to clean up spec (deadlock)
+- Fix: deliver backlog unconditionally when polling (and not long polling)
+
 16-08-2017
 
-- Version 2.0.4
+- Version 2.0.5
 
 - Quick fix, build on earlier version of Ruby cause https://github.com/rubygems/rubygems/issues/1448 is still open
 

data/Gemfile

@@ -10,4 +10,8 @@ group :test do
   gem 'thin'
   gem 'rack-test', require: 'rack/test'
   gem 'jasmine'
+  gem 'redis'
 end
+
+gem 'redis', '3.3.5', platform: :mri_20
+gem 'rack', '1.6.4', platform: :mri_20

data/lib/message_bus.rb

@@ -313,10 +313,13 @@ module MessageBus::Implementation
     end
   end
 
+  # mostly used in tests to detroy entire bus
   def destroy
+    return if @destroyed
+    reliable_pub_sub.global_unsubscribe
+
     @mutex.synchronize do
       @subscriptions ||= {}
-      reliable_pub_sub.global_unsubscribe
       @destroyed = true
     end
     @subscriber_thread.join if @subscriber_thread

data/lib/message_bus/backends/redis.rb

@@ -45,7 +45,7 @@ class MessageBus::Redis::ReliablePubSub
   end
 
   def after_fork
-    pub_redis.client.reconnect
+    pub_redis.disconnect!
   end
 
   def redis_channel_name
@@ -270,7 +270,8 @@ class MessageBus::Redis::ReliablePubSub
 
   def global_unsubscribe
     if @redis_global
-      pub_redis.publish(redis_channel_name, UNSUB_MESSAGE)
+      # new connection to avoid deadlock
+      new_redis_connection.publish(redis_channel_name, UNSUB_MESSAGE)
       @redis_global.disconnect
       @redis_global = nil
     end

data/lib/message_bus/rack/middleware.rb

@@ -180,7 +180,7 @@ class MessageBus::Rack::Middleware
 
       throw :async
     else
-      [200, headers, ["[]"]]
+      [200, headers, [self.class.backlog_to_json(backlog)]]
     end
 
   rescue => e

data/lib/message_bus/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module MessageBus
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end

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

@@ -6,7 +6,7 @@ require 'rack/test'
 
 describe MessageBus::Rack::Middleware do
   include Rack::Test::Methods
-  let(:extra_middleware){nil}
+  let(:extra_middleware) { nil }
 
   before do
     bus = @bus = MessageBus::Instance.new
@@ -15,10 +15,10 @@ describe MessageBus::Rack::Middleware do
 
     e_m = extra_middleware
     builder = Rack::Builder.new {
-      use FakeAsyncMiddleware, :message_bus => bus
+      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' ]}
+      use MessageBus::Rack::Middleware, message_bus: bus
+      run lambda { |env| [500, { 'Content-Type' => 'text/html' }, 'should not be called' ] }
     }
 
     @async_middleware = builder.to_app
@@ -63,11 +63,11 @@ describe MessageBus::Rack::Middleware do
       bus = @bus
 
       @bus.extra_response_headers_lookup do |env|
-        {"FOO" => "BAR"}
+        { "FOO" => "BAR" }
       end
 
       Thread.new do
-        wait_for(2000) {middleware.in_async?}
+        wait_for(2000) { middleware.in_async? }
         bus.publish "/foo", "םוֹלשָׁ"
       end
 
@@ -119,13 +119,13 @@ describe MessageBus::Rack::Middleware do
     end
 
     it "should get a 200 with html for an authorized user" do
-      def @bus.is_admin_lookup; proc{|_| true} end
+      def @bus.is_admin_lookup; proc { |_| true } end
       get "/message-bus/_diagnostics"
       last_response.status.must_equal 200
     end
 
     it "should get the script it asks for" do
-      def @bus.is_admin_lookup; proc{|_| true} end
+      def @bus.is_admin_lookup; proc { |_| true } end
       get "/message-bus/_diagnostics/assets/message-bus.js"
       last_response.status.must_equal 200
       last_response.content_type.must_equal "text/javascript;"
@@ -140,16 +140,15 @@ describe MessageBus::Rack::Middleware do
 
     it "should include access control headers" do
       @bus.extra_response_headers_lookup do |env|
-        {"FOO" => "BAR"}
+        { "FOO" => "BAR" }
       end
 
       client_id = "ABCD"
 
       # client always keeps a list of channels with last message id they got on each
-      post "/message-bus/#{client_id}", {
+      post "/message-bus/#{client_id}",
         '/foo' => nil,
         '/bar' => nil
-      }
 
       last_response.headers["FOO"].must_equal "BAR"
     end
@@ -158,39 +157,47 @@ describe MessageBus::Rack::Middleware do
       client_id = "ABCD"
 
       # client always keeps a list of channels with last message id they got on each
-      post "/message-bus/#{client_id}", {
+      post "/message-bus/#{client_id}",
         '/foo' => nil,
         '/bar' => nil
-      }
+
       last_response.ok?.must_equal true
     end
 
     it "should correctly understand that -1 means stuff from now onwards" do
 
-      @bus.publish('foo', 'bar')
+      # even if allow chunked
+      @bus.chunked_encoding_enabled = true
+
+      @bus.publish('/foo', 'bar')
+      @bus.publish('/baz', 'test')
+      @bus.publish('/boom', 'bang')
+
+      post "/message-bus/ABCD",
+        '/foo' => -1,
+        '/baz' => @bus.last_id('/baz') + 1,
+        '/boom' => -1
 
-      post "/message-bus/ABCD", {
-        '/foo' => -1
-      }
       last_response.ok?.must_equal true
       parsed = JSON.parse(last_response.body)
+
       parsed.length.must_equal 1
       parsed[0]["channel"].must_equal "/__status"
-      parsed[0]["data"]["/foo"].must_equal@bus.last_id("/foo")
+      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
-      id =@bus.last_id('/foo')
+      id = @bus.last_id('/foo')
 
       @bus.publish("/foo", "barbs")
       @bus.publish("/foo", "borbs")
 
       client_id = "ABCD"
-      post "/message-bus/#{client_id}", {
+      post "/message-bus/#{client_id}",
         '/foo' => id,
         '/bar' => nil
-      }
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 2
@@ -202,16 +209,15 @@ describe MessageBus::Rack::Middleware do
 
       seq = 0
       @bus.site_id_lookup do
-        (seq+=1).to_s
+        (seq += 1).to_s
       end
 
       # published on channel 1
       msg = @bus.publish("/foo", "test")
 
       # subscribed on channel 2
-      post "/message-bus/ABCD", {
-        '/foo' => (msg-1)
-      }
+      post "/message-bus/ABCD",
+        '/foo' => (msg - 1)
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 0
@@ -222,14 +228,13 @@ describe MessageBus::Rack::Middleware do
 
       seq = 0
       @bus.site_id_lookup do
-        (seq+=1).to_s
+        (seq += 1).to_s
       end
 
       msg = @bus.publish("/global/foo", "test")
 
-      post "/message-bus/ABCD", {
-        '/global/foo' => (msg-1)
-      }
+      post "/message-bus/ABCD",
+        '/global/foo' => (msg - 1)
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 1
@@ -237,27 +242,25 @@ describe MessageBus::Rack::Middleware do
 
     it "should not get consumed messages" do
       @bus.publish("/foo", "barbs")
-      id =@bus.last_id('/foo')
+      id = @bus.last_id('/foo')
 
       client_id = "ABCD"
-      post "/message-bus/#{client_id}", {
+      post "/message-bus/#{client_id}",
         '/foo' => id
-      }
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 0
     end
 
     it "should filter by user correctly" do
-      id =@bus.publish("/foo", "test", user_ids: [1])
+      id = @bus.publish("/foo", "test", user_ids: [1])
       @bus.user_id_lookup do |env|
         0
       end
 
       client_id = "ABCD"
-      post "/message-bus/#{client_id}", {
+      post "/message-bus/#{client_id}",
         '/foo' => id - 1
-      }
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 1
@@ -271,24 +274,22 @@ describe MessageBus::Rack::Middleware do
         1
       end
 
-      post "/message-bus/#{client_id}", {
+      post "/message-bus/#{client_id}",
         '/foo' => id - 1
-      }
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 1
     end
 
     it "should filter by group correctly" do
-      id =@bus.publish("/foo", "test", group_ids: [3,4,5])
+      id = @bus.publish("/foo", "test", group_ids: [3, 4, 5])
       @bus.group_ids_lookup do |env|
-        [0,1,2]
+        [0, 1, 2]
       end
 
       client_id = "ABCD"
-      post "/message-bus/#{client_id}", {
+      post "/message-bus/#{client_id}",
         '/foo' => id - 1
-      }
 
       parsed = JSON.parse(last_response.body)
       message = parsed.first
@@ -297,12 +298,11 @@ describe MessageBus::Rack::Middleware do
       message["data"].must_equal("/foo" => 1)
 
       @bus.group_ids_lookup do |env|
-        [1,7,4,100]
+        [1, 7, 4, 100]
       end
 
-      post "/message-bus/#{client_id}", {
+      post "/message-bus/#{client_id}",
         '/foo' => id - 1
-      }
 
       parsed = JSON.parse(last_response.body)
       parsed.length.must_equal 1
@@ -310,11 +310,11 @@ describe MessageBus::Rack::Middleware do
 
     it "can decode a JSON encoded request" do
       id = @bus.last_id('/foo')
-      @bus.publish("/foo", {json: true})
-      post( "/message-bus/1234",
-            JSON.generate({'/foo' => id}),
-            { "CONTENT_TYPE" => "application/json" })
-      JSON.parse(last_response.body).first["data"].must_equal({'json' => true})
+      @bus.publish("/foo", json: true)
+      post("/message-bus/1234",
+            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
@@ -322,7 +322,7 @@ describe MessageBus::Rack::Middleware do
 
         @bus.on_middleware_error do |env, err|
           if ArgumentError === err
-            [407,{},[]]
+            [407, {}, []]
           end
         end
 
@@ -330,9 +330,9 @@ describe MessageBus::Rack::Middleware do
           raise ArgumentError
         end
 
-        post( "/message-bus/1234",
-            JSON.generate({'/foo' => 1}),
-            { "CONTENT_TYPE" => "application/json" })
+        post("/message-bus/1234",
+            JSON.generate('/foo' => 1),
+            "CONTENT_TYPE" => "application/json")
 
         last_response.status.must_equal 407
 
@@ -349,7 +349,7 @@ describe MessageBus::Rack::Middleware do
           end
 
           def call(env)
-            @app.call(env.merge('message_bus.channels'=>{'/foo'=>0}))
+            @app.call(env.merge('message_bus.channels' => { '/foo' => 0 }))
           end
         end
       end
@@ -359,16 +359,14 @@ describe MessageBus::Rack::Middleware do
         foo_id = @bus.publish("/foo", "testfoo")
         bar_id = @bus.publish("/bar", "testbar")
 
-        post "/message-bus/ABCD", {
+        post "/message-bus/ABCD",
           '/foo' => foo_id - 1
-        }
 
         parsed = JSON.parse(last_response.body)
         parsed.first['data'].must_equal 'testfoo'
 
-        post "/message-bus/ABCD", {
+        post "/message-bus/ABCD",
           '/bar' => bar_id - 1
-        }
 
         parsed = JSON.parse(last_response.body)
         parsed.first['data'].must_equal 'testfoo'

data/spec/lib/message_bus_spec.rb

@@ -2,7 +2,6 @@ require_relative '../spec_helper'
 require 'message_bus'
 require 'redis'
 
-
 describe MessageBus do
 
   before do
@@ -56,9 +55,8 @@ describe MessageBus do
       client_ids = msg.client_ids
     end
 
-    @bus.publish("/chuck", {:yeager => true}, client_ids: ['a','b'])
-
-    wait_for(2000){ client_ids}
+    @bus.publish("/chuck", { yeager: true }, client_ids: ['a', 'b'])
+    wait_for(2000) { client_ids }
 
     client_ids.must_equal ['a', 'b']
 
@@ -70,15 +68,15 @@ describe MessageBus do
     @bus.subscribe("/chuck") do |msg|
       data = msg.data
     end
-    @bus.publish("/chuck", {:norris => true})
-    @bus.publish("/chuck", {:norris => true})
-    @bus.publish("/chuck", {:norris => true})
+    @bus.publish("/chuck", norris: true)
+    @bus.publish("/chuck", norris: true)
+    @bus.publish("/chuck", norris: true)
 
     @bus.reliable_pub_sub.reset!
 
-    @bus.publish("/chuck", {:yeager => true})
+    @bus.publish("/chuck", yeager: true)
 
-    wait_for(2000){ data && data["yeager"]}
+    wait_for(2000) { data && data["yeager"] }
 
     data["yeager"].must_equal true
 
@@ -89,14 +87,14 @@ describe MessageBus do
     @bus.subscribe("/chuck") do |msg|
       data = msg.data
     end
-    @bus.publish("/chuck", {:norris => true})
-    wait_for(2000){ data }
+    @bus.publish("/chuck", norris: true)
+    wait_for(2000) { data }
 
     data["norris"].must_equal true
   end
 
   it "should get a message if it subscribes to it" do
-    user_ids,data,site_id,channel = nil
+    user_ids, data, site_id, channel = nil
 
     @bus.subscribe("/chuck") do |msg|
       data = msg.data
@@ -105,20 +103,19 @@ describe MessageBus do
       user_ids = msg.user_ids
     end
 
-    @bus.publish("/chuck", "norris", user_ids: [1,2,3])
+    @bus.publish("/chuck", "norris", user_ids: [1, 2, 3])
 
-    wait_for(2000){data}
+    wait_for(2000) { data }
 
     data.must_equal 'norris'
     site_id.must_equal 'magic'
     channel.must_equal '/chuck'
-    user_ids.must_equal [1,2,3]
+    user_ids.must_equal [1, 2, 3]
 
   end
 
-
   it "should get global messages if it subscribes to them" do
-    data,site_id,channel = nil
+    data, site_id, channel = nil
 
     @bus.subscribe do |msg|
       data = msg.data
@@ -128,7 +125,7 @@ describe MessageBus do
 
     @bus.publish("/chuck", "norris")
 
-    wait_for(2000){data}
+    wait_for(2000) { data }
 
     data.must_equal 'norris'
     site_id.must_equal 'magic'
@@ -143,7 +140,7 @@ describe MessageBus do
 
     r = @bus.backlog("/chuck", id)
 
-    r.map{|i| i.data}.to_a.must_equal ['foo', 'bar']
+    r.map { |i| i.data }.to_a.must_equal ['foo', 'bar']
   end
 
   it "should correctly get full backlog of a channel" do
@@ -151,7 +148,7 @@ describe MessageBus do
     @bus.publish("/chuck", "foo")
     @bus.publish("/chuckles", "bar")
 
-    @bus.backlog("/chuck").map{|i| i.data}.to_a.must_equal ['norris', 'foo']
+    @bus.backlog("/chuck").map { |i| i.data }.to_a.must_equal ['norris', 'foo']
 
   end
 
@@ -166,7 +163,7 @@ describe MessageBus do
     before do
       seq = 0
       @bus.site_id_lookup do
-        (seq+=1).to_s
+        (seq += 1).to_s
       end
     end
 
@@ -183,7 +180,7 @@ describe MessageBus do
       end
 
       @bus.publish("/global/test", "test")
-      wait_for(1000){ data }
+      wait_for(1000) { data }
 
       data.must_equal "test"
     end
@@ -196,7 +193,7 @@ describe MessageBus do
       end
 
       @bus.publish("/global/test", "test")
-      wait_for(1000){ data }
+      wait_for(1000) { data }
 
       data.must_equal "test"
     end
@@ -217,27 +214,33 @@ describe MessageBus do
 
   unless MESSAGE_BUS_CONFIG[:backend] == :memory
     it "should support forking properly do" do
-      data = nil
+      data = []
       @bus.subscribe do |msg|
-        data = msg.data
+        data << msg.data
       end
 
       @bus.publish("/hello", "world")
-
-      wait_for(2000){ data }
+      wait_for(2000) { data.length > 0 }
 
       if child = Process.fork
-        wait_for(2000) { data == "ready" }
+
+        wait_for(2000) { data.include?("ready") }
+        data.must_include "ready"
+
         @bus.publish("/hello", "world1")
-        wait_for(2000) { data == "got it" }
-        data.must_equal "got it"
+
+        wait_for(2000) { data.include?("got it") }
+        data.must_include "got it"
         Process.wait(child)
+
       else
         begin
           @bus.after_fork
           @bus.publish("/hello", "ready")
-          wait_for(2000) { data == "world1" }
-          if(data=="world1")
+
+          wait_for(2000) { data.include? "world1" }
+
+          if (data.include? "world1")
             @bus.publish("/hello", "got it")
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack