beetle 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4440f43f6c12064520bcf671c092da94206d83c4
-  data.tar.gz: 8f23d433a36db5942fe08b15a2024f8d979cc28b
+  metadata.gz: 8bc8a9a807e4dc4700014a8141bc0655a148f640
+  data.tar.gz: 8edb6370ac5ffce29a3413e92e95b1c77a64f5e0
 SHA512:
-  metadata.gz: 975fc5dbb57fdf533628a11ae7f77518945e548e7f4c041961663928efa438329d178b3fc7724af56f890542144578b4201318708352ab23418c44baa440e91b
-  data.tar.gz: 2b641c7cb51d17243454f5a52ace536825dda13f211f1e37660cb7d6f014d4cf6ba1e5d695de6ea126e2af795c78212d8afc3726c427d40361fcfc02553a3406
+  metadata.gz: 3663209bba33abb84e9f83b202b86887487b913d9d3314f19f872fdebd8366b8da6fbe9906b8638854c7e47f55b95af5c72357f5f9d0d68820c3891a70cc17db
+  data.tar.gz: 0627f275d36fa6b18abe866405ade5dcffd8bbb4f48df360aacf94c0b0743394feef73432c19efdaa8c92b3e0f7bdb6d124b190f2c7e4ebe2c23727c05666b39

data/README.rdoc

@@ -87,7 +87,6 @@ At runtime, Beetle will use
 
 For development, you'll need
 * {mocha}[http://github.com/floehopper/mocha]
-* {rcov}[http://github.com/relevance/rcov] (for ruby 1.8.7)
 * {cucumber}[http://github.com/aslakhellesoy/cucumber]
 * {daemon_controller}[http://github.com/FooBarWidget/daemon_controller]
 
@@ -105,7 +104,7 @@ For tests, you'll need
 
 You can find out more about our work on our {dev blog}[http://devblog.xing.com].
 
-Copyright (c) 2010 {XING AG}[http://www.xing.com/]
+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.

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,8 @@
 = Release Notes
 
+== Version 0.4.1
+* Require newer bunny version (0.7.10) to fix publishing of messages larger than frame_max
+
 == Version 0.4.0
 * Added optional dead lettering feature to mimic RabbitMQ 2.x requeueing behaviour on RabbitMQ 3.x
 

data/Rakefile

@@ -108,3 +108,7 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('MIT-LICENSE')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :clean do
+  system('rm -f tmp/*.output tmp/*.log tmp/master/* tmp/slave/* tmp/*lock tmp/*pid')
+end

data/beetle.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.specification_version = 3
   s.add_runtime_dependency("uuid4r",                  [">= 0.1.2"])
-  s.add_runtime_dependency("bunny",                   ["= 0.7.9"])
+  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"])
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("amqp",                    ["= 1.0.2"])
   s.add_runtime_dependency("activesupport",           [">= 2.3.4"])
   s.add_runtime_dependency("eventmachine_httpserver", [">= 0.2.1"])
-  s.add_runtime_dependency("daemons",                 [">= 1.0.10"])
+  s.add_runtime_dependency("daemons",                 [">= 1.1.9"])
 
   s.add_development_dependency("webmock", [">= 1.21.0"])
 end

data/features/support/test_daemons/redis.rb

@@ -41,12 +41,13 @@ module TestDaemons
     def restart(delay = 0)
       create_dir
       create_config
-      daemon_controller.stop
+      daemon_controller.stop if running?
       sleep delay
       daemon_controller.start
     end
 
     def stop
+      return unless running?
       # TODO: Might need to be moved into RedisConfigurationServer
       #     10.times do
       #       break if (redis.info["bgsave_in_progress"]) == 0 rescue false
@@ -178,10 +179,12 @@ module TestDaemons
       @daemon_controller ||= DaemonController.new(
          :identifier    => "Redis test server #{name}",
          :start_command => "redis-server #{config_filename}",
+         :stop_command  => "redis-cli -p #{port} shutdown nosave",
          :ping_command  => lambda { running? && available? },
          :pid_file      => pid_file,
          :log_file      => log_file,
-         :start_timeout => 5
+         :start_timeout => 20,
+         :stop_timeout  => 20,
       )
     end
   end

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/beetle/message_test.rb

@@ -837,5 +837,16 @@ module Beetle
       assert_equal "foo", message.routing_key
       assert_equal "foo", message.key # alias
     end
+
+    test "returns the routing key for a dead lettered message" do
+      header = header_with_params({})
+      header.stubs(:routing_key).returns("bar")
+      header.attributes.merge!(headers: {"x-death" => [{"routing-keys" => ["foo"]}]})
+
+      message = Message.new("somequeue", header, "")
+      assert_equal "foo", message.routing_key
+      assert_equal "foo", message.key # alias
+    end
+
   end
 end

data/test/beetle/subscriber_test.rb

@@ -218,6 +218,37 @@ module Beetle
     end
   end
 
+
+  class DeadLetterrngCallBackExecutionTest < MiniTest::Unit::TestCase
+    def setup
+      @client = Client.new
+      @client.config.dead_lettering_enabled = true
+      @queue = "somequeue"
+      @client.register_queue(@queue)
+      @sub = @client.send(:subscriber)
+      @exception = Exception.new "murks"
+      @handler = Handler.create(lambda{|*args| raise @exception})
+      # handler method 'processing_completed' should be called under all circumstances
+      @handler.expects(:processing_completed).once
+      @callback = @sub.send(:create_subscription_callback, "my myessage", @queue, @handler, :exceptions => 1)
+    end
+
+    def teardown
+      @client.config.dead_lettering_enabled = false
+    end
+
+    test "should call reject on the message header when processing the handler returns true on reject? if dead_lettering has been enabled" do
+      header = header_with_params({})
+      result = mock("result")
+      result.expects(:reject?).returns(true)
+      Message.any_instance.expects(:process).returns(result)
+      @sub.expects(:sleep).never
+      header.expects(:reject).with(:requeue => false)
+      @callback.call(header, 'foo')
+    end
+
+  end
+
   class CallBackExecutionTest < MiniTest::Unit::TestCase
     def setup
       client = Client.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r
@@ -32,16 +32,16 @@ dependencies:
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 0.7.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 0.7.10
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -158,14 +158,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues