message_bus 2.2.0.pre.1 → 2.2.0.pre.2

data/lib/message_bus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MessageBus
-  VERSION = "2.2.0.pre.1"
+  VERSION = "2.2.0.pre.2"
 end

data/spec/fixtures/test/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'message_bus'

data/spec/fixtures/test/config.ru

@@ -0,0 +1,17 @@
+require 'message_bus'
+
+MessageBus.config[:backend] = :memory
+MessageBus.long_polling_interval = 1000
+use MessageBus::Rack::Middleware
+
+run ->(env) do
+  if env["REQUEST_METHOD"] == "GET" && env["REQUEST_PATH"] == "/publish"
+    payload = { hello: "world" }
+
+    ["/test", "/test2"].each do |channel|
+      MessageBus.publish(channel, payload)
+    end
+  end
+
+  [200, { "Content-Type" => "text/html" }, ["Howdy"]]
+end

data/spec/helpers.rb

@@ -0,0 +1,19 @@
+def wait_for(timeout_milliseconds = 2000)
+  timeout = (timeout_milliseconds + 0.0) / 1000
+  finish = Time.now + timeout
+
+  Thread.new do
+    sleep(0.001) while Time.now < finish && !yield
+  end.join
+end
+
+def test_config_for_backend(backend)
+  config = { backend: backend }
+  case backend
+  when :redis
+    config[:url] = ENV['REDISURL']
+  when :postgres
+    config[:backend_options] = { host: ENV['PGHOST'], user: ENV['PGUSER'] || ENV['USER'], password: ENV['PGPASSWORD'], dbname: ENV['PGDATABASE'] || 'message_bus_test' }
+  end
+  config
+end

data/spec/integration/http_client_spec.rb

@@ -0,0 +1,197 @@
+require_relative '../spec_helper'
+require 'message_bus/http_client'
+
+describe MessageBus::HTTPClient do
+  let(:base_url) { "http://0.0.0.0:9292" }
+  let(:client) { MessageBus::HTTPClient.new(base_url) }
+  let(:headers) { client.send(:headers) }
+  let(:channel) { "/test" }
+  let(:channel2) { "/test2" }
+  let(:stats) { client.stats }
+
+  def publish_message
+    response = Net::HTTP.get_response(URI("#{base_url}/publish"))
+    assert_equal("200", response.code)
+  end
+
+  before do
+    @threads = Thread.list
+  end
+
+  after do
+    new_threads = Thread.list - @threads
+    client.stop
+    new_threads.each(&:join)
+  end
+
+  describe '#start and #stop' do
+    it 'should be able to start and stop polling correctly' do
+      threads = Thread.list
+
+      assert_equal(MessageBus::HTTPClient::STOPPED, client.status)
+
+      client.start
+      new_threads = Thread.list - threads
+
+      assert_equal(1, new_threads.size)
+      assert_equal(MessageBus::HTTPClient::STARTED, client.status)
+
+      client.start
+
+      assert_equal(new_threads, Thread.list - threads)
+    end
+  end
+
+  describe '#subscribe' do
+    it 'should be able to subscribe to channels for messages' do
+      called = 0
+      called2 = 0
+
+      client.subscribe(channel, last_message_id: -1) do |data|
+        called += 1
+        assert_equal("world", data["hello"])
+      end
+
+      client.subscribe(channel2) do |data|
+        called2 += 1
+        assert_equal("world", data["hello"])
+      end
+
+      while called < 2 && called2 < 2
+        publish_message
+        sleep 0.05
+      end
+
+      while stats.success < 1
+        sleep 0.05
+      end
+
+      assert_equal(0, stats.failed)
+    end
+
+    describe 'supports including extra headers' do
+      let(:client) do
+        MessageBus::HTTPClient.new(base_url, headers: {
+          'Dont-Chunk' => "true"
+        })
+      end
+
+      it 'should include the header in the request' do
+        called = 0
+
+        client.subscribe(channel) do |data|
+          called += 1
+          assert_equal("world", data["hello"])
+        end
+
+        while called < 2
+          publish_message
+          sleep 0.05
+        end
+      end
+    end
+
+    describe 'when chunked encoding is disabled' do
+      let(:client) do
+        MessageBus::HTTPClient.new(base_url, enable_chunked_encoding: false)
+      end
+
+      it 'should still be able to subscribe to channels for messages' do
+        called = 0
+
+        client.subscribe(channel) do |data|
+          called += 1
+          assert_equal("world", data["hello"])
+        end
+
+        while called < 2
+          publish_message
+          sleep 0.05
+        end
+      end
+    end
+
+    describe 'when enable_long_polling is disabled' do
+      let(:client) do
+        MessageBus::HTTPClient.new(base_url,
+                                   enable_long_polling: false,
+                                   background_callback_interval: 0.01)
+      end
+
+      it 'should still be able to subscribe to channels for messages' do
+        called = 0
+
+        client.subscribe(channel) do |data|
+          called += 1
+          assert_equal("world", data["hello"])
+        end
+
+        while called < 2
+          publish_message
+          sleep 0.05
+        end
+      end
+    end
+
+    describe 'when channel name is invalid' do
+      it 'should raise the right error' do
+        ["test", 1, :test].each do |invalid_channel|
+          assert_raises MessageBus::HTTPClient::InvalidChannel do
+            client.subscribe(invalid_channel)
+          end
+        end
+      end
+    end
+
+    describe 'when a block is not given' do
+      it 'should raise the right error' do
+        assert_raises MessageBus::HTTPClient::MissingBlock do
+          client.subscribe(channel)
+        end
+      end
+    end
+
+    describe 'with last_message_id' do
+      describe 'when invalid' do
+        it 'should subscribe from the latest message' do
+          client.subscribe(channel, last_message_id: 'haha') {}
+          assert_equal(-1, client.channels[channel].last_message_id)
+        end
+      end
+
+      describe 'when valid' do
+        it 'should subscribe from the right message' do
+          client.subscribe(channel, last_message_id: -2) {}
+          assert_equal(-2, client.channels[channel].last_message_id)
+        end
+      end
+    end
+  end
+
+  describe '#unsubscribe' do
+    it 'should be able to unsubscribe a channel' do
+      client.subscribe(channel) { raise "Not called" }
+      assert(client.channels[channel])
+
+      client.unsubscribe(channel)
+      assert_nil(client.channels[channel])
+    end
+
+    describe 'with callback' do
+      it 'should be able to unsubscribe a callback for a particular channel' do
+        callback = -> { raise "Not called" }
+        callback2 = -> { raise "Not called2" }
+
+        client.subscribe(channel, &callback)
+        client.subscribe(channel, &callback2)
+        assert_equal([callback, callback2], client.channels[channel].callbacks)
+
+        client.unsubscribe(channel, &callback)
+        assert_equal([callback2], client.channels[channel].callbacks)
+
+        client.unsubscribe(channel, &callback2)
+        assert_nil(client.channels[channel])
+      end
+    end
+  end
+end

data/spec/lib/message_bus/connection_manager_spec.rb

@@ -10,16 +10,24 @@ class FakeAsync
     @sent << val
   end
 
-  def sent; @sent; end
+  def sent
+    @sent
+  end
 
-  def done; @done = true; end
+  def done
+    @done = true
+  end
 
-  def done?; @done; end
+  def done?
+    @done
+  end
 end
 
 class FakeTimer
   attr_accessor :cancelled
-  def cancel; @cancelled = true; end
+  def cancel
+    @cancelled = true
+  end
 end
 
 describe MessageBus::ConnectionManager do

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

@@ -131,16 +131,24 @@ 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;"
+      last_response.content_type.must_equal "application/javascript;charset=UTF-8"
     end
   end
 

data/spec/performance/publish.rb

@@ -0,0 +1,102 @@
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', '..', 'lib')
+require 'logger'
+require 'benchmark'
+require 'message_bus'
+
+require_relative "../helpers"
+
+backends = ENV['MESSAGE_BUS_BACKENDS'].split(",").map(&:to_sym)
+channel = "/foo"
+iterations = 10_000
+results = []
+
+puts "Running publication benchmark with #{iterations} iterations on backends: #{backends.inspect}"
+
+benchmark_publication_only = lambda do |bm, backend|
+  bus = MessageBus::Instance.new
+  bus.configure(test_config_for_backend(backend))
+
+  bm.report("#{backend} - publication only") do
+    iterations.times { bus.publish(channel, "Hello world") }
+  end
+
+  bus.reset!
+  bus.destroy
+end
+
+benchmark_subscription_no_trimming = lambda do |bm, backend|
+  test_title = "#{backend} - subscription no trimming"
+
+  bus = MessageBus::Instance.new
+  bus.configure(test_config_for_backend(backend))
+
+  bus.reliable_pub_sub.max_backlog_size = iterations
+  bus.reliable_pub_sub.max_global_backlog_size = iterations
+
+  messages_received = 0
+  bus.after_fork
+  bus.subscribe(channel) do |_message|
+    messages_received += 1
+  end
+
+  bm.report(test_title) do
+    iterations.times { bus.publish(channel, "Hello world") }
+    wait_for(60000) { messages_received == iterations }
+  end
+
+  results << "[#{test_title}]: #{iterations} messages sent, #{messages_received} received, rate of #{(messages_received.to_f / iterations.to_f) * 100}%"
+
+  bus.reset!
+  bus.destroy
+end
+
+benchmark_subscription_with_trimming = lambda do |bm, backend|
+  test_title = "#{backend} - subscription with trimming"
+
+  bus = MessageBus::Instance.new
+  bus.configure(test_config_for_backend(backend))
+
+  bus.reliable_pub_sub.max_backlog_size = (iterations / 10)
+  bus.reliable_pub_sub.max_global_backlog_size = (iterations / 10)
+
+  messages_received = 0
+  bus.after_fork
+  bus.subscribe(channel) do |_message|
+    messages_received += 1
+  end
+
+  bm.report(test_title) do
+    iterations.times { bus.publish(channel, "Hello world") }
+    wait_for(60000) { messages_received == iterations }
+  end
+
+  results << "[#{test_title}]: #{iterations} messages sent, #{messages_received} received, rate of #{(messages_received.to_f / iterations.to_f) * 100}%"
+
+  bus.reset!
+  bus.destroy
+end
+
+puts
+Benchmark.bm(60) do |bm|
+  backends.each do |backend|
+    benchmark_publication_only.call(bm, backend)
+  end
+
+  puts
+
+  backends.each do |backend|
+    benchmark_subscription_no_trimming.call(bm, backend)
+  end
+
+  results << nil
+  puts
+
+  backends.each do |backend|
+    benchmark_subscription_with_trimming.call(bm, backend)
+  end
+end
+puts
+
+results.each do |result|
+  puts result
+end

