beetle 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb4bee36ae48b68aa27483c59aea588aa1a263c7c33858738ce6471246e1bb96
-  data.tar.gz: 93f380bb4596fcabfc48bec927ba7767b04b826750c307934ed937023c7a8152
+  metadata.gz: 2dcaf90eaf1b11b7f6350bb34e17d73591616790ede7b43b6e98cef363dd3770
+  data.tar.gz: 55348c9ce61cc2f43869f9c12cd26bbc5dc033b0e0a0506c0a821d6a6e24862c
 SHA512:
-  metadata.gz: 34d0e2001a1f93f8b88a86992a77bda65acddc1913c550798144c62fc11b77b7da0dcc0b0c270edd38aa7d27b7ea5f1d0f03fe2a955154db0f91759f5aaa2aee
-  data.tar.gz: 7ee1364e4fc0e6c6d8cefb1f10c5d4baa0fa6c7a1bd1434a710169538d104b4b83016faa3fb3bb6616bbae1c1db668953f24acd9c342d481b20b6e5d41c967de
+  metadata.gz: 6daabfea72ab76b0fa6944d35cee52139678f9a02a272e86a32af6045750496ee81b96ff685eee1bbe9617030b981df3718b7569efabc98df59f894127da29d1
+  data.tar.gz: 04d599595b4c39e62a78b496b284a67bed1a545e759d9a094facc757e0334ed16e4bdd7bab4f7bfabb7b6f63da0e590351e86d0da55328ab6db898e9ceaaef7f

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,9 @@
 = Release Notes
 
+== Version 3.5.1
+*  remove blank entries from server list strings
+*  make sure not to subscribe to any server twice
+
 == Version 3.5.0
 * expose publisher method to setup queues/policies ahead of use
 

data/lib/beetle/client.rb

@@ -385,8 +385,12 @@ module Beetle
     end
 
     def load_brokers_from_config
-      @servers = config.servers.split(/ *, */)
-      @additional_subscription_servers = config.additional_subscription_servers.split(/ *, */)
+      @servers = parse_server_list(config.servers)
+      @additional_subscription_servers = parse_server_list(config.additional_subscription_servers) - @servers
+    end
+
+    def parse_server_list(s)
+      s.split(/ *, */).uniq.reject(&:blank?)
     end
   end
 end

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "3.5.0"
+  VERSION = "3.5.1"
 end

data/test/beetle/client_test.rb

@@ -343,17 +343,17 @@ module Beetle
 
     test "trying to listen to an unknown queue should raise an exception" do
       client = Client.new
-      assert_raises(UnknownQueue) { Client.new.listen_queues([:foobar])}
+      assert_raises(UnknownQueue) { client.listen_queues([:foobar])}
     end
 
     test "trying to pause listening on an unknown queue should raise an exception" do
       client = Client.new
-      assert_raises(UnknownQueue) { Client.new.pause_listening(:foobar)}
+      assert_raises(UnknownQueue) { client.pause_listening(:foobar)}
     end
 
     test "trying to resume listening on an unknown queue should raise an exception" do
       client = Client.new
-      assert_raises(UnknownQueue) { Client.new.pause_listening(:foobar)}
+      assert_raises(UnknownQueue) { client.pause_listening(:foobar)}
     end
 
     test "should delegate stop_listening to the subscriber instance" do
@@ -457,4 +457,39 @@ module Beetle
       msg_stub
     end
   end
+
+  class ServerDeduplicationTest < Minitest::Test
+    def setup
+      @config = Configuration.new
+      @config.servers = "localhost:5672,localhost:5672"
+      @config.additional_subscription_servers = @config.servers + ",localhost:1234,localhost:1234"
+      @client = Client.new(@config)
+    end
+
+    test "duplicates are removed from the server list" do
+      assert_equal ["localhost:5672"], @client.servers
+    end
+
+    test "duplicates and servers in the server list are removed from the additional subscription server list" do
+      assert_equal ["localhost:1234"], @client.additional_subscription_servers
+    end
+  end
+
+  class EmptyServerStringTest < Minitest::Test
+    def setup
+      @config = Configuration.new
+      @config.servers = "localhost:5672,\t,localhost:5672, "
+      @config.additional_subscription_servers = @config.servers + ",localhost:1234, , ,,"
+      @client = Client.new(@config)
+    end
+
+    test "empty strings are removed from the server list" do
+      assert_equal ["localhost:5672"], @client.servers
+    end
+
+    test "empty strings are removed from the additional subscription server list" do
+      assert_equal ["localhost:1234"], @client.additional_subscription_servers
+    end
+  end
+
 end

data/test/beetle/subscriber_test.rb

@@ -127,7 +127,7 @@ module Beetle
       @sub = @client.send(:subscriber)
     end
 
-    test "subscribers server list should contain addtional subcription hosts" do
+    test "subscribers server list should contain additional subcription hosts" do
       assert_equal ["localhost:5672", "localhost:1234"], @sub.servers
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -378,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues