bunny 1.0.0.pre6 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2300a08d4b91b185b601971711c302e444ed42b
-  data.tar.gz: 0b02b296187c972d00e9a355eda453009ba29842
+  metadata.gz: c339ebb8c3d6a344a35638a8c685e7e5986719e1
+  data.tar.gz: e59fed7a29900b78dcaa9bf9e67ecb7824948054
 SHA512:
-  metadata.gz: ec12d8260233fb4def78ea75030fb201a083d574530fae276b4c035071b4d38a206c0dd0060067843e1b55bd81cc92b2faf668bc7faafc0a72bb2915251d6138
-  data.tar.gz: ad3b8d18e8bf7e0d04b1a6a5770ef1734e320b2fa15efc439e90482cbd7226804bc6ebf29e9525404c1b7e4d4f75141e761c39732ff946c883dd826782253518
+  metadata.gz: 4172c0cf99d0fca5c2c5fa40d07a5ad82be055dea6867a4d19ecd54599059ea9a0ec16f317083ab4b27d0ad807159b57e5bbccf23440a1f5ef3a3bf3ee8baf08
+  data.tar.gz: e0d292b13d4bed1cb5bf046453dd11ad3562359364d0ee9c15ff4934ebaee461344c087ea63fa31e43f5fd56f0af8d2f54375c1cc7217c454aa3b55cfb873b89

data/ChangeLog.md

@@ -1,3 +1,17 @@
+## Changes between Bunny 1.0.0.pre6 and 1.0.0.pre7
+
+### amq-protocol Update
+
+Minimum `amq-protocol` version is now `1.8.0` which includes
+a bug fix for messages exactly 128 Kb in size.
+
+
+### Add timeout Bunny::ConsumerWorkPool#join
+
+`Bunny::ConsumerWorkPool#join` now accepts an optional
+timeout argument.
+
+
 ## Changes between Bunny 1.0.0.pre5 and 1.0.0.pre6
 
 ### Respect RABBITMQ_URL value

data/bunny.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     map { |mail| Base64.decode64(mail) }
 
   # Dependencies
-  s.add_dependency "amq-protocol", ">= 1.7.0"
+  s.add_dependency "amq-protocol", ">= 1.8.0"
 
   # Files.
   s.has_rdoc = true

data/lib/bunny/consumer_work_pool.rb

@@ -4,6 +4,8 @@ module Bunny
   # Thread pool that dispatches consumer deliveries. Not supposed to be shared between channels
   # or threads.
   #
+  # Every channel its own consumer pool.
+  #
   # @private
   class ConsumerWorkPool
 
@@ -11,6 +13,7 @@ module Bunny
     # API
     #
 
+    attr_reader :threads
     attr_reader :size
 
     def initialize(size = 1)
@@ -48,8 +51,8 @@ module Bunny
       end
     end
 
-    def join
-      @threads.each { |t| t.join }
+    def join(timeout = nil)
+      @threads.each { |t| t.join(timeout) }
     end
 
     def pause

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "1.0.0.pre6"
+  VERSION = "1.0.0.rc1"
 end

data/spec/higher_level_api/integration/basic_consume_with_objects_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+require "set"
+
+describe Bunny::Queue, "#subscribe_with" do
+  let(:connection) do
+    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c.start
+    c
+  end
+
+  after :each do
+    connection.close if connection.open?
+  end
+
+  context "with explicit acknowledgements mode" do
+    class ExampleConsumer < Bunny::Consumer
+      def cancelled?
+        @cancelled
+      end
+
+      def handle_cancellation(_)
+        @cancelled = true
+      end
+
+      def call(delivery_info, metadata, payload)
+         # no-op
+      end
+    end
+
+    # demonstrates that manual acknowledgement mode is actually
+    # used. MK.
+    it "requeues messages on channel closure" do
+      ch1  = connection.create_channel
+      ch2  = connection.create_channel
+      q1   = ch1.queue("bunny.tests.consumer_object1", :exclusive => true)
+      q2   = ch2.queue("bunny.tests.consumer_object1", :exclusive => true)
+      ec   = ExampleConsumer.new(ch1, q1, "", false)
+      x    = ch2.default_exchange
+
+      t = Thread.new do
+        50.times do
+          x.publish("hello", :routing_key => q2.name)
+        end
+      end
+      t.abort_on_exception = true
+
+      q1.subscribe_with(ec, :ack => true)
+      sleep 2
+      ch1.close
+
+      q2.message_count.should == 50
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre6
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 description: Easy to use, feature complete Ruby client for RabbitMQ 2.0 and later
   versions.
 email:
@@ -134,6 +134,7 @@ files:
 - spec/higher_level_api/integration/basic_ack_spec.rb
 - spec/higher_level_api/integration/basic_cancel_spec.rb
 - spec/higher_level_api/integration/basic_consume_spec.rb
+- spec/higher_level_api/integration/basic_consume_with_objects_spec.rb
 - spec/higher_level_api/integration/basic_get_spec.rb
 - spec/higher_level_api/integration/basic_nack_spec.rb
 - spec/higher_level_api/integration/basic_publish_spec.rb
@@ -226,6 +227,7 @@ test_files:
 - spec/higher_level_api/integration/basic_ack_spec.rb
 - spec/higher_level_api/integration/basic_cancel_spec.rb
 - spec/higher_level_api/integration/basic_consume_spec.rb
+- spec/higher_level_api/integration/basic_consume_with_objects_spec.rb
 - spec/higher_level_api/integration/basic_get_spec.rb
 - spec/higher_level_api/integration/basic_nack_spec.rb
 - spec/higher_level_api/integration/basic_publish_spec.rb