bunny 0.9.8 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de36b24ae58dc0288bf7f25d55c84d4fca21488b
-  data.tar.gz: eab9a6c204683443887320e9f54a29cc46c9b795
+  metadata.gz: 0a48be5011527d81ec653d8a687d5ece9ee4138f
+  data.tar.gz: ccf19ed7b3b9ec42e3e3654c8e5a6ee1cbe772eb
 SHA512:
-  metadata.gz: 2d4f79815730c98bc8df51ac8c5b0f14c1040d29d4ccf8b9dae8ded2bee0b43275364fdba63fbee6c4ef7f108ae2a6f80b269aa67b07021cedb90b5addfc0f24
-  data.tar.gz: 3790273b80d26a6ef6c910c59dc8d38a15e2c7d8bba9f5840598e77215e923b0d2418972acbb79ed2cfb52a0c0191700738ced4dc2923047afca9c4b387e2510
+  metadata.gz: bea1acb05abe8f527821d427c8a104d65c5d813996342068f00116a6832d9233d849233251c55e63b1f03b523a8b4d62fed5583cdc49cabff2d580759389c111
+  data.tar.gz: 51fc965da8fc766e8c55770d15df0d7494c68801001f5e2beb02956432919e7a151d1aa84b581f29c0b59d87d8b8415fe8d972e09ce18c90123f4823bbf96314

data/.travis.yml

@@ -4,13 +4,13 @@ script: "bundle exec rspec -c spec"
 rvm:
   - "2.0"
   - "1.9.3"
-  - "rbx-19mode"
   - "jruby-19mode"
   - "1.9.2"
-services:
-  - rabbitmq
+  - "rbx-19mode"
 notifications:
   email: michael@rabbitmq.com
+services:
+  - rabbitmq
 branches:
   only:
     - master

data/ChangeLog.md

@@ -1,4 +1,26 @@
-## Changes between Bunny 0.9.7 and 0.9.8
+## Changes between Bunny 0.9.0 and 0.10.0
+
+This release has one minor **breaking API change**.
+
+### Safe[r] basic.ack, basic.nack and basic.reject implementation
+
+Previously if a channel was recovered (reopened) by automatic connection
+recovery before a message was acknowledged or rejected, it would cause
+any operation on the channel that uses delivery tags to fail and
+cause the channel to be closed.
+
+To avoid this issue, every channel keeps a counter of how many times
+it has been reopened and marks delivery tags with them. Using a stale
+tag to ack or reject a message will produce no method sent to RabbitMQ.
+Note that unacknowledged messages will be requeued by RabbitMQ when connection
+goes down anyway.
+
+This involves an API change: `Bunny::DeliveryMetadata#delivery_tag` is now
+and instance of a class that responds to `#tag` and `#to_i` and is accepted
+by `Bunny::Channel#ack` and related methods.
+
+Integers are still accepted by the same methods.
+
 
 ### Exclusivity Violation for Consumers Now Raises a Reasonable Exception
 
@@ -6,8 +28,6 @@ When a second consumer is registered for the same queue on different channels,
 a reasonable exception (`Bunny::AccessRefused`) will be raised.
 
 
-## Changes between Bunny 0.9.6 and 0.9.7
-
 ### Reentrant Mutex Implementation
 
 Bunny now allows mutex impl to be configurable, uses reentrant Monitor
@@ -23,18 +43,12 @@ for Bunny.
 Apps that need these 4% can configure what mutex implementation
 is used on per-connection basis.
 
-
-## Changes between Bunny 0.9.5 and 0.9.6
-
 ### Eliminated Race Condition in Bunny::Session#close
 
 `Bunny::Session#close` had a race condition that caused (non-deterministic)
 exceptions when connection transport was closed before connection
 reader loop was guaranteed to have stopped.
 