data/spec/spec_helper.rb

@@ -7,29 +7,14 @@ require 'message_bus'
 require 'minitest/autorun'
 require 'minitest/spec'
 
+require_relative "helpers"
+
 backend = (ENV['MESSAGE_BUS_BACKEND'] || :redis).to_sym
-MESSAGE_BUS_CONFIG = { backend: backend }
+MESSAGE_BUS_CONFIG = test_config_for_backend(backend)
 require "message_bus/backends/#{backend}"
 PUB_SUB_CLASS = MessageBus::BACKENDS.fetch(backend)
-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)
-  timeout = (timeout_milliseconds + 0.0) / 1000
-  finish = Time.now + timeout
-
-  Thread.new do
-    while Time.now < finish && !yield
-      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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.1
+  version: 2.2.0.pre.2
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -61,7 +61,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG
 - Dockerfile
@@ -70,14 +69,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- assets/application.handlebars
-- assets/application.js
-- assets/ember.js
-- assets/handlebars.js
-- assets/index.handlebars
+- assets/application.jsx
+- assets/babel.min.js
 - assets/jquery-1.8.2.js
 - assets/message-bus-ajax.js
 - assets/message-bus.js
+- assets/react-dom.js
+- assets/react.js
 - docker-compose.yml
 - examples/bench/bench.lua
 - examples/bench/config.ru
@@ -89,6 +87,8 @@ files:
 - examples/chat/config.ru
 - examples/chat/docker_container/chat.yml
 - examples/chat/docker_container/update_chat
+- examples/diagnostics/Gemfile
+- examples/diagnostics/config.ru
 - examples/minimal/Gemfile
 - examples/minimal/config.ru
 - lib/message_bus.rb
@@ -102,6 +102,9 @@ files:
 - lib/message_bus/diagnostics.rb
 - lib/message_bus/distributed_cache.rb
 - lib/message_bus/em_ext.rb
+- lib/message_bus/http_client.rb
+- lib/message_bus/http_client/channel.rb
+- lib/message_bus/http_client/version.rb
 - lib/message_bus/message.rb
 - lib/message_bus/rack/diagnostics.rb
 - lib/message_bus/rack/middleware.rb
@@ -114,6 +117,10 @@ files:
 - spec/assets/message-bus.spec.js
 - spec/assets/support/jasmine.yml
 - spec/assets/support/jasmine_helper.rb
+- spec/fixtures/test/Gemfile
+- spec/fixtures/test/config.ru
+- spec/helpers.rb
+- spec/integration/http_client_spec.rb
 - spec/lib/fake_async_middleware.rb
 - spec/lib/message_bus/assets/asset_encoding_spec.rb
 - spec/lib/message_bus/backend_spec.rb
@@ -124,6 +131,7 @@ files:
 - spec/lib/message_bus/rack/middleware_spec.rb
 - spec/lib/message_bus/timer_thread_spec.rb
 - spec/lib/message_bus_spec.rb
+- spec/performance/publish.rb
 - spec/spec_helper.rb
 - vendor/assets/javascripts/.gitignore
 - vendor/assets/javascripts/message-bus-ajax.js
@@ -157,6 +165,10 @@ test_files:
 - spec/assets/message-bus.spec.js
 - spec/assets/support/jasmine.yml
 - spec/assets/support/jasmine_helper.rb
+- spec/fixtures/test/Gemfile
+- spec/fixtures/test/config.ru
+- spec/helpers.rb
+- spec/integration/http_client_spec.rb
 - spec/lib/fake_async_middleware.rb
 - spec/lib/message_bus/assets/asset_encoding_spec.rb
 - spec/lib/message_bus/backend_spec.rb
@@ -167,4 +179,5 @@ test_files:
 - spec/lib/message_bus/rack/middleware_spec.rb
 - spec/lib/message_bus/timer_thread_spec.rb
 - spec/lib/message_bus_spec.rb
+- spec/performance/publish.rb
 - spec/spec_helper.rb