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

data/spec/lib/message_bus/timer_thread_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative '../../spec_helper'
 require 'message_bus/timer_thread'
 
 describe MessageBus::TimerThread do
@@ -13,7 +13,7 @@ describe MessageBus::TimerThread do
   it "allows you to queue every jobs" do
     i = 0
     m = Mutex.new
-    every = @timer.every(0.001){m.synchronize{i += 1}}
+    every = @timer.every(0.001){m.synchronize{i += 1 if i < 3}}
     # allow lots of time, cause in test mode stuff can be slow
     wait_for(1000) do
       m.synchronize do
@@ -22,14 +22,14 @@ describe MessageBus::TimerThread do
       end
     end
     sleep 0.002
-    i.should == 3
+    i.must_equal 3
   end
 
   it "allows you to cancel timers" do
     success = true
     @timer.queue(0.005){success=false}.cancel
     sleep(0.006)
-    success.should == true
+    success.must_equal true
   end
 
   it "queues jobs in the correct order" do
@@ -45,7 +45,7 @@ describe MessageBus::TimerThread do
       4 == results.length
     }
 
-    results.should == [0,1,2,3]
+    results.must_equal [0,1,2,3]
   end
 
   it "should call the error callback if something goes wrong" do
@@ -67,7 +67,7 @@ describe MessageBus::TimerThread do
       error
     end
 
-    error.class.should == NameError
+    error.class.must_equal NameError
   end
 
 end

data/spec/lib/message_bus_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative '../spec_helper'
 require 'message_bus'
 require 'redis'
 
@@ -10,7 +10,7 @@ describe MessageBus do
     @bus.site_id_lookup do
       "magic"
     end
-    @bus.redis_config = {}
+    @bus.redis_config = MESSAGE_BUS_CONFIG
   end
 
   after do
@@ -29,7 +29,7 @@ describe MessageBus do
 
     wait_for(2000){ client_ids}
 
-    client_ids.should == ['a', 'b']
+    client_ids.must_equal ['a', 'b']
 
   end
 
@@ -49,7 +49,7 @@ describe MessageBus do
 
     wait_for(2000){ data["yeager"]}
 
-    data["yeager"].should == true
+    data["yeager"].must_equal true
 
   end
 
@@ -61,7 +61,7 @@ describe MessageBus do
     @bus.publish("/chuck", {:norris => true})
     wait_for(2000){ data }
 
-    data["norris"].should == true
+    data["norris"].must_equal true
   end
 
   it "should get a message if it subscribes to it" do
@@ -78,10 +78,10 @@ describe MessageBus do
 
     wait_for(2000){data}
 
-    data.should == 'norris'
-    site_id.should == 'magic'
-    channel.should == '/chuck'
-    user_ids.should == [1,2,3]
+    data.must_equal 'norris'
+    site_id.must_equal 'magic'
+    channel.must_equal '/chuck'
+    user_ids.must_equal [1,2,3]
 
   end
 
@@ -99,9 +99,9 @@ describe MessageBus do
 
     wait_for(2000){data}
 
-    data.should == 'norris'
-    site_id.should == 'magic'
-    channel.should == '/chuck'
+    data.must_equal 'norris'
+    site_id.must_equal 'magic'
+    channel.must_equal '/chuck'
 
   end
 
@@ -112,7 +112,7 @@ describe MessageBus do
 
     r = @bus.backlog("/chuck", id)
 
-    r.map{|i| i.data}.to_a.should == ['foo', 'bar']
+    r.map{|i| i.data}.to_a.must_equal ['foo', 'bar']
   end
 
   it "should correctly get full backlog of a channel" do
@@ -120,18 +120,18 @@ describe MessageBus do
     @bus.publish("/chuck", "foo")
     @bus.publish("/chuckles", "bar")
 
-    @bus.backlog("/chuck").map{|i| i.data}.to_a.should == ['norris', 'foo']
+    @bus.backlog("/chuck").map{|i| i.data}.to_a.must_equal ['norris', 'foo']
 
   end
 
   it "allows you to look up last_message" do
     @bus.publish("/bob", "dylan")
     @bus.publish("/bob", "marley")
-    @bus.last_message("/bob").data.should == "marley"
-    @bus.last_message("/nothing").should == nil
+    @bus.last_message("/bob").data.must_equal "marley"
+    @bus.last_message("/nothing").must_equal nil
   end
 
-  context "global subscriptions" do
+  describe "global subscriptions" do
     before do
       seq = 0
       @bus.site_id_lookup do
@@ -141,7 +141,7 @@ describe MessageBus do
 
     it "can get last_message" do
       @bus.publish("/global/test", "test")
-      @bus.last_message("/global/test").data.should == "test"
+      @bus.last_message("/global/test").data.must_equal "test"
     end
 
     it "can subscribe globally" do
@@ -154,7 +154,7 @@ describe MessageBus do
       @bus.publish("/global/test", "test")
       wait_for(1000){ data }
 
-      data.should == "test"
+      data.must_equal "test"
     end
 
     it "can subscribe to channel" do
@@ -167,19 +167,19 @@ describe MessageBus do
       @bus.publish("/global/test", "test")
       wait_for(1000){ data }
 
-      data.should == "test"
+      data.must_equal "test"
     end
 
     it "should exception if publishing restricted messages to user" do
       lambda do
         @bus.publish("/global/test", "test", user_ids: [1])
-      end.should raise_error(MessageBus::InvalidMessage)
+      end.must_raise(MessageBus::InvalidMessage)
     end
 
     it "should exception if publishing restricted messages to group" do
       lambda do
         @bus.publish("/global/test", "test", user_ids: [1])
-      end.should raise_error(MessageBus::InvalidMessage)
+      end.must_raise(MessageBus::InvalidMessage)
     end
 
   end
@@ -198,22 +198,23 @@ describe MessageBus do
       wait_for(2000) { data == "ready" }
       @bus.publish("/hello", "world1")
       wait_for(2000) { data == "got it" }
-      data.should == "got it"
+      data.must_equal "got it"
       Process.wait(child)
     else
-      @bus.after_fork
-      @bus.publish("/hello", "ready")
-      wait_for(2000) { data == "world1" }
-      if(data=="world1")
-        @bus.publish("/hello", "got it")
+      begin
+        @bus.after_fork
+        @bus.publish("/hello", "ready")
+        wait_for(2000) { data == "world1" }
+        if(data=="world1")
+          @bus.publish("/hello", "got it")
+        end
+
+        $stdout.reopen("/dev/null", "w")
+        $stderr.reopen("/dev/null", "w")
+
+      ensure
+        exit!(0)
       end
-
-      $stdout.reopen("/dev/null", "w")
-      $stderr.reopen("/dev/null", "w")
-
-      # having some issues with exit here
-      # TODO find and fix
-      Process.kill "KILL", Process.pid
     end
 
   end

data/spec/spec_helper.rb

@@ -1,34 +1,29 @@
+$: << File.dirname(__FILE__)
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'thin'
 require 'lib/fake_async_middleware'
+require 'message_bus'
 
-RSpec.configure do |config|
-  config.expect_with :rspec do |c|
-    c.syntax = [:should, :expect]
-  end
-  config.mock_with :rspec do |mocks|
-    mocks.syntax = :should
-  end
+require 'minitest/autorun'
+require 'minitest/spec'
 
-  # to debug hanging tests
-  # config.before :each do |x|
-  #   $start = Time.now
-  #   puts "Start: #{x.metadata[:location]}"
-  # end
-  #
-  # config.after :each do |x|
-  #   puts "#{x.metadata[:location]} #{Time.now - $start}"
-  # end
+backend = (ENV['MESSAGE_BUS_BACKEND'] || :redis).to_sym
+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'})
 end
+puts "Running with backend: #{backend}"
 
 def wait_for(timeout_milliseconds)
   timeout = (timeout_milliseconds + 0.0) / 1000
   finish = Time.now + timeout
-  t = Thread.new do
+
+  Thread.new do
     while Time.now < finish && !yield
       sleep(0.001)
     end
-  end
-  t.join
-end
-
+  end.join
 
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.2
+  version: 2.0.0.beta.3
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -31,7 +31,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -72,6 +86,8 @@ files:
 - examples/minimal/Gemfile
 - examples/minimal/config.ru
 - lib/message_bus.rb
+- lib/message_bus/backends/postgres.rb
+- lib/message_bus/backends/redis.rb
 - lib/message_bus/client.rb
 - lib/message_bus/connection_manager.rb
 - lib/message_bus/diagnostics.rb
@@ -81,17 +97,17 @@ files:
 - lib/message_bus/rack/middleware.rb
 - lib/message_bus/rack/thin_ext.rb
 - lib/message_bus/rails/railtie.rb
-- lib/message_bus/redis/reliable_pub_sub.rb
 - lib/message_bus/timer_thread.rb
 - lib/message_bus/version.rb
 - message_bus.gemspec
 - 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/client_spec.rb
 - spec/lib/message_bus/connection_manager_spec.rb
 - spec/lib/message_bus/multi_process_spec.rb
 - spec/lib/message_bus/rack/middleware_spec.rb
-- spec/lib/message_bus/redis/reliable_pub_sub_spec.rb
 - spec/lib/message_bus/timer_thread_spec.rb
 - spec/lib/message_bus_spec.rb
 - spec/spec_helper.rb
@@ -108,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -123,11 +139,12 @@ summary: ''
 test_files:
 - 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/client_spec.rb
 - spec/lib/message_bus/connection_manager_spec.rb
 - spec/lib/message_bus/multi_process_spec.rb
 - spec/lib/message_bus/rack/middleware_spec.rb
-- spec/lib/message_bus/redis/reliable_pub_sub_spec.rb
 - spec/lib/message_bus/timer_thread_spec.rb
 - spec/lib/message_bus_spec.rb
 - spec/spec_helper.rb