beetle 0.4.12 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a50fa533c34e2207f31db5221a603d77c44d9c15
-  data.tar.gz: aee7aaaa983332ad75b6ff4f685c946a65943157
+  metadata.gz: c6b1de828dca7a94962097fa30763c18944837e8
+  data.tar.gz: b52dcbee0773bfa70d22f204942e97398262dbd0
 SHA512:
-  metadata.gz: af16207ccd97dc0318e915a7efeff737af67b5a39a868a8f33dd1a1a2038f84f79f36ef6aba1c18a4c75badd9851e787a0b5c766f9f0a86d98f770dd184bb7b6
-  data.tar.gz: 326faf02f95fe79bdbbb0e264326f05ca1620717b9297814d7626d951bf36c9326655afb161f47344f112302653e321d28266f0729c29345fd1ecc60f7de92d6
+  metadata.gz: f33209c5bbf8125e84713bb19837c14cf19ca508d46b7c24f9496abb9969edfd423d9f38a064ba8a4cf0d72520ea4e73e02251c827732efe4894a3bf1cfb2687
+  data.tar.gz: 17b50f9b57f777843f41960a6129e686b4191b2b3e5557f21c931ad6ed37341a0c7fa8b681044bc1c7bce1f75b85416ce62304ba79e78e6cf84dc16d278f529d

data/README.rdoc

@@ -108,3 +108,41 @@ Copyright (c) 2010-2015 {XING AG}[http://www.xing.com/]
 
 Released under the MIT license. For full details see MIT-LICENSE included in this
 distribution.
+
+== Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+Don't increase the gem version in your pull requests. It will be done after merging the request,
+to allow merging of pull requests in a flexible order.
+
+== How to release a new gem version
+
+Update RELEASE_NOTES.rdoc!
+
+We use {semantic versioning}[http://semver.org/] and create a git tag
+for each release.
+
+Edit `lib/beetle/version.rb` to set the new version number
+(`Major.Minor.Patch`).
+
+In short (see {semver.org}[http://semver.org] for details):
+
+* *Major* version MUST be incremented if any backwards incompatible changes
+  are introduced to the public API.
+* *Minor* version MUST be incremented if new, backwards compatible functionality
+  is introduced to the public API. It MUST be incremented if any public API
+  functionality is marked as deprecated.
+* *Patch* version MUST be incremented if only backwards compatible bug fixes
+  are introduced.
+
+Then use `rake release` which will create the git tag and upload the
+gem to gems.xing.com:
+
+    $ bundle exec rake release
+
+The generated gem is located in the `pkg/` directory.

data/RELEASE_NOTES.rdoc

@@ -1,9 +1,17 @@
 = Release Notes
 
+== Version 1.0.0
+
+* introduced semantic versioning
+* upgraded gems used for devloping beetle
+* upgraded amqp gem to version 1.6.0 and amq-protocol to 2.0.1
+* relaxed requirements on redis and hiredis versions
+* support setting prefetch count for subscriber
+
 == Version 0.4.12
 
 * Don't log warnings when publishing redundantly and only
-  one server is has been configured
+  one server has been configured
 
 == Version 0.4.11
 

data/Rakefile

@@ -1,10 +1,6 @@
 require 'bundler/setup'
-require 'rake'
 require 'rake/testtask'
 require 'bundler/gem_tasks'
-
-# rake 0.9.2 hack to supress deprecation warnings caused by cucumber
-include Rake::DSL if RAKEVERSION >= "0.9"
 require 'cucumber/rake/task'
 
 # 1.8/1.9 compatible way of loading lib/beetle.rb
@@ -98,6 +94,7 @@ Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
+  t.warning = false
 end
 
 require 'rdoc/task'

data/beetle.gemspec

@@ -18,20 +18,16 @@ Gem::Specification.new do |s|
   s.homepage           = "http://xing.github.com/beetle/"
   s.rdoc_options       = ["--charset=UTF-8"]
   s.require_paths      = ["lib"]
-  s.rubygems_version   = "1.3.7"
   s.test_files         = Dir['test/**/*.rb']
 
   s.specification_version = 3
   s.add_runtime_dependency("uuid4r",                  [">= 0.1.2"])
   s.add_runtime_dependency("bunny",                   ["~> 0.7.10"])
-  s.add_runtime_dependency("redis",                   [">= 2.2.2", "< 3.2"])
-  s.add_runtime_dependency("hiredis",                 [">= 0.4.5", "< 0.6"])
-  s.add_runtime_dependency("amq-client",              ["= 1.0.2"])
-  s.add_runtime_dependency("amq-protocol",            ["= 1.6.0"])
-  s.add_runtime_dependency("amqp",                    ["= 1.0.2"])
+  s.add_runtime_dependency("redis",                   [">= 2.2.2"])
+  s.add_runtime_dependency("hiredis",                 [">= 0.6.1"])
+  s.add_runtime_dependency("amq-protocol",            ["= 2.0.1"])
+  s.add_runtime_dependency("amqp",                    ["= 1.6.0"])
   s.add_runtime_dependency("activesupport",           [">= 2.3.4"])
   s.add_runtime_dependency("eventmachine_httpserver", [">= 0.2.1"])
   s.add_runtime_dependency("daemons",                 [">= 1.2.0"])
-
-  s.add_development_dependency("webmock", ["~> 1.21.0"])
 end

data/features/support/env.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../../lib/beetle', __FILE__)
 
 # See https://github.com/cucumber/cucumber/wiki/Using-MiniTest
-require 'minitest/unit'
+require 'minitest/spec'
 World do
   extend MiniTest::Assertions
 end

data/lib/beetle.rb

@@ -1,5 +1,4 @@
 $:.unshift(File.expand_path('..', __FILE__))
-require 'amq/client'               # defines AMQ::Client::Settings
 require 'bunny'                    # which bunny picks up
 require 'qrack/errors'             # needed by the publisher
 require 'uuid4r'

data/lib/beetle/configuration.rb

@@ -85,6 +85,11 @@ module Beetle
     # consider this a highly experimental feature for now.
     attr_accessor :publishing_timeout
 
+    # Prefetch count for subscribers (defaults to 1). Setting this higher
+    # than 1 can potentially increase throughput, but comes at the cost of
+    # decreased parallelism.
+    attr_accessor :prefetch_count
+
     # directory to store large intermediate files (defaults '/tmp')
     attr_accessor :tmpdir
 
@@ -122,6 +127,7 @@ module Beetle
       self.password = "guest"
       self.api_port = 15672
       self.frame_max = 131072
+      self.prefetch_count = 1
 
       self.dead_lettering_enabled = false
       self.dead_lettering_msg_ttl = 1000 #1 second

data/lib/beetle/subscriber.rb

@@ -216,7 +216,7 @@ module Beetle
     def connection_settings
       {
         :host => current_host, :port => current_port, :logging => false,
-        :user => Beetle.config.user, :pass => Beetle.config.password, :vhost => Beetle.config.vhost,
+        :user => @client.config.user, :pass => @client.config.password, :vhost => @client.config.vhost,
         :on_tcp_connection_failure => on_tcp_connection_failure
       }
     end
@@ -252,8 +252,8 @@ module Beetle
     def open_channel_and_subscribe(connection, settings)
       server = server_from_settings settings
       AMQP::Channel.new(connection) do |channel|
+        channel.prefetch(@client.config.prefetch_count)
         channel.auto_recovery = true
-        channel.prefetch(1)
         set_current_server server
         @channels[server] = channel
         create_exchanges(@exchanges_for_queues)

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.4.12"
+  VERSION = "1.0.0"
 end

data/test/beetle/amqp_gem_behavior_test.rb

@@ -2,9 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require 'eventmachine'
 require 'amqp'
 
-AMQP.client.logger = Beetle.config.logger
-
-class AMQPGemBehaviorTest < MiniTest::Unit::TestCase
+class AMQPGemBehaviorTest < Minitest::Test
   test "subscribing twice to the same queue raises a RuntimeError which throws us out of the event loop" do
     begin
       exception = nil

data/test/beetle/base_test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 
 module Beetle
-  class BaseTest < MiniTest::Unit::TestCase
+  class BaseTest < Minitest::Test
     test "initially we should have no exchanges" do
       @bs = Base.new(Client.new)
       assert_equal({}, @bs.instance_variable_get("@exchanges"))
@@ -19,7 +19,7 @@ module Beetle
     end
   end
 
-  class BaseServerManagementTest < MiniTest::Unit::TestCase
+  class BaseServerManagementTest < Minitest::Test
     def setup
       @client = Client.new
       @bs = Base.new(@client)

data/test/beetle/beetle_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
-  class HostnameTest < MiniTest::Unit::TestCase
+  class HostnameTest < Minitest::Test
     test "should use Socket.gethostname if returned name name is fully qualified" do
       Socket.expects(:gethostname).returns("a.b.com")
       assert_equal "a.b.com", Beetle.hostname

data/test/beetle/client_test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 
 module Beetle
-  class ClientDefaultsTest < MiniTest::Unit::TestCase
+  class ClientDefaultsTest < Minitest::Test
     def setup
       @client = Client.new
     end
@@ -32,7 +32,7 @@ module Beetle
     end
   end
 
-  class RegistrationTest < MiniTest::Unit::TestCase
+  class RegistrationTest < Minitest::Test
     def setup
       @client = Client.new
     end
@@ -203,7 +203,7 @@ module Beetle
 
   end
 
-  class ClientTest < MiniTest::Unit::TestCase
+  class ClientTest < Minitest::Test
     test "#reset should stop subscriber and publisher" do
       client = Client.new
       client.send(:publisher).expects(:stop)

data/test/beetle/configuration_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
-  class ConfigurationTest < MiniTest::Unit::TestCase
+  class ConfigurationTest < Minitest::Test
     test "should load it's settings from a config file if that file exists" do
       config    = Configuration.new
       old_value = config.gc_threshold

data/test/beetle/dead_lettering_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
-  class SetDeadLetteringsTest < MiniTest::Unit::TestCase
+  class SetDeadLetteringsTest < Minitest::Test
     def setup
       @dead_lettering = DeadLettering.new(Configuration.new)
     end
@@ -18,7 +18,7 @@ module Beetle
     end
   end
 
-  class SetDeadLetterPolicyTest < MiniTest::Unit::TestCase
+  class SetDeadLetterPolicyTest < Minitest::Test
     def setup
       @server = "localhost:15672"
       @queue_name = "QUEUE_NAME"
@@ -97,7 +97,7 @@ module Beetle
     end
   end
 
-  class BindDeadLetterQueuesTest < MiniTest::Unit::TestCase
+  class BindDeadLetterQueuesTest < Minitest::Test
     def setup
       @queue_name = "QUEUE_NAME"
       @config = Configuration.new

data/test/beetle/deduplication_store_test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
 
-  class RedisAssumptionsTest < MiniTest::Unit::TestCase
+  class RedisAssumptionsTest < Minitest::Test
     def setup
       @r = DeduplicationStore.new.redis
       @r.flushdb
@@ -23,7 +23,7 @@ module Beetle
     end
   end
 
-  class RedisServerStringTest < MiniTest::Unit::TestCase
+  class RedisServerStringTest < Minitest::Test
     def setup
       @original_redis_server = Beetle.config.redis_server
       @store = DeduplicationStore.new
@@ -40,7 +40,7 @@ module Beetle
     end
   end
 
-  class RedisServerFileTest < MiniTest::Unit::TestCase
+  class RedisServerFileTest < Minitest::Test
     def setup
       @original_redis_server = Beetle.config.redis_server
       @store = DeduplicationStore.new
@@ -81,7 +81,7 @@ module Beetle
     end
   end
 
-  class RedisFailoverTest < MiniTest::Unit::TestCase
+  class RedisFailoverTest < Minitest::Test
     def setup
       @store = DeduplicationStore.new
       Beetle.config.expects(:redis_failover_timeout).returns(1)
@@ -111,7 +111,7 @@ module Beetle
     end
   end
 
-  class GarbageCollectionTest < MiniTest::Unit::TestCase
+  class GarbageCollectionTest < Minitest::Test
     def setup
       @store = DeduplicationStore.new
       Beetle.config.stubs(:gc_threshold).returns(10)

data/test/beetle/handler_test.rb

@@ -13,7 +13,7 @@ module Beetle
     end
   end
 
-  class HandlerTest < MiniTest::Unit::TestCase
+  class HandlerTest < Minitest::Test
 
     test "should allow using a block as a callback" do
       test_var = false

data/test/beetle/message_test.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
 
-  class EncodingTest < MiniTest::Unit::TestCase
+  class EncodingTest < Minitest::Test
     test "an exception during decoding should be stored in the exception attribute" do
       header = stub_everything("raising header")
       m = Message.new("queue", header, 'foo')
@@ -112,7 +112,7 @@ module Beetle
     end
   end
 
-  class KeyManagementTest < MiniTest::Unit::TestCase
+  class KeyManagementTest < Minitest::Test
     def setup
       @store = DeduplicationStore.new
       @store.flushdb
@@ -207,7 +207,7 @@ module Beetle
     end
   end
 
-  class AckingTest < MiniTest::Unit::TestCase
+  class AckingTest < Minitest::Test
 
     def setup
       @store = DeduplicationStore.new
@@ -281,7 +281,7 @@ module Beetle
 
   end
 
-  class FreshMessageTest < MiniTest::Unit::TestCase
+  class FreshMessageTest < Minitest::Test
     def setup
       @store = DeduplicationStore.new
       @store.flushdb
@@ -316,7 +316,7 @@ module Beetle
 
   end
 
-  class SimpleMessageTest < MiniTest::Unit::TestCase
+  class SimpleMessageTest < Minitest::Test
     def setup
       @store = DeduplicationStore.new
       @store.flushdb
@@ -350,7 +350,7 @@ module Beetle
 
   end
 
-  class HandlerCrashTest < MiniTest::Unit::TestCase
+  class HandlerCrashTest < Minitest::Test
     def setup
       @store = DeduplicationStore.new
       @store.flushdb
@@ -423,7 +423,7 @@ module Beetle
 
   end
 
-  class SeenMessageTest < MiniTest::Unit::TestCase
+  class SeenMessageTest < Minitest::Test
     def setup
       @store = DeduplicationStore.new
       @store.flushdb
@@ -569,7 +569,7 @@ module Beetle
 
   end
 
-  class ProcessingTest < MiniTest::Unit::TestCase
+  class ProcessingTest < Minitest::Test
     def setup
       @store = DeduplicationStore.new
       @store.flushdb
@@ -637,7 +637,7 @@ module Beetle
 
   end
 
-  class HandlerTimeoutTest < MiniTest::Unit::TestCase
+  class HandlerTimeoutTest < Minitest::Test
     def setup
       @store = DeduplicationStore.new
       @store.flushdb
@@ -665,7 +665,7 @@ module Beetle
 
   end
 
-  class MySQLFailoverTest < MiniTest::Unit::TestCase
+  class MySQLFailoverTest < Minitest::Test
     require "active_record"
 
     def setup
@@ -706,7 +706,7 @@ module Beetle
     end
   end
 
-  class SettingsTest < MiniTest::Unit::TestCase
+  class SettingsTest < Minitest::Test
     def setup
       @store = DeduplicationStore.new
       @store.flushdb
@@ -859,7 +859,7 @@ module Beetle
   end
 
 
-  class RoutingKeyTest < MiniTest::Unit::TestCase
+  class RoutingKeyTest < Minitest::Test
     test "returns the routing key" do
       header = header_with_params({})
       header.stubs(:routing_key).returns("foo")

data/test/beetle/publisher_test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 
 module Beetle
-  class PublisherTest < MiniTest::Unit::TestCase
+  class PublisherTest < Minitest::Test
     def setup
       client = Client.new
       @pub = Publisher.new(client)
@@ -51,7 +51,7 @@ module Beetle
 
   end
 
-  class PublisherPublishingTest < MiniTest::Unit::TestCase
+  class PublisherPublishingTest < Minitest::Test
     def setup
       @client = Client.new
       @pub = Publisher.new(@client)
@@ -248,7 +248,7 @@ module Beetle
 
   end
 
-  class PublisherQueueManagementTest < MiniTest::Unit::TestCase
+  class PublisherQueueManagementTest < Minitest::Test
     def setup
       @client = Client.new
       @pub = Publisher.new(@client)
@@ -314,7 +314,7 @@ module Beetle
     end
   end
 
-  class PublisherExchangeManagementTest < MiniTest::Unit::TestCase
+  class PublisherExchangeManagementTest < Minitest::Test
     def setup
       @client = Client.new
       @pub = Publisher.new(@client)
@@ -336,7 +336,7 @@ module Beetle
     end
   end
 
-  class PublisherServerManagementTest < MiniTest::Unit::TestCase
+  class PublisherServerManagementTest < Minitest::Test
     def setup
       @client = Client.new
       @pub = Publisher.new(@client)
@@ -413,7 +413,7 @@ module Beetle
   end
 
 
-  class RPCTest < MiniTest::Unit::TestCase
+  class RPCTest < Minitest::Test
     def setup
       @client = Client.new
       @pub = Publisher.new(@client)

data/test/beetle/r_c_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
-  class ReturnCodesTest < MiniTest::Unit::TestCase
+  class ReturnCodesTest < Minitest::Test
     test "inspecting a return code should display the name of the returncode" do
       assert_equal "Beetle::RC::OK", Beetle::RC::OK.inspect
     end

data/test/beetle/redis_configuration_client_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
-  class RedisConfigurationClientTest < MiniTest::Unit::TestCase
+  class RedisConfigurationClientTest < Minitest::Test
     def setup
       Beetle.config.redis_servers = "redis:0,redis:1"
       @client = RedisConfigurationClient.new

data/test/beetle/redis_configuration_server_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
-  class RedisConfigurationServerTest < MiniTest::Unit::TestCase
+  class RedisConfigurationServerTest < Minitest::Test
     def setup
       Beetle.config.redis_configuration_client_ids = "rc-client-1,rc-client-2"
       @server = RedisConfigurationServer.new
@@ -113,7 +113,7 @@ module Beetle
     end
   end
 
-  class RedisConfigurationServerInvalidationTest < MiniTest::Unit::TestCase
+  class RedisConfigurationServerInvalidationTest < Minitest::Test
     def setup
       Beetle.config.redis_configuration_client_ids = "rc-client-1,rc-client-2"
       Beetle.config.redis_servers = "redis:0,redis:1"
@@ -201,7 +201,7 @@ module Beetle
     end
   end
 
-  class RedisConfigurationServerInitialRedisMasterDeterminationTest < MiniTest::Unit::TestCase
+  class RedisConfigurationServerInitialRedisMasterDeterminationTest < Minitest::Test
     def setup
       EM::Timer.stubs(:new).returns(true)
       EventMachine.stubs(:add_periodic_timer).yields
@@ -329,7 +329,7 @@ module Beetle
     end
   end
 
-  class RedisConfigurationServerSystemNotificationTest < MiniTest::Unit::TestCase
+  class RedisConfigurationServerSystemNotificationTest < Minitest::Test
     def setup
       Beetle.config.redis_configuration_client_ids = "rc-client-1,rc-client-2"
       @server = RedisConfigurationServer.new

data/test/beetle/redis_ext_test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
 
-  class NonExistentRedisTest < MiniTest::Unit::TestCase
+  class NonExistentRedisTest < Minitest::Test
     def setup
       @r = Redis.new(:host => "localhost", :port => 6390)
     end
@@ -33,7 +33,7 @@ module Beetle
     end
   end
 
-  class AddedRedisMethodsTest < MiniTest::Unit::TestCase
+  class AddedRedisMethodsTest < Minitest::Test
     def setup
       @r = Redis.new(:host => "localhost", :port => 6390)
     end
@@ -55,13 +55,13 @@ module Beetle
     end
   end
 
-  class HiredisLoadedTest < MiniTest::Unit::TestCase
+  class HiredisLoadedTest < Minitest::Test
     test "should be using hiredis instead of the redis ruby backend" do
       assert defined?(Hiredis)
     end
   end
 
-  class RedisShutdownTest < MiniTest::Unit::TestCase
+  class RedisShutdownTest < Minitest::Test
     def setup
       @r = Redis.new(:host => "localhost", :port => 6390)
     end

data/test/beetle/redis_master_file_test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
 
-  class RedisMasterFileTest < MiniTest::Unit::TestCase
+  class RedisMasterFileTest < Minitest::Test
     include Logging
     include RedisMasterFile
 

data/test/beetle/subscriber_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
-  class SubscriberTest < MiniTest::Unit::TestCase
+  class SubscriberTest < Minitest::Test
     def setup
       client = Client.new
       @sub = client.send(:subscriber)
@@ -50,7 +50,7 @@ module Beetle
     end
   end
 
-  class SubscriberPauseAndResumeTest < MiniTest::Unit::TestCase
+  class SubscriberPauseAndResumeTest < Minitest::Test
     def setup
       @client = Client.new
       @sub = @client.send(:subscriber)
@@ -119,7 +119,7 @@ module Beetle
 
   end
 
-  class AdditionalSubscriptionServersTest < MiniTest::Unit::TestCase
+  class AdditionalSubscriptionServersTest < Minitest::Test
     def setup
       @config = Configuration.new
       @config.additional_subscription_servers = "localhost:1234"
@@ -132,7 +132,7 @@ module Beetle
     end
   end
 
-  class SubscriberQueueManagementTest < MiniTest::Unit::TestCase
+  class SubscriberQueueManagementTest < Minitest::Test
     def setup
       @client = Client.new
       @sub = @client.send(:subscriber)
@@ -189,7 +189,7 @@ module Beetle
 
   end
 
-  class SubscriberExchangeManagementTest < MiniTest::Unit::TestCase
+  class SubscriberExchangeManagementTest < Minitest::Test
     def setup
       @client = Client.new
       @sub = @client.send(:subscriber)
@@ -222,7 +222,7 @@ module Beetle
   end
 
 
-  class DeadLetteringCallBackExecutionTest < MiniTest::Unit::TestCase
+  class DeadLetteringCallBackExecutionTest < Minitest::Test
     def setup
       @client = Client.new
       @client.config.dead_lettering_enabled = true
@@ -255,7 +255,7 @@ module Beetle
 
   end
 
-  class CallBackExecutionTest < MiniTest::Unit::TestCase
+  class CallBackExecutionTest < Minitest::Test
     def setup
       client = Client.new
       @queue = "somequeue"
@@ -332,7 +332,7 @@ module Beetle
 
   end
 
-  class SubscriptionTest < MiniTest::Unit::TestCase
+  class SubscriptionTest < Minitest::Test
     def setup
       @client = Client.new
       @sub = @client.send(:subscriber)
@@ -386,7 +386,7 @@ module Beetle
     end
   end
 
-  class HandlersTest < MiniTest::Unit::TestCase
+  class HandlersTest < Minitest::Test
     def setup
       @client = Client.new
       @sub = @client.send(:subscriber)
@@ -406,7 +406,7 @@ module Beetle
 
   end
 
-  class ConnectionTest < MiniTest::Unit::TestCase
+  class ConnectionTest < Minitest::Test
     def setup
       @client = Client.new
       @sub = @client.send(:subscriber)
@@ -454,7 +454,7 @@ module Beetle
     test "channel opening, exchange creation, queue bindings and subscription" do
       connection = mock("connection")
       channel = mock("channel")
-      channel.expects(:prefetch).with(1)
+      channel.expects(:prefetch).with(@client.config.prefetch_count)
       channel.expects(:auto_recovery=).with(true)
       AMQP::Channel.expects(:new).with(connection).yields(channel)
       @sub.expects(:create_exchanges)

data/test/test_helper.rb

@@ -13,7 +13,7 @@ require 'mocha/setup'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/beetle')
 require 'eventmachine'
 
-class MiniTest::Unit::TestCase
+class Minitest::Test
   require "active_support/testing/declarative"
   extend ActiveSupport::Testing::Declarative
   require "webmock"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 1.0.0
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r
@@ -49,9 +49,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,71 +56,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: amq-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: amq-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -166,20 +140,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.21.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.21.0
 description: A highly available, reliable messaging infrastructure
 email: opensource@xing.com
 executables: