message_bus 2.1.6 → 2.2.0.pre

data/spec/lib/message_bus/timer_thread_spec.rb

@@ -33,7 +33,6 @@ describe MessageBus::TimerThread do
   end
 
   it "queues jobs in the correct order" do
-
     results = []
     (0..3).to_a.reverse.each do |i|
       @timer.queue(0.005 * i) do
@@ -69,5 +68,4 @@ describe MessageBus::TimerThread do
 
     error.class.must_equal NameError
   end
-
 end

data/spec/lib/message_bus_spec.rb

@@ -3,7 +3,6 @@ require 'message_bus'
 require 'redis'
 
 describe MessageBus do
-
   before do
     @bus = MessageBus::Instance.new
     @bus.site_id_lookup do
@@ -17,6 +16,25 @@ describe MessageBus do
     @bus.destroy
   end
 
+  it "can be turned off" do
+    @bus.off
+
+    @bus.off?.must_equal true
+  end
+
+  it "can call destroy twice" do
+    @bus.destroy
+    @bus.destroy
+  end
+
+  it "can be turned on after destroy" do
+    @bus.destroy
+
+    @bus.on
+
+    @bus.after_fork
+  end
+
   it "can subscribe from a point in time" do
     @bus.publish("/minion", "banana")
 
@@ -59,11 +77,9 @@ describe MessageBus do
     wait_for(2000) { client_ids }
 
     client_ids.must_equal ['a', 'b']
-
   end
 
   it "should recover from a redis flush" do
-
     data = nil
     @bus.subscribe("/chuck") do |msg|
       data = msg.data
@@ -79,7 +95,24 @@ describe MessageBus do
     wait_for(2000) { data && data["yeager"] }
 
     data["yeager"].must_equal true
+  end
+
+  it "should recover from a backlog expiring" do
+    data = nil
+    @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.reliable_pub_sub.expire_all_backlogs!
+
+    @bus.publish("/chuck", yeager: true)
+
+    wait_for(2000) { data && data["yeager"] }
+
+    data["yeager"].must_equal true
   end
 
   it "should automatically decode hashed messages" do
@@ -111,7 +144,6 @@ describe MessageBus do
     site_id.must_equal 'magic'
     channel.must_equal '/chuck'
     user_ids.must_equal [1, 2, 3]
-
   end
 
   it "should get global messages if it subscribes to them" do
@@ -130,7 +162,6 @@ describe MessageBus do
     data.must_equal 'norris'
     site_id.must_equal 'magic'
     channel.must_equal '/chuck'
-
   end
 
   it "should have the ability to grab the backlog messages in the correct order" do
@@ -149,7 +180,6 @@ describe MessageBus do
     @bus.publish("/chuckles", "bar")
 
     @bus.backlog("/chuck").map { |i| i.data }.to_a.must_equal ['norris', 'foo']
-
   end
 
   it "allows you to look up last_message" do
@@ -193,7 +223,6 @@ describe MessageBus do
     end
 
     it "can subscribe globally" do
-
       data = nil
       @bus.subscribe do |message|
         data = message.data
@@ -206,7 +235,6 @@ describe MessageBus do
     end
 
     it "can subscribe to channel" do
-
       data = nil
       @bus.subscribe("/global/test") do |message|
         data = message.data
@@ -229,49 +257,37 @@ describe MessageBus do
         @bus.publish("/global/test", "test", user_ids: [1])
       end.must_raise(MessageBus::InvalidMessage)
     end
-
   end
 
-  unless MESSAGE_BUS_CONFIG[:backend] == :memory
-    it "should support forking properly do" do
-      data = []
-      @bus.subscribe do |msg|
-        data << msg.data
-      end
-
-      @bus.publish("/hello", "world")
-      wait_for(2000) { data.length > 0 }
-
-      if child = Process.fork
-
-        wait_for(2000) { data.include?("ready") }
-        data.must_include "ready"
-
-        @bus.publish("/hello", "world1")
+  it "should support forking properly do" do
+    test_never :memory
 
-        wait_for(2000) { data.include?("got it") }
-        data.must_include "got it"
-        Process.wait(child)
-
-      else
-        begin
-          @bus.after_fork
-          @bus.publish("/hello", "ready")
+    data = []
+    @bus.subscribe do |msg|
+      data << msg.data
+    end
 
-          wait_for(2000) { data.include? "world1" }
+    @bus.publish("/hello", "pre-fork")
+    wait_for(2000) { data.length > 0 }
 
-          if (data.include? "world1")
-            @bus.publish("/hello", "got it")
-          end
+    if child = Process.fork
+      # The child was forked and we received its PID
 
-          $stdout.reopen("/dev/null", "w")
-          $stderr.reopen("/dev/null", "w")
+      # Wait for fork to finish so we're asserting that we can still publish after it has
+      Process.wait(child)
 
-        ensure
-          exit!(0)
-        end
+      @bus.publish("/hello", "continuation")
+    else
+      begin
+        @bus.after_fork
+        @bus.publish("/hello", "from-fork")
+      ensure
+        exit!(0)
       end
-
     end
+
+    wait_for(2000) { data.length == 3 }
+
+    data.must_equal(["pre-fork", "from-fork", "continuation"])
   end
 end

data/spec/spec_helper.rb

@@ -8,15 +8,18 @@ require 'minitest/autorun'
 require 'minitest/spec'
 
 backend = (ENV['MESSAGE_BUS_BACKEND'] || :redis).to_sym
-MESSAGE_BUS_CONFIG = {:backend=>backend}
+MESSAGE_BUS_CONFIG = { backend: backend }
 require "message_bus/backends/#{backend}"
 PUB_SUB_CLASS = MessageBus::BACKENDS.fetch(backend)
-if backend == :postgres
-  MESSAGE_BUS_CONFIG.merge!(:backend_options=>{:user=>ENV['PGUSER'] || ENV['USER'], :dbname=>ENV['PGDATABASE'] || 'message_bus_test'})
+case backend
+when :redis
+  MESSAGE_BUS_CONFIG.merge!(url: ENV['REDISURL'])
+when :postgres
+  MESSAGE_BUS_CONFIG.merge!(backend_options: { host: ENV['PGHOST'], user: ENV['PGUSER'] || ENV['USER'], password: ENV['PGPASSWORD'], dbname: ENV['PGDATABASE'] || 'message_bus_test' })
 end
 puts "Running with backend: #{backend}"
 
-def wait_for(timeout_milliseconds=2000)
+def wait_for(timeout_milliseconds = 2000)
   timeout = (timeout_milliseconds + 0.0) / 1000
   finish = Time.now + timeout
 
@@ -25,5 +28,14 @@ def wait_for(timeout_milliseconds=2000)
       sleep(0.001)
     end
   end.join
+end
+
+def test_only(*backends)
+  backend = MESSAGE_BUS_CONFIG[:backend]
+  skip "Test doesn't apply to #{backend}" unless backends.include?(backend)
+end
 
+def test_never(*backends)
+  backend = MESSAGE_BUS_CONFIG[:backend]
+  skip "Test doesn't apply to #{backend}" if backends.include?(backend)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.0.pre
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -61,8 +61,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG
+- Dockerfile
 - Gemfile
 - Guardfile
 - LICENSE
@@ -76,6 +78,7 @@ files:
 - assets/jquery-1.8.2.js
 - assets/message-bus-ajax.js
 - assets/message-bus.js
+- docker-compose.yml
 - examples/bench/bench.lua
 - examples/bench/config.ru
 - examples/bench/puma.rb
@@ -89,6 +92,8 @@ files:
 - examples/minimal/Gemfile
 - examples/minimal/config.ru
 - lib/message_bus.rb
+- lib/message_bus/backends.rb
+- lib/message_bus/backends/base.rb
 - lib/message_bus/backends/memory.rb
 - lib/message_bus/backends/postgres.rb
 - lib/message_bus/backends/redis.rb
@@ -111,8 +116,7 @@ files:
 - spec/assets/support/jasmine_helper.rb
 - spec/lib/fake_async_middleware.rb
 - spec/lib/message_bus/assets/asset_encoding_spec.rb
-- spec/lib/message_bus/backends/postgres_spec.rb
-- spec/lib/message_bus/backends/redis_spec.rb
+- spec/lib/message_bus/backend_spec.rb
 - spec/lib/message_bus/client_spec.rb
 - spec/lib/message_bus/connection_manager_spec.rb
 - spec/lib/message_bus/distributed_cache_spec.rb
@@ -136,12 +140,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6
@@ -155,8 +159,7 @@ test_files:
 - spec/assets/support/jasmine_helper.rb
 - spec/lib/fake_async_middleware.rb
 - spec/lib/message_bus/assets/asset_encoding_spec.rb
-- spec/lib/message_bus/backends/postgres_spec.rb
-- spec/lib/message_bus/backends/redis_spec.rb
+- spec/lib/message_bus/backend_spec.rb
 - spec/lib/message_bus/client_spec.rb
 - spec/lib/message_bus/connection_manager_spec.rb
 - spec/lib/message_bus/distributed_cache_spec.rb

data/spec/lib/message_bus/backends/postgres_spec.rb

@@ -1,221 +0,0 @@
-require_relative '../../../spec_helper'
-require 'message_bus'
-
-if MESSAGE_BUS_CONFIG[:backend] == :postgres || MESSAGE_BUS_CONFIG[:backend] == :memory
-describe PUB_SUB_CLASS do
-
-  def new_test_bus
-    PUB_SUB_CLASS.new(MESSAGE_BUS_CONFIG.merge(:db => 10))
-  end
-
-  before do
-    @bus = new_test_bus
-    @bus.reset!
-  end
-
-  describe "readonly" do
-
-    after do
-      @bus.pub_redis.slaveof "no", "one"
-    end
-
-    it "should be able to store messages in memory for a period while in read only" do
-
-      skip "This spec changes redis behavior that in turn means other specs run slow"
-
-      @bus.pub_redis.slaveof "127.0.0.80", "666"
-      @bus.max_in_memory_publish_backlog = 2
-
-      3.times do
-        result = @bus.publish "/foo", "bar"
-        assert_nil result
-      end
-
-      @bus.pub_redis.slaveof "no", "one"
-      sleep 0.01
-
-      @bus.backlog("/foo", 0).map(&:data).must_equal ["bar","bar"]
-
-    end
-  end
-
-  it "should be able to access the backlog" do
-    @bus.publish "/foo", "bar"
-    @bus.publish "/foo", "baz"
-
-    @bus.backlog("/foo", 0).to_a.must_equal [
-      MessageBus::Message.new(1,1,'/foo','bar'),
-      MessageBus::Message.new(2,2,'/foo','baz')
-    ]
-  end
-
-  it "should initialize with max_backlog_size" do
-    PUB_SUB_CLASS.new({},2000).max_backlog_size.must_equal 2000
-  end
-
-  it "should truncate channels correctly" do
-    @bus.max_backlog_size = 2
-    4.times do |t|
-      @bus.publish "/foo", "1#{t}"
-    end
-
-    @bus.backlog("/foo").to_a.must_equal [
-      MessageBus::Message.new(3,3,'/foo','12'),
-      MessageBus::Message.new(4,4,'/foo','13'),
-    ]
-  end
-
-  it "should truncate global backlog correctly" do
-    @bus.max_global_backlog_size = 2
-    @bus.publish "/foo", "11"
-    @bus.publish "/bar", "21"
-    @bus.publish "/baz", "31"
-
-    @bus.global_backlog.length.must_equal 2
-  end
-
-  it "should support clear_every setting" do
-    @bus.clear_every = 5
-    @bus.max_global_backlog_size = 2
-    @bus.publish "/foo", "11"
-    @bus.publish "/bar", "21"
-    @bus.publish "/baz", "31"
-    @bus.publish "/bar", "41"
-    @bus.global_backlog.length.must_equal 4
-
-    @bus.publish "/baz", "51"
-    @bus.global_backlog.length.must_equal 2
-  end
-
-  it "should be able to grab a message by id" do
-    id1 = @bus.publish "/foo", "bar"
-    id2 = @bus.publish "/foo", "baz"
-    @bus.get_message("/foo", id2).must_equal MessageBus::Message.new(2, 2, "/foo", "baz")
-    @bus.get_message("/foo", id1).must_equal MessageBus::Message.new(1, 1, "/foo", "bar")
-  end
-
-  it "should be able to access the global backlog" do
-    @bus.publish "/foo", "bar"
-    @bus.publish "/hello", "world"
-    @bus.publish "/foo", "baz"
-    @bus.publish "/hello", "planet"
-
-    @bus.global_backlog.to_a.must_equal [
-      MessageBus::Message.new(1, 1, "/foo", "bar"),
-      MessageBus::Message.new(2, 2, "/hello", "world"),
-      MessageBus::Message.new(3, 3, "/foo", "baz"),
-      MessageBus::Message.new(4, 4, "/hello", "planet")
-    ]
-  end
-
-  it "should correctly omit dropped messages from the global backlog" do
-    @bus.max_backlog_size = 1
-    @bus.publish "/foo", "a1"
-    @bus.publish "/foo", "b1"
-    @bus.publish "/bar", "a1"
-    @bus.publish "/bar", "b1"
-
-    @bus.global_backlog.to_a.must_equal [
-      MessageBus::Message.new(2, 2, "/foo", "b1"),
-      MessageBus::Message.new(4, 4, "/bar", "b1")
-    ]
-  end
-
-  it "should have the correct number of messages for multi threaded access" do
-    threads = []
-    4.times do
-      threads << Thread.new do
-        bus = @bus
-        25.times {
-          bus.publish "/foo", ".."
-        }
-      end
-    end
-
-    threads.each{|t| t.join}
-    @bus.backlog("/foo").length == 100
-  end
-
-  it "should be able to subscribe globally with recovery" do
-    @bus.publish("/foo", "11")
-    @bus.publish("/bar", "12")
-    got = []
-
-    t = Thread.new do
-      @bus.global_subscribe(0) do |msg|
-        got << msg
-      end
-    end
-
-    @bus.publish("/bar", "13")
-
-    wait_for(100) do
-      got.length == 3
-    end
-
-    t.kill
-
-    got.length.must_equal 3
-    got.map{|m| m.data}.must_equal ["11","12","13"]
-  end
-
-  it "should be able to encode and decode messages properly" do
-    m = MessageBus::Message.new 1,2,'||','||'
-    MessageBus::Message.decode(m.encode).must_equal m
-  end
-
-  it "should handle subscribe on single channel, with recovery" do
-    @bus.publish("/foo", "11")
-    @bus.publish("/bar", "12")
-    got = []
-
-    t = Thread.new do
-      @bus.subscribe("/foo",0) do |msg|
-        got << msg
-      end
-    end
-
-    @bus.publish("/foo", "13")
-
-    wait_for(100) do
-      got.length == 2
-    end
-
-    t.kill
-
-    got.map{|m| m.data}.must_equal ["11","13"]
-  end
-
-  it "should not get backlog if subscribe is called without params" do
-    @bus.publish("/foo", "11")
-    got = []
-
-    t = Thread.new do
-      @bus.subscribe("/foo") do |msg|
-        got << msg
-      end
-    end
-
-    # sleep 50ms to allow the bus to correctly subscribe,
-    #   I thought about adding a subscribed callback, but outside of testing it matters less
-    sleep 0.05
-
-    @bus.publish("/foo", "12")
-
-    wait_for(100) do
-      got.length == 1
-    end
-
-    t.kill
-
-    got.map{|m| m.data}.must_equal ["12"]
-  end
-
-  it "should allow us to get last id on a channel" do
-    @bus.last_id("/foo").must_equal 0
-    @bus.publish("/foo", "11")
-    @bus.last_id("/foo").must_equal 1
-  end
-
-end
-end