beetle 0.2.9.6 → 0.2.9.7

data/beetle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "beetle"
-  s.version = "0.2.9.6"
+  s.version = "0.2.9.7"
 
   s.required_rubygems_version = ">= 1.3.1"
   s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]

data/lib/beetle/redis_configuration_server.rb

@@ -78,7 +78,7 @@ module Beetle
     def client_started(payload)
       id = payload["id"]
       if client_id_valid?(id)
-        logger.info("Received client_started message from id #{id}")
+        logger.info("Received client_started message from id '#{id}'")
       else
         msg = "Received client_started message from unknown id '#{id}'"
         logger.error(msg)

data/lib/beetle/subscriber.rb

@@ -55,7 +55,7 @@ module Beetle
     end
 
     def queues_for_exchanges(exchanges)
-      @client.exchanges.slice(*exchanges).map{|_, opts| opts[:queues]}.flatten.uniq
+      @client.exchanges.slice(*exchanges).map{|_, opts| opts[:queues]}.flatten.compact.uniq
     end
 
     def create_exchanges(exchanges)

data/test/beetle/publisher_test.rb

@@ -189,6 +189,27 @@ module Beetle
       @pub.expects(:publish_with_failover).with("mama-exchange", "mama", @data, @opts).returns(1)
       assert_equal 1, @pub.publish("mama", @data)
     end
+
+    test "failover publishing should raise an exception if the message was published to no server" do
+      failover = sequence("failover")
+      @pub.servers = ["someserver", "someotherserver"]
+      @pub.server = "someserver"
+
+      e = mock("exchange")
+      @pub.expects(:exchange).with("mama-exchange").returns(e).in_sequence(failover)
+      e.expects(:publish).raises(Bunny::ConnectionError).in_sequence(failover)
+      @pub.expects(:exchange).with("mama-exchange").returns(e).in_sequence(failover)
+      e.expects(:publish).raises(Bunny::ConnectionError).in_sequence(failover)
+      @pub.expects(:exchange).with("mama-exchange").returns(e).in_sequence(failover)
+      e.expects(:publish).raises(Bunny::ConnectionError).in_sequence(failover)
+      @pub.expects(:exchange).with("mama-exchange").returns(e).in_sequence(failover)
+      e.expects(:publish).raises(Bunny::ConnectionError).in_sequence(failover)
+
+      assert_raises Beetle::NoMessageSent do
+        @pub.publish_with_failover("mama-exchange", "mama", @data, @opts)
+      end
+    end
+
   end
 
   class PublisherQueueManagementTest < Test::Unit::TestCase

data/test/beetle/redis_configuration_server_test.rb

@@ -300,5 +300,14 @@ module Beetle
       @server.logger.expects(:error).with(msg)
       @server.client_started(payload)
     end
+
+    test "should log an info about received client_started client_started messages" do
+      payload = {"id" => "known-client"}
+      msg = "Received client_started message from id 'known-client'"
+      @server.logger.expects(:info).with(msg)
+      @server.expects(:client_id_valid?).with('known-client').returns(true)
+      @server.client_started(payload)
+    end
+
   end
 end

data/test/beetle/subscriber_test.rb

@@ -44,7 +44,12 @@ module Beetle
       assert_equal 42, mqs[@sub.server]
     end
 
-    test "stop! should stop the event loop" do
+    test "stop! should close all amqp connections and then stop the event loop" do
+      connection1 = mock('con1')
+      connection1.expects(:close).yields
+      connection2 = mock('con2')
+      connection2.expects(:close).yields
+      @sub.instance_variable_set "@amqp_connections", [["server1", connection1], ["server2",connection2]]
       EM.expects(:stop_event_loop)
       @sub.send(:stop!)
     end
@@ -103,6 +108,10 @@ module Beetle
       @sub.send(:bind_queues, %W(x y))
     end
 
+    test "should not try to bind a queue for an exchange which has no queue" do
+      @client.register_message(:without_queue)
+      assert_equal [], @sub.send(:queues_for_exchanges, ["without_queue"])
+    end
   end
 
   class SubscriberExchangeManagementTest < Test::Unit::TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 119
+  hash: 117
   prerelease: false
   segments: 
   - 0
   - 2
   - 9
-  - 6
-  version: 0.2.9.6
+  - 7
+  version: 0.2.9.7
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +01:00
+date: 2010-12-02 00:00:00 +01:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency