bunny 0.9.0.pre1 → 0.9.0.pre2

data/ChangeLog.md

@@ -1,6 +1,58 @@
-# Changes between Bunny 0.8.x and 0.9.0
+## Changes between Bunny 0.9.0.pre1 and 0.9.0.pre2
 
-## New convenience functions: Bunny::Channel#fanout, Bunny::Channel#topic
+### Change Bunny::Queue#pop default for :ack to false
+
+It makes more sense for beginners that way.
+
+
+### Bunny::Queue#subscribe now support the new :block option
+
+`Bunny::Queue#subscribe` support the new `:block` option
+(a boolean).
+    
+It controls whether the current thread will be blocked
+by `Bunny::Queue#subscribe`.
+
+
+### Bunny::Exchange#publish now supports :key again
+
+`Bunny::Exchange#publish` now supports `:key` as an alias for
+`:routing_key`.
+
+
+### Bunny::Session#queue et al.
+
+`Bunny::Session#queue`, `Bunny::Session#direct`, `Bunny::Session#fanout`, `Bunny::Session#topic`,
+and `Bunny::Session#headers` were added to simplify migration. They all delegate to their respective
+`Bunny::Channel` methods on the default channel every connection has.
+
+
+### Bunny::Channel#exchange, Bunny::Session#exchange
+
+`Bunny::Channel#exchange` and `Bunny::Session#exchange` were added to simplify
+migration:
+
+``` ruby
+b = Bunny.new
+b.start
+
+# uses default connection channel
+x = b.exchange("logs.events", :topic)
+```
+
+### Bunny::Queue#subscribe now properly takes 3 arguments
+
+``` ruby
+q.subscribe(:exclusive => false, :ack => false) do |delivery_info, properties, payload|
+  # ...
+end
+```
+
+
+
+## Changes between Bunny 0.8.x and 0.9.0.pre1
+
+### New convenience functions: Bunny::Channel#fanout, Bunny::Channel#topic
 
 `Bunny::Channel#fanout`, `Bunny::Channel#topic`, `Bunny::Channel#direct`, `Bunny::Channel#headers`,
 and`Bunny::Channel#default_exchange` are new convenience methods to instantiate exchanges:
@@ -14,7 +66,7 @@ x  = ch.fanout("logging.events", :durable => true)
 ```
 
 
-## Bunny::Queue#pop and consumer handlers (Bunny::Queue#subscribe) signatures have changed
+### Bunny::Queue#pop and consumer handlers (Bunny::Queue#subscribe) signatures have changed
 
 Bunny `< 0.9.x` example:
 
@@ -51,13 +103,13 @@ The unification moment was the driving factor.
 
 
 
-## Bunny::Client#write now raises Bunny::ConnectionError
+### Bunny::Client#write now raises Bunny::ConnectionError
 
 Bunny::Client#write now raises `Bunny::ConnectionError` instead of `Bunny::ServerDownError` when network
 I/O operations fail.
 
 
-## Bunny::Client.create_channel now uses a bitset-based allocator
+### Bunny::Client.create_channel now uses a bitset-based allocator
 
 Instead of reusing channel instances, `Bunny::Client.create_channel` now opens new channels and
 uses bitset-based allocator to keep track of used channel ids. This avoids situations when
@@ -67,6 +119,6 @@ long running applications that aggressively open and release channels.
 This is also how amqp gem and RabbitMQ Java client manage channel ids.
 
 
-## Bunny::ServerDownError is now Bunny::TCPConnectionFailed
+### Bunny::ServerDownError is now Bunny::TCPConnectionFailed
 
 `Bunny::ServerDownError` is now an alias for `Bunny::TCPConnectionFailed`

data/examples/guides/getting_started/blabbr.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "rubygems"
+require "bunny"
+
+conn = Bunny.new
+conn.start
+
+ch  = conn.create_channel
+x   = ch.fanout("nba.scores")
+
+ch.queue("joe",   :auto_delete => true).bind(x).subscribe do |delivery_info, properties, payload|
+  puts "#{payload} => joe"
+end
+
+ch.queue("aaron", :auto_delete => true).bind(x).subscribe do |delivery_info, properties, payload|
+  puts "#{payload} => aaron"
+end
+
+ch.queue("bob",   :auto_delete => true).bind(x).subscribe do |delivery_info, properties, payload|
+  puts "#{payload} => bob"
+end
+
+x.publish("BOS 101, NYK 89").publish("ORL 85, ALT 88")
+
+conn.close

data/examples/guides/getting_started/hello_world.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "rubygems"
+require "bunny"
+
+conn = Bunny.new
+conn.start
+
+ch = conn.create_channel
+q  = ch.queue("bunny.examples.hello_world", :auto_delete => true)
+x  = ch.default_exchange
+
+q.subscribe do |delivery_info, properties, payload|
+  puts "Received #{payload}"
+end
+
+x.publish("Hello!", :routing_key => q.name)
+
+sleep 1.0
+conn.close

data/examples/guides/getting_started/weathr.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "rubygems"
+require "bunny"
+
+connection = Bunny.new
+connection.start
+
+channel  = connection.create_channel
+# topic exchange name can be any string
+exchange = channel.topic("weathr", :auto_delete => true)
+
+# Subscribers.
+channel.queue("", :exclusive => true).bind(exchange, :routing_key => "americas.north.#").subscribe do |delivery_info, properties, payload|
+  puts "An update for North America: #{payload}, routing key is #{delivery_info.routing_key}"
+end
+channel.queue("americas.south").bind(exchange, :routing_key => "americas.south.#").subscribe do |delivery_info, properties, payload|
+  puts "An update for South America: #{payload}, routing key is #{delivery_info.routing_key}"
+end
+channel.queue("us.california").bind(exchange, :routing_key => "americas.north.us.ca.*").subscribe do |delivery_info, properties, payload|
+  puts "An update for US/California: #{payload}, routing key is #{delivery_info.routing_key}"
+end
+channel.queue("us.tx.austin").bind(exchange, :routing_key => "#.tx.austin").subscribe do |delivery_info, properties, payload|
+  puts "An update for Austin, TX: #{payload}, routing key is #{delivery_info.routing_key}"
+end
+channel.queue("it.rome").bind(exchange, :routing_key => "europe.italy.rome").subscribe do |delivery_info, properties, payload|
+  puts "An update for Rome, Italy: #{payload}, routing key is #{delivery_info.routing_key}"
+end
+channel.queue("asia.hk").bind(exchange, :routing_key => "asia.southeast.hk.#").subscribe do |delivery_info, properties, payload|
+  puts "An update for Hong Kong: #{payload}, routing key is #{delivery_info.routing_key}"
+end
+
+exchange.publish("San Diego update", :routing_key => "americas.north.us.ca.sandiego").
+  publish("Berkeley update",         :routing_key => "americas.north.us.ca.berkeley").
+  publish("San Francisco update",    :routing_key => "americas.north.us.ca.sanfrancisco").
+  publish("New York update",         :routing_key => "americas.north.us.ny.newyork").
+  publish("São Paolo update",        :routing_key => "americas.south.brazil.saopaolo").
+  publish("Hong Kong update",        :routing_key => "asia.southeast.hk.hongkong").
+  publish("Kyoto update",            :routing_key => "asia.southeast.japan.kyoto").
+  publish("Shanghai update",         :routing_key => "asia.southeast.prc.shanghai").
+  publish("Rome update",             :routing_key => "europe.italy.roma").
+  publish("Paris update",            :routing_key => "europe.france.paris")
+
+sleep 1.0
+
+connection.close

data/lib/bunny/channel.rb

@@ -5,7 +5,10 @@ require "bunny/consumer_work_pool"
 
 require "bunny/exchange"
 require "bunny/queue"
-require "bunny/message_metadata"
+
+require "bunny/delivery_info"
+require "bunny/return_info"
+require "bunny/message_properties"
 
 module Bunny
   class Channel
@@ -106,7 +109,11 @@ module Bunny
     end
 
     def default_exchange
-      self.direct("", :no_declare => true)
+      self.direct(AMQ::Protocol::EMPTY_STRING, :no_declare => true)
+    end
+
+    def exchange(name, opts = {})
+      Exchange.new(self, opts.fetch(:type, :direct), name, opts)
     end
 
     def prefetch(prefetch_count)
@@ -158,7 +165,7 @@ module Bunny
 
       meta = { :priority => 0, :delivery_mode => 2, :content_type => "application/octet-stream" }.
         merge(opts)
-      @connection.send_frameset(AMQ::Protocol::Basic::Publish.encode(@id, payload, meta, exchange_name, routing_key, meta[:mandatory], false, (frame_size || @connection.frame_max)), self)
+      @connection.send_frameset(AMQ::Protocol::Basic::Publish.encode(@id, payload, meta, exchange_name, routing_key, meta[:mandatory], false, @connection.frame_max), self)
 
       self
     end
@@ -540,7 +547,7 @@ module Bunny
       consumer = @consumers[basic_deliver.consumer_tag]
       if consumer
         @work_pool.submit do
-          consumer.call(MessageMetadata.new(basic_deliver, properties), content)
+          consumer.call(DeliveryInfo.new(basic_deliver), MessageProperties.new(properties), content)
         end
       end
     end
@@ -549,7 +556,7 @@ module Bunny
       x = find_exchange(basic_return.exchange)
 
       if x
-        x.handle_return(basic_return, properties, content)
+        x.handle_return(ReturnInfo.new(basic_return), MessageProperties.new(properties), content)
       else
         # TODO: log a warning
       end

data/lib/bunny/delivery_info.rb

@@ -0,0 +1,68 @@
+module Bunny
+  # Wraps AMQ::Protocol::Basic::Deliver to
+  # provide access to the delivery properties as immutable hash as
+  # well as methods.
+  class DeliveryInfo
+
+    #
+    # Behaviors
+    #
+
+    include Enumerable
+
+    #
+    # API
+    #
+
+    def initialize(basic_deliver)
+      @basic_deliver = basic_deliver
+      @hash          = {
+        :consumer_tag => basic_deliver.consumer_tag,
+        :delivery_tag => basic_deliver.delivery_tag,
+        :redelivered  => basic_deliver.redelivered,
+        :exchange     => basic_deliver.exchange,
+        :routing_key  => basic_deliver.routing_key
+      }
+    end
+
+    def each(*args, &block)
+      @hash.each(*args, &block)
+    end
+
+    def [](k)
+      @hash[k]
+    end
+
+    def to_hash
+      @hash
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
+    def inspect
+      to_hash.inspect
+    end
+
+    def consumer_tag
+      @basic_deliver.consumer_tag
+    end
+
+    def deliver_tag
+      @basic_deliver.deliver_tag
+    end
+
+    def redelivered
+      @basic_deliver.redelivered
+    end
+
+    def exchange
+      @basic_deliver.exchange
+    end
+
+    def routing_key
+      @basic_deliver.routing_key
+    end
+  end
+end

data/lib/bunny/exchange.rb

@@ -90,7 +90,7 @@ module Bunny
 
 
     def publish(payload, opts = {})
-      @channel.basic_publish(payload, self.name, opts.delete(:routing_key), opts)
+      @channel.basic_publish(payload, self.name, (opts.delete(:routing_key) || opts.delete(:key)), opts)
 
       self
     end
@@ -105,15 +105,21 @@ module Bunny
 
     def bind(source, opts = {})
       @channel.exchange_bind(source, self, opts)
+
+      self
     end
 
     def unbind(source, opts = {})
       @channel.exchange_unbind(source, self, opts)
+
+      self
     end
 
 
     def on_return(&block)
       @on_return = block
+
+      self
     end
 
 

data/lib/bunny/{message_metadata.rb → message_properties.rb}

@@ -1,7 +1,8 @@
 module Bunny
-  # Combines message delivery metadata and message metadata behind a single Hash-like
-  # immutable data structure that mimics AMQP::Header in amqp gem.
-  class MessageMetadata
+  # Wraps basic properties hash as returned by amq-protocol to
+  # provide access to the delivery properties as immutable hash as
+  # well as methods.
+  class MessageProperties
 
     #
     # Behaviors
@@ -13,30 +14,20 @@ module Bunny
     # API
     #
 
-    def initialize(basic_deliver, properties)
-      h = {
-        :consumer_tag => basic_deliver.consumer_tag,
-        :delivery_tag => basic_deliver.delivery_tag,
-        :redelivered  => basic_deliver.redelivered,
-        :exchange     => basic_deliver.exchange,
-        :routing_key  => basic_deliver.routing_key
-      }
-
-      @basic_deliver = basic_deliver
-      @properties    = properties
-      @combined      = properties.merge(h)
+    def initialize(properties)
+      @properties = properties
     end
 
     def each(*args, &block)
-      @combined.each(*args, &block)
+      @properties.each(*args, &block)
     end
 
     def [](k)
-      @combined[k]
+      @properties[k]
     end
 
     def to_hash
-      @combined
+      @properties
     end
 
     def to_s
@@ -47,26 +38,6 @@ module Bunny
       to_hash.inspect
     end
 
-    def consumer_tag
-      @basic_deliver.consumer_tag
-    end
-
-    def deliver_tag
-      @basic_deliver.deliver_tag
-    end
-
-    def redelivered
-      @basic_deliver.redelivered
-    end
-
-    def exchange
-      @basic_deliver.exchange
-    end
-
-    def routing_key
-      @basic_deliver.routing_key
-    end
-
     def content_type
       @properties[:content_type]
     end

data/lib/bunny/queue.rb

@@ -64,20 +64,27 @@ module Bunny
 
     def bind(exchange, opts = {})
       @channel.queue_bind(@name, exchange, opts)
+
+      self
     end
 
     def unbind(exchange, opts = {})
       @channel.queue_unbind(@name, exchange, opts)
+
+      self
     end
 
-    def subscribe(opts = {:consumer_tag => "", :ack => false, :exclusive => false}, &block)
+    def subscribe(opts = {:consumer_tag => "", :ack => false, :exclusive => false, :block => false}, &block)
       @channel.basic_consume(@name, opts.fetch(:consumer_tag, ""), !opts[:ack], opts[:exclusive], opts[:arguments], &block)
 
-      # joins current thread with the consumers pool
-      @channel.work_pool.join
+      if options[:block]
+        # joins current thread with the consumers pool, will block
+        # the current thread for as long as the consumer pool is active
+        @channel.work_pool.join
+      end
     end
 
-    def pop(opts = {:ack => true}, &block)
+    def pop(opts = {:ack => false}, &block)
       delivery_info, properties, content = @channel.basic_get(@name, opts)
 
       if block
@@ -88,6 +95,18 @@ module Bunny
     end
     alias get pop
 
+    def pop_as_hash(opts = {:ack => false}, &block)
+      delivery_info, properties, content = @channel.basic_get(@name, opts)
+
+      result = {:header => properties, :payload => content, :delivery_details => delivery_info}
+
+      if block
+        block.call(result)
+      else
+        result
+      end
+    end
+
 
     # Deletes the queue
     # @api public
@@ -97,6 +116,8 @@ module Bunny
 
     def purge(opts = {})
       @channel.queue_purge(@name, opts)
+
+      self
     end
 
     def status

data/lib/bunny/return_info.rb

@@ -0,0 +1,63 @@
+module Bunny
+  # Wraps AMQ::Protocol::Basic::Return to
+  # provide access to the delivery properties as immutable hash as
+  # well as methods.
+  class ReturnInfo
+
+    #
+    # Behaviors
+    #
+
+    include Enumerable
+
+    #
+    # API
+    #
+
+    def initialize(basic_return)
+      @basic_return = basic_return
+      @hash          = {
+        :reply_code   => basic_return.reply_code,
+        :reply_text   => basic_return.reply_text,
+        :exchange     => basic_return.exchange,
+        :routing_key  => basic_return.routing_key
+      }
+    end
+
+    def each(*args, &block)
+      @hash.each(*args, &block)
+    end
+
+    def [](k)
+      @hash[k]
+    end
+
+    def to_hash
+      @hash
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
+    def inspect
+      to_hash.inspect
+    end
+
+    def reply_code
+      @basic_return.reply_code
+    end
+
+    def reply_text
+      @basic_return.reply_text
+    end
+
+    def exchange
+      @basic_return.exchange
+    end
+
+    def routing_key
+      @basic_return.routing_key
+    end
+  end
+end

data/lib/bunny/session.rb

@@ -44,7 +44,7 @@ module Bunny
     # API
     #
 
-    attr_reader :status, :host, :port, :heartbeat, :user, :pass, :vhost, :frame_max, :default_channel
+    attr_reader :status, :host, :port, :heartbeat, :user, :pass, :vhost, :frame_max
     attr_reader :server_capabilities, :server_properties, :server_authentication_mechanisms, :server_locales
     attr_reader :default_channel
     attr_reader :channel_id_allocator
@@ -105,11 +105,6 @@ module Bunny
       @channel0
     end
 
-    def channel
-      @default_channel
-    end
-
-
     def start
       @status = :connecting
 
@@ -133,6 +128,7 @@ module Bunny
         ch
       end
     end
+    alias channel create_channel
 
     def close
       if @transport.open?
@@ -171,6 +167,36 @@ module Bunny
       self.basic_qos(prefetch_count, true)
     end
 
+
+    #
+    # Backwards compatibility
+    #
+
+    def queue(*args)
+      @default_channel.queue(*args)
+    end
+
+    def direct(*args)
+      @default_channel.direct(*args)
+    end
+
+    def fanout(*args)
+      @default_channel.fanout(*args)
+    end
+
+    def topic(*args)
+      @default_channel.topic(*args)
+    end
+
+    def headers(*args)
+      @default_channel.headers(*args)
+    end
+
+    def exchange(*args)
+      @default_channel.exchange(*args)
+    end
+
+
     #
     # Implementation
     #
@@ -387,10 +413,6 @@ module Bunny
 
     protected
 
-    def socket_open?
-      !@socket.nil? && !@socket.closed?
-    end
-
     def init_connection
       self.send_preamble
 

data/lib/bunny/transport.rb

@@ -39,6 +39,10 @@ module Bunny
     end
 
 
+    def hostname
+      @host
+    end
+
     def uses_tls?
       @ssl
     end
@@ -66,7 +70,7 @@ module Bunny
           @socket.write(*args)
         end
       rescue Errno::EPIPE, Errno::EAGAIN, Bunny::ClientTimeout, IOError => e
-        close!
+        close
         raise Bunny::ConnectionError, e.message
       end
     end

data/lib/bunny/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Bunny
-  VERSION = "0.9.0.pre1"
+  VERSION = "0.9.0.pre2"
 end

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -21,8 +21,8 @@ describe Bunny::Queue, "#subscribe" do
       t = Thread.new do
         ch = connection.create_channel
         q = ch.queue(queue_name, :auto_delete => true, :durable => false)
-        q.subscribe(:exclusive => false, :ack => false) do |metadata, payload|
-          delivered_keys << metadata.routing_key
+        q.subscribe(:exclusive => false, :ack => false) do |delivery_info, properties, payload|
+          delivered_keys << delivery_info.routing_key
           delivered_data << payload
         end
       end

data/spec/higher_level_api/integration/queue_bind_spec.rb

@@ -12,7 +12,7 @@ describe "A client-named", Bunny::Queue do
     q  = ch.queue("bunny.tests.queues.client-named#{rand}", :exclusive => true)
     q.should_not be_server_named
 
-    q.bind("amq.fanout").should be_instance_of(AMQ::Protocol::Queue::BindOk)
+    q.bind("amq.fanout").should == q
 
     ch.close
   end
@@ -23,7 +23,7 @@ describe "A client-named", Bunny::Queue do
     q.should_not be_server_named
 
     q.bind("amq.fanout")
-    q.unbind("amq.fanout").should be_instance_of(AMQ::Protocol::Queue::UnbindOk)
+    q.unbind("amq.fanout").should == q
 
     ch.close
   end
@@ -33,7 +33,7 @@ describe "A client-named", Bunny::Queue do
     q  = ch.queue("bunny.tests.queues.client-named#{rand}", :exclusive => true)
 
     x  = ch.fanout("bunny.tests.exchanges.fanout#{rand}")
-    q.bind(x).should be_instance_of(AMQ::Protocol::Queue::BindOk)
+    q.bind(x).should == q
 
     x.delete
     ch.close
@@ -47,7 +47,7 @@ describe "A client-named", Bunny::Queue do
     x  = ch.fanout("bunny.tests.fanout", :auto_delete => true, :durable => false)
 
     q.bind(x)
-    q.unbind(x).should be_instance_of(AMQ::Protocol::Queue::UnbindOk)
+    q.unbind(x).should == q
 
     ch.close
   end
@@ -67,7 +67,7 @@ describe "A server-named", Bunny::Queue do
     q  = ch.queue("", :exclusive => true)
     q.should be_server_named
 
-    q.bind("amq.fanout").should be_instance_of(AMQ::Protocol::Queue::BindOk)
+    q.bind("amq.fanout").should == q
 
     ch.close
   end
@@ -78,7 +78,7 @@ describe "A server-named", Bunny::Queue do
     q.should be_server_named
 
     q.bind("amq.fanout")
-    q.unbind("amq.fanout").should be_instance_of(AMQ::Protocol::Queue::UnbindOk)
+    q.unbind("amq.fanout").should == q
 
     ch.close
   end
@@ -88,7 +88,7 @@ describe "A server-named", Bunny::Queue do
     q  = ch.queue("", :exclusive => true)
 
     x  = ch.fanout("bunny.tests.exchanges.fanout#{rand}")
-    q.bind(x).should be_instance_of(AMQ::Protocol::Queue::BindOk)
+    q.bind(x).should == q
 
     x.delete
     ch.close
@@ -101,7 +101,7 @@ describe "A server-named", Bunny::Queue do
     name = "bunny.tests.exchanges.fanout#{rand}"
     x    = ch.fanout(name)
     q.bind(x)
-    q.unbind(name).should be_instance_of(AMQ::Protocol::Queue::UnbindOk)
+    q.unbind(name).should == q
 
     x.delete
     ch.close

data/spec/lower_level_api/integration/basic_consume_spec.rb

@@ -42,8 +42,8 @@ describe Bunny::Channel, "#basic_consume" do
       t = Thread.new do
         ch = connection.create_channel
         q = ch.queue(queue_name, :auto_delete => true, :durable => false)
-        ch.basic_consume(q, "", true, false) do |metadata, payload|
-          delivered_keys << metadata.routing_key
+        ch.basic_consume(q, "", true, false) do |delivery_info, properties, payload|
+          delivered_keys << delivery_info.routing_key
           delivered_data << payload
         end
       end
@@ -74,8 +74,8 @@ describe Bunny::Channel, "#basic_consume" do
       t = Thread.new do
         ch = connection.create_channel
         q = ch.queue(queue_name, :auto_delete => true, :durable => false)
-        ch.basic_consume(q, "", false, false) do |metadata, payload|
-          delivered_keys << metadata.routing_key
+        ch.basic_consume(q, "", false, false) do |delivery_info, properties, payload|
+          delivered_keys << delivery_info.routing_key
           delivered_data << payload
 
           ch.close

metadata

@@ -2,7 +2,7 @@
 name: bunny
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.9.0.pre1
+  version: 0.9.0.pre2
 platform: ruby
 authors: 
   - Chris Duncan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-27 00:00:00 Z
+date: 2012-11-30 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: amq-protocol
@@ -52,6 +52,9 @@ files:
   - bin/ci/before_build.sh
   - bunny.gemspec
   - examples/connection/heartbeat.rb
+  - examples/guides/getting_started/blabbr.rb
+  - examples/guides/getting_started/hello_world.rb
+  - examples/guides/getting_started/weathr.rb
   - lib/bunny.rb
   - lib/bunny/channel.rb
   - lib/bunny/channel_id_allocator.rb
@@ -60,13 +63,15 @@ files:
   - lib/bunny/consumer.rb
   - lib/bunny/consumer_tag_generator.rb
   - lib/bunny/consumer_work_pool.rb
+  - lib/bunny/delivery_info.rb
   - lib/bunny/exceptions.rb
   - lib/bunny/exchange.rb
   - lib/bunny/framing.rb
   - lib/bunny/heartbeat_sender.rb
   - lib/bunny/main_loop.rb
-  - lib/bunny/message_metadata.rb
+  - lib/bunny/message_properties.rb
   - lib/bunny/queue.rb
+  - lib/bunny/return_info.rb
   - lib/bunny/session.rb
   - lib/bunny/socket.rb
   - lib/bunny/system_timer.rb