-
-## Changes between Bunny 0.9.4 and 0.9.5
-
 ### connection.close Raises Exceptions on Connection Thread
 
 Connection-level exceptions (including when a connection is closed via
@@ -44,9 +58,6 @@ thread so they
  * can be handled by applications
  * do not start connection recovery, which may be uncalled for
 
-
-## Changes between Bunny 0.9.3 and 0.9.4
-
 ### Client TLS Certificates are Optional
 
 Bunny will no longer require client TLS certificates. Note that CA certificate
@@ -56,8 +67,6 @@ If RabbitMQ TLS configuration requires peer verification, client certificate
 and private key are mandatory.
 
 
-## Changes between Bunny 0.9.2 and 0.9.3
-
 ### Publishing Over Closed Connections
 
 Publishing a message over a closed connection (during a network outage, before the connection
@@ -66,17 +75,12 @@ is open) will now correctly result in an exception.
 Contributed by Matt Campbell.
 
 
-## Changes between Bunny 0.9.1 and 0.9.2
-
 ### Reliability Improvement in Automatic Network Failure Recovery
 
 Bunny now ensures a new connection transport (socket) is initialized
 before any recovery is attempted.
 
 
-
-## Changes between Bunny 0.9.0 and 0.9.1
-
 ### Reliability Improvement in Bunny::Session#create_channel
 
 `Bunny::Session#create_channel` now uses two separate mutexes to avoid
@@ -84,6 +88,7 @@ a (very rare) issue when the previous implementation would try to
 re-acquire the same mutex and fail (Ruby mutexes are non-reentrant).
 
 
+
 ## Changes between Bunny 0.9.0.rc1 and 0.9.0.rc2
 
 ### Channel Now Properly Restarts Consumer Pool

data/README.md

@@ -61,34 +61,36 @@ Bunny `0.7.x` and earlier versions support RabbitMQ 1.x and 2.x.
 
 ## Project Maturity
 
-Bunny is a pretty old (started circa late 2008) library that, before version 0.9, **a lot** of missing functionality. Version 0.9
-can be considered to be "second birthday" for Bunny as it was rewritten from scratch. Key objectives
-for 0.9 are
+Bunny is a pretty old (started circa late 2008) library that, before
+version 0.9, **a lot** of missing functionality. Version 0.9 can be
+considered to be "second birthday" for Bunny as it was rewritten from
+scratch with over a dozen of preview releases over the course of about
+a year.
 
- * Be feature complete, support all RabbitMQ 3.x features
- * Eliminate limitations Bunny used to have with earlier versions
- * Be [well documented](http://rubybunny.info)
- * Make use of concurrency and, if the runtime provides it, parallelism
- * Reuse code with amqp gem and possibly other clients where it makes sense
-
-We (the maintainers) make our best to keep the new version as
+We (the maintainers) made our best effort to keep the new version as
 backwards compatible as possible but within reason.
 
 
 ## Installation & Bundler Dependency
 
+### Most Recent Release
+
+[![Gem Version](https://badge.fury.io/rb/bunny.png)](http://badge.fury.io/rb/bunny)
+
+### With Rubygems
+
 To install Bunny 0.9.x with RubyGems:
 
 ```
-gem install bunny --version ">= 0.9.2"
+gem install bunny
 ```
 
-the most recent 0.9.x version is `0.9.2`.
+### Bundler Dependency
 
 To use Bunny 0.9.x in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 0.9.2"
+gem "bunny", ">= 0.9.3"
 ```
 
 
@@ -154,7 +156,7 @@ Other documentation guides are available at [rubybunny.info](http://rubybunny.in
 
 ### Mailing List
 
-[Bunny a mailing list](http://groups.google.com/group/ruby-amqp). We encourage you
+[Bunny has a mailing list](http://groups.google.com/group/ruby-amqp). We encourage you
 to also join the [rabbitmq-discuss](https://lists.rabbitmq.com/cgi-bin/mailman/listinfo/rabbitmq-discuss) mailing list. Feel free to ask any questions that you may have.
 
 

data/benchmarks/synchronized_sorted_set.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "rubygems"
+require "set"
+require "thread"
+require "benchmark"
+
+require "bunny/concurrent/synchronized_sorted_set"
+
+puts
+puts "-" * 80
+puts "Benchmarking on #{RUBY_DESCRIPTION}"
+
+n  = 2_000_000
+s  = SortedSet.new
+
+# warm up the JIT, etc
+puts "Doing a warmup run..."
+n.times do |i|
+  s << 1
+  s << i
+  s.delete i
+  s << i
+end
+
+t1  = Benchmark.realtime do
+  n.times do |i|
+    s << 1
+    s << i
+    s.delete i
+    s << i
+    s.length
+  end
+end
+r1  = (n.to_f/t1.to_f)
+
+s2 = SynchronizedSortedSet.new
+t2  = Benchmark.realtime do
+  n.times do |i|
+    s2 << 1
+    s2 << i
+    s2.delete i
+    s2 << i
+    s2.length
+  end
+end
+r2  = (n.to_f/t2.to_f)
+
+puts "Mixed sorted set ops, rate: #{(r1 / 1000).round(2)} KGHz"
+puts "Mixed synchronized sorted set ops, rate: #{(r2 / 1000).round(2)} KGHz"
+puts
+puts "-" * 80

data/lib/amq/protocol/extensions.rb

@@ -0,0 +1,16 @@
+# @private
+module AMQ
+  # @private
+  module Protocol
+    # @private
+    class Basic
+      # Extended to allow wrapping delivery tag into
+      # a versioned one.
+      #
+      # @private
+      class GetOk
+        attr_writer :delivery_tag
+      end
+    end
+  end
+end

data/lib/bunny.rb

@@ -4,6 +4,7 @@ require "timeout"
 
 require "bunny/version"
 require "amq/protocol/client"
+require "amq/protocol/extensions"
 
 require "bunny/framing"
 require "bunny/exceptions"

data/lib/bunny/channel.rb

@@ -3,6 +3,7 @@ require "thread"
 require "monitor"
 require "set"
 
+require "bunny/concurrent/atomic_fixnum"
 require "bunny/consumer_work_pool"
 
 require "bunny/exchange"
@@ -189,8 +190,12 @@ module Bunny
       @threads_waiting_on_basic_get_continuations = Set.new
 
       @next_publish_seq_no = 0
+
+      @recoveries_counter = Bunny::Concurrent::AtomicFixnum.new(0)
     end
 
+    attr_reader :recoveries_counter
+
     # @private
     def read_write_timeout
       @connection.read_write_timeout
@@ -438,7 +443,9 @@ module Bunny
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
     def reject(delivery_tag, requeue = false)
-      basic_reject(delivery_tag, requeue)
+      guarding_against_stale_delivery_tags(delivery_tag) do
+        basic_reject(delivery_tag.to_i, requeue)
+      end
     end
 
     # Acknowledges a message. Acknowledged messages are completely removed from the queue.
@@ -449,7 +456,9 @@ module Bunny
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
     def ack(delivery_tag, multiple = false)
-      basic_ack(delivery_tag, multiple)
+      guarding_against_stale_delivery_tags(delivery_tag) do
+        basic_ack(delivery_tag.to_i, multiple)
+      end
     end
     alias acknowledge ack
 
@@ -464,7 +473,9 @@ module Bunny
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
     def nack(delivery_tag, multiple = false, requeue = false)
-      basic_nack(delivery_tag, multiple, requeue)
+      guarding_against_stale_delivery_tags(delivery_tag) do
+        basic_nack(delivery_tag.to_i, multiple, requeue)
+      end
     end
 
     # @endgroup
@@ -701,6 +712,7 @@ module Bunny
     #   ch.basic_ack(delivery_info.delivery_tag, true)
     #
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
+    # @see #basic_ack_known_delivery_tag
     # @api public
     def basic_ack(delivery_tag, multiple)
       raise_if_no_longer_open!
@@ -1407,6 +1419,7 @@ module Bunny
       # this includes recovering bindings
       recover_queues
       recover_consumers
+      increment_recoveries_counter
     end
 
     # Recovers basic.qos setting. Used by the Automatic Network Failure
@@ -1452,6 +1465,11 @@ module Bunny
       end
     end
 
+    # @private
+    def increment_recoveries_counter
+      @recoveries_counter.increment
+    end
+
     # @endgroup
 
 
@@ -1563,6 +1581,7 @@ module Bunny
 
     # @private
     def handle_basic_get_ok(basic_get_ok, properties, content)
+      basic_get_ok.delivery_tag = VersionedDeliveryTag.new(basic_get_ok.delivery_tag, @recoveries_counter.get)
       @basic_get_continuations.push([basic_get_ok, properties, content])
     end
 
@@ -1614,10 +1633,8 @@ module Bunny
 
       @unconfirmed_set_mutex.synchronize do
         @only_acks_received = (@only_acks_received && !nack)
-        @logger.debug "Channel #{@id}: @only_acks_received = #{@only_acks_received.inspect}, nack: #{nack.inspect}"
 
         @confirms_continuations.push(true) if @unconfirmed_set.empty?
-
         @confirms_callback.call(delivery_tag, multiple, nack) if @confirms_callback
       end
     end
@@ -1826,5 +1843,21 @@ module Bunny
         Concurrent::ContinuationQueue.new
       end
     end # if defined?
+
+    # @private
+    def guarding_against_stale_delivery_tags(tag, &block)
+      case tag
+      # if a fixnum was passed, execute unconditionally. MK.
+      when Fixnum then
+        block.call
+      # versioned delivery tags should be checked to avoid
+      # sending out stale (invalid) tags after channel was reopened
+      # during network failure recovery. MK.
+      when VersionedDeliveryTag then
+        if !tag.stale?(@recoveries_counter.get)
+          block.call
+        end
+      end
+    end
   end # Channel
 end # Bunny

data/lib/bunny/compatibility.rb

@@ -10,6 +10,7 @@ module Bunny
     #
 
     # @api public
+    # @private
     def channel_from(channel_or_connection)
       # Bunny 0.8.x and earlier completely hide channels from the API. So, queues and exchanges are
       # instantiated with a "Bunny object", which is a session. This function coerces two types of input to a

data/lib/bunny/concurrent/atomic_fixnum.rb

@@ -0,0 +1,74 @@
+require "set"
+require "thread"
+require "monitor"
+
+module Bunny
+  module Concurrent
+    # Minimalistic implementation of a synchronized fixnum value,
+    # designed after (but not implementing the entire API of!)
+    #
+    # @note Designed to be intentionally minimalistic and only cover Bunny's needs.
+    #
+    # @api public
+    class AtomicFixnum
+      def initialize(n = 0)
+        @n     = n
+        @mutex = Monitor.new
+      end
+
+      def get
+        @mutex.synchronize do
+          @n
+        end
+      end
+
+      def set(n)
+        @mutex.synchronize do
+          @n = n
+        end
+      end
+
+      def increment
+        @mutex.synchronize do
+          @n = @n + 1
+        end
+      end
+      alias inc increment
+      alias increment_and_get increment
+
+      def get_and_add(i)
+        @mutex.synchronize do
+          v = @n
+          @n = @n + i
+
+          v
+        end
+      end
+
+      def get_and_increment
+        @mutex.synchronize do
+          v = @n
+          @n = @n + 1
+
+          v
+        end
+      end
+
+      def decrement
+        @mutex.synchronize do
+          @n = @n - 1
+        end
+      end
+      alias dec decrement
+      alias decrement_and_get decrement
+
+      def ==(m)
+        @mutex.synchronize { @n == m }
+      end
+
+      def ===(v)
+        @mutex.synchronize { @n === v }
+      end
+    end
+  end
+end

data/lib/bunny/concurrent/synchronized_sorted_set.rb

@@ -0,0 +1,56 @@
+require "set"
+require "thread"
+
+module Bunny
+  module Concurrent
+    # A SortedSet variation that synchronizes key mutation operations.
+    #
+    # @note This is NOT a complete SortedSet replacement. It only synchronizes operations needed by Bunny.
+    # @api public
+    class SynchronizedSortedSet < SortedSet
+      def initialize(enum = nil)
+        @mutex = Mutex.new
+
+        super
+      end
+
+      def add(o)
+        # avoid using Mutex#synchronize because of a Ruby 1.8.7-specific
+        # bug that prevents super from being called from within a block. MK.
+        @mutex.lock
+        begin
+          super
+        ensure
+          @mutex.unlock
+        end
+      end
+
+      def delete(o)
+        @mutex.lock
+        begin
+          super
+        ensure
+          @mutex.unlock
+        end
+      end
+
+      def delete_if(&block)
+        @mutex.lock
+        begin
+          super
+        ensure
+          @mutex.unlock
+        end
+      end
+
+      def include?(o)
+        @mutex.lock
+        begin
+          super
+        ensure
+          @mutex.unlock
+        end
+      end
+    end
+  end
+end

data/lib/bunny/consumer.rb

@@ -37,6 +37,7 @@ module Bunny
       @consumer_tag  = consumer_tag
       @exclusive     = exclusive
       @arguments     = arguments
+      # no_ack set to true = no manual ack = automatic ack. MK.
       @no_ack        = no_ack
     end
 
@@ -89,6 +90,18 @@ module Bunny
       "#<#{self.class.name}:#{object_id} @channel_id=#{@channel.number} @queue=#{self.queue_name}> @consumer_tag=#{@consumer_tag}>"
     end
 
+    # @return [Boolean] true if this consumer uses automatic acknowledgement mode
+    # @api public
+    def automatic_acknowledgement?
+      @no_ack == false
+    end
+
+    # @return [Boolean] true if this consumer uses manual (explicit) acknowledgement mode
+    # @api public
+    def manual_acknowledgement?
+      @no_ack == true
+    end
+
     #
     # Recovery
     #

data/lib/bunny/delivery_info.rb

@@ -1,3 +1,5 @@
+require "bunny/versioned_delivery_tag"
+
 module Bunny
   # Wraps {AMQ::Protocol::Basic::Deliver} to
   # provide access to the delivery properties as immutable hash as
@@ -24,7 +26,7 @@ module Bunny
       @basic_deliver = basic_deliver
       @hash          = {
         :consumer_tag => basic_deliver.consumer_tag,
-        :delivery_tag => basic_deliver.delivery_tag,
+        :delivery_tag => VersionedDeliveryTag.new(basic_deliver.delivery_tag, channel.recoveries_counter),
         :redelivered  => basic_deliver.redelivered,
         :exchange     => basic_deliver.exchange,
         :routing_key  => basic_deliver.routing_key,

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "0.9.8"
+  VERSION = "0.10.0"
 end

data/lib/bunny/versioned_delivery_tag.rb

@@ -0,0 +1,28 @@
+module Bunny
+  # Wraps a delivery tag (which is an integer) so that {Bunny::Channel} could
+  # detect stale tags after connection recovery.
+  #
+  # @private
+  class VersionedDeliveryTag
+    attr_reader :tag
+    attr_reader :version
+
+    def initialize(tag, version)
+      raise ArgumentError.new("tag cannot be nil") unless tag
+      raise ArgumentError.new("version cannot be nil") unless version
+
+      @tag     = tag
+      @version = version
+    end
+
+    def to_i
+      @tag
+    end
+
+    def stale?(version)
+      raise ArgumentError.new("version cannot be nil") unless version
+
+      @version < version
+    end
+  end
+end

data/spec/higher_level_api/integration/basic_ack_spec.rb

@@ -7,50 +7,65 @@ describe Bunny::Channel, "#ack" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 
-  subject do
-    connection.create_channel
-  end
-
   context "with a valid (known) delivery tag" do
     it "acknowleges a message" do
-      q = subject.queue("bunny.basic.ack.manual-acks", :exclusive => true)
-      x = subject.default_exchange
+      ch = connection.create_channel
+      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      x  = ch.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
-      sleep(0.25)
+      sleep 0.5
       q.message_count.should == 1
       delivery_details, properties, content = q.pop(:ack => true)
 
-      subject.ack(delivery_details.delivery_tag, true)
-      sleep(0.25)
+      ch.ack(delivery_details.delivery_tag, true)
       q.message_count.should == 0
 
-      subject.close
+      ch.close
+    end
+  end
+
+
+  context "with a valid (known) delivery tag and automatic ack mode" do
+    it "results in a channel exception" do
+      ch = connection.create_channel
+      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      x  = ch.default_exchange
+
+      q.subscribe(:manual_ack => false) do |delivery_info, properties, payload|
+        ch.ack(delivery_info.delivery_tag, false)
+      end
+
+      x.publish("bunneth", :routing_key => q.name)
+      sleep 0.5
+      lambda do
+        q.message_count
+      end.should raise_error(Bunny::ChannelAlreadyClosed)
     end
   end
 
   context "with an invalid (random) delivery tag" do
     it "causes a channel-level error" do
-      q = subject.queue("bunny.basic.ack.unknown-delivery-tag", :exclusive => true)
-      x = subject.default_exchange
+      ch = connection.create_channel
+      q  = ch.queue("bunny.basic.ack.unknown-delivery-tag", :exclusive => true)
+      x  = ch.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
-      sleep(0.25)
+      sleep 0.5
       q.message_count.should == 1
       _, _, content = q.pop(:ack => true)
 
-      subject.on_error do |ch, channel_close|
+      ch.on_error do |ch, channel_close|
         @channel_close = channel_close
       end
-      subject.ack(82, true)
-
-      sleep 0.5
+      ch.ack(82, true)
+      sleep 0.25
 
-      @channel_close.reply_text.should == "PRECONDITION_FAILED - unknown delivery tag 82"
+      @channel_close.reply_code.should == AMQ::Protocol::PreconditionFailed::VALUE
     end
   end
 end

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "set"
 
 describe Bunny::Queue, "#subscribe" do
   let(:connection) do
@@ -41,6 +42,66 @@ describe Bunny::Queue, "#subscribe" do
 
       ch.close
     end
+
+    context "with a single consumer" do
+      let(:queue_name) { "bunny.basic_consume#{rand}" }
+
+      it "provides delivery tag access" do
+        delivery_tags = SortedSet.new
+
+        cch = connection.create_channel
+        q = cch.queue(queue_name, :auto_delete => true, :durable => false)
+        q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+          delivery_tags << delivery_info.delivery_tag
+        end
+        sleep 0.5
+
+        ch = connection.create_channel
+        x  = ch.default_exchange
+        100.times do
+          x.publish("hello", :routing_key => queue_name)
+        end
+
+        sleep 1.0
+        delivery_tags.should == SortedSet.new(Range.new(1, 100).to_a)
+
+        ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+
+        ch.close
+      end
+    end
+
+
+    context "with multiple consumers on the same channel" do
+      let(:queue_name) { "bunny.basic_consume#{rand}" }
+
+      it "provides delivery tag access" do
+        delivery_tags = SortedSet.new
+
+        cch = connection.create_channel
+        q   = cch.queue(queue_name, :auto_delete => true, :durable => false)
+
+        7.times do
+          q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+            delivery_tags << delivery_info.delivery_tag
+          end
+        end
+        sleep 1.0
+
+        ch = connection.create_channel
+        x  = ch.default_exchange
+        100.times do
+          x.publish("hello", :routing_key => queue_name)
+        end
+
+        sleep 1.5
+        delivery_tags.should == SortedSet.new(Range.new(1, 100).to_a)
+
+        ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+
+        ch.close
+      end
+    end
   end
 
   context "with manual acknowledgement mode" do
@@ -77,7 +138,7 @@ describe Bunny::Queue, "#subscribe" do
     end
   end
 
-  20.times do |i|
+  ENV.fetch("RUNS", 20).to_i.times do |i|
     context "with a queue that already has messages (take #{i})" do
       let(:queue_name) { "bunny.basic_consume#{rand}" }
 

data/spec/higher_level_api/integration/basic_get_spec.rb

@@ -8,7 +8,7 @@ describe Bunny::Queue, "#pop" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/unit/concurrent/atomic_fixnum_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+require "bunny/concurrent/atomic_fixnum"
+
+describe Bunny::Concurrent::AtomicFixnum do
+  it "allows retrieving the current value" do
+    af = described_class.new(0)
+
+    af.get.should == 0
+    af.should == 0
+  end
+
+  it "can be updated" do
+    af = described_class.new(0)
+
+    af.get.should == 0
+    Thread.new do
+      af.set(10)
+    end
+    sleep 0.6
+    af.get.should == 10
+  end
+
+  it "can be incremented" do
+    af = described_class.new(0)
+
+    af.get.should == 0
+    10.times do
+      Thread.new do
+        af.increment
+      end
+    end
+    sleep 0.6
+    af.get.should == 10
+  end
+end

data/spec/unit/concurrent/synchronized_sorted_set_spec.rb

@@ -0,0 +1,34 @@
+require "spec_helper"
+require "bunny/concurrent/synchronized_sorted_set"
+
+describe Bunny::Concurrent::SynchronizedSortedSet do
+  it "synchronizes common operations needed by Bunny" do
+    s = described_class.new
+    s.length.should == 0
+
+    10.times do
+      Thread.new do
+        s << 1
+        s << 1
+        s << 2
+        s << 3
+        s << 4
+        s << 4
+        s << 4
+        s << 4
+        s << 5
+        s << 5
+        s << 5
+        s << 5
+        s << 6
+        s << 7
+        s << 8
+        s.delete 8
+        s.delete_if { |i| i == 1 }
+      end
+    end
+    sleep 2.0
+
+    s.length.should == 6
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.10.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -57,6 +57,7 @@ files:
 - benchmarks/queue_declare.rb
 - benchmarks/queue_declare_and_bind.rb
 - benchmarks/queue_declare_bind_and_delete.rb
+- benchmarks/synchronized_sorted_set.rb
 - benchmarks/write_vs_write_nonblock.rb
 - bin/ci/before_build.sh
 - bunny.gemspec
@@ -90,6 +91,7 @@ files:
 - examples/guides/getting_started/weathr.rb
 - examples/guides/queues/one_off_consumer.rb
 - examples/guides/queues/redeliveries.rb
+- lib/amq/protocol/extensions.rb
 - lib/bunny.rb
 - lib/bunny/authentication/credentials_encoder.rb
 - lib/bunny/authentication/external_mechanism_encoder.rb
@@ -97,9 +99,11 @@ files:
 - lib/bunny/channel.rb
 - lib/bunny/channel_id_allocator.rb
 - lib/bunny/compatibility.rb
+- lib/bunny/concurrent/atomic_fixnum.rb
 - lib/bunny/concurrent/condition.rb
 - lib/bunny/concurrent/continuation_queue.rb
 - lib/bunny/concurrent/linked_continuation_queue.rb
+- lib/bunny/concurrent/synchronized_sorted_set.rb
 - lib/bunny/consumer.rb
 - lib/bunny/consumer_tag_generator.rb
 - lib/bunny/consumer_work_pool.rb
@@ -119,6 +123,7 @@ files:
 - lib/bunny/test_kit.rb
 - lib/bunny/transport.rb
 - lib/bunny/version.rb
+- lib/bunny/versioned_delivery_tag.rb
 - profiling/basic_publish/with_4K_messages.rb
 - spec/compatibility/queue_declare_spec.rb
 - spec/compatibility/queue_declare_with_default_channel_spec.rb
@@ -182,8 +187,10 @@ files:
 - spec/tls/server_cert.pem
 - spec/tls/server_key.pem
 - spec/unit/bunny_spec.rb
+- spec/unit/concurrent/atomic_fixnum_spec.rb
 - spec/unit/concurrent/condition_spec.rb
 - spec/unit/concurrent/linked_continuation_queue_spec.rb
+- spec/unit/concurrent/synchronized_sorted_set_spec.rb
 homepage: http://rubybunny.info
 licenses:
 - MIT
@@ -271,6 +278,8 @@ test_files:
 - spec/tls/server_cert.pem
 - spec/tls/server_key.pem
 - spec/unit/bunny_spec.rb
+- spec/unit/concurrent/atomic_fixnum_spec.rb
 - spec/unit/concurrent/condition_spec.rb
 - spec/unit/concurrent/linked_continuation_queue_spec.rb
+- spec/unit/concurrent/synchronized_sorted_set_spec.rb
 has_rdoc: true