bunny 0.4.4 → 0.5.1

data/lib/bunny/channel08.rb

@@ -0,0 +1,38 @@
+module Bunny
+	class Channel
+		attr_accessor :number, :active
+		attr_reader :client
+		
+		def initialize(client, zero = false)
+			@client = client
+			zero ? @number = 0 : @number = client.channels.size
+			@active = false
+			client.channels[@number] ||= self
+		end
+		
+		def open
+			client.channel = self
+			client.send_frame(Qrack::Protocol::Channel::Open.new)
+      raise Bunny::ProtocolError, "Cannot open channel #{number}" unless client.next_method.is_a?(Qrack::Protocol::Channel::OpenOk)
+
+			@active = true
+			:open_ok
+		end
+		
+		def close
+			client.channel = self
+			client.send_frame(
+	      Qrack::Protocol::Channel::Close.new(:reply_code => 200, :reply_text => 'bye', :method_id => 0, :class_id => 0)
+	    )
+	    raise Bunny::ProtocolError, "Error closing channel #{number}" unless client.next_method.is_a?(Qrack::Protocol::Channel::CloseOk)
+	
+			@active = false
+			:close_ok
+		end
+		
+		def open?
+			active
+		end
+		
+	end
+end

data/lib/bunny/channel09.rb

@@ -0,0 +1,38 @@
+module Bunny
+	class Channel09
+		attr_accessor :number, :active
+		attr_reader :client
+		
+		def initialize(client, zero = false)
+			@client = client
+			zero ? @number = 0 : @number = client.channels.size
+			@active = false
+			client.channels[@number] ||= self
+		end
+		
+		def open
+			client.channel = self
+			client.send_frame(Qrack::Protocol09::Channel::Open.new)
+      raise Bunny::ProtocolError, "Cannot open channel #{number}" unless client.next_method.is_a?(Qrack::Protocol09::Channel::OpenOk)
+
+			@active = true
+			:open_ok
+		end
+		
+		def close
+			client.channel = self
+			client.send_frame(
+	      Qrack::Protocol09::Channel::Close.new(:reply_code => 200, :reply_text => 'bye', :method_id => 0, :class_id => 0)
+	    )
+	    raise Bunny::ProtocolError, "Error closing channel #{number}" unless client.next_method.is_a?(Qrack::Protocol09::Channel::CloseOk)
+	
+			@active = false
+			:close_ok
+		end
+		
+		def open?
+			active
+		end
+		
+	end
+end

data/lib/bunny/client08.rb

@@ -9,11 +9,8 @@ The Client class provides the major Bunny API methods.
 =end
 
   class Client < Qrack::Client
-    CONNECT_TIMEOUT = 1.0
-    RETRY_DELAY     = 10.0
-
-    attr_reader   :status, :host, :vhost, :port, :logging, :spec
-    attr_accessor :channel, :logfile, :exchanges, :queues, :ticket
+	
+		attr_accessor :ticket
 
 =begin rdoc
 
@@ -41,7 +38,7 @@ Sets up a Bunny::Client object ready for connection to a broker/server. _Client_
 =end
 
     def initialize(opts = {})
-			@spec = opts[:spec] || '08'
+			@spec = '0-8'
 			@host = opts[:host] || 'localhost'
 			@port = opts[:port] || Qrack::Protocol::PORT
       @user   = opts[:user]  || 'guest'
@@ -51,8 +48,12 @@ Sets up a Bunny::Client object ready for connection to a broker/server. _Client_
 			@logging = opts[:logging] || false
       @insist = opts[:insist]
       @status = :not_connected
+			@frame_max = opts[:frame_max] || 131072
+			@channel_max = opts[:channel_max] || 0
 			@logger = nil
 			create_logger if @logging
+			# Create channel 0
+      @channel = Bunny::Channel.new(self, true)
     end
 
 =begin rdoc
@@ -60,9 +61,8 @@ Sets up a Bunny::Client object ready for connection to a broker/server. _Client_
 === DESCRIPTION:
 
 Declares an exchange to the broker/server. If the exchange does not exist, a new one is created
-using the arguments passed in. If the exchange already exists, a reference to it is created, provided
-that the arguments passed in do not conflict with the existing attributes of the exchange. If an error
-occurs a _Bunny_::_ProtocolError_ is raised.
+using the arguments passed in. If the exchange already exists, the existing object is returned.
+If an error occurs a _Bunny_::_ProtocolError_ is raised.
 
 ==== OPTIONS:
 
@@ -83,7 +83,8 @@ Exchange
 =end
 
 		def exchange(name, opts = {})
-			exchanges[name] ||= Bunny::Exchange.new(self, name, opts)
+			return exchanges[name] if exchanges.has_key?(name)
+			Bunny::Exchange.new(self, name, opts)
 		end
 
 =begin rdoc
@@ -141,7 +142,6 @@ Queue
       return queues[name] if queues.has_key?(name)
 
       queue = Bunny::Queue.new(self, name, opts)
-      queues[queue.name] = queue
 	  end
 	
 =begin rdoc
@@ -159,12 +159,13 @@ Returns hash of queues declared by Bunny.
     def send_frame(*args)
       args.each do |data|
         data.ticket  = ticket if ticket and data.respond_to?(:ticket=)
-        data         = data.to_frame(channel) unless data.is_a?(Qrack::Transport::Frame)
-        data.channel = channel
+        data         = data.to_frame(channel.number) unless data.is_a?(Qrack::Transport::Frame)
+        data.channel = channel.number
 
         @logger.info("send") { data } if @logging
         write(data.to_s)
       end
+
       nil
     end
 
@@ -174,15 +175,13 @@ Returns hash of queues declared by Bunny.
       frame
     end
 
-    def next_method
-      next_payload
-    end
-
     def next_payload
       frame = next_frame
-      frame and frame.payload
+			frame.payload
     end
 
+		alias next_method next_payload
+
 =begin rdoc
 
 === DESCRIPTION:
@@ -197,17 +196,18 @@ _Bunny_::_ProtocolError_ is raised. If successful, _Client_._status_ is set to <
 =end
 
     def close
-      send_frame(
-        Qrack::Protocol::Channel::Close.new(:reply_code => 200, :reply_text => 'bye', :method_id => 0, :class_id => 0)
-      )
-      raise Bunny::ProtocolError, "Error closing channel #{channel}" unless next_method.is_a?(Qrack::Protocol::Channel::CloseOk)
+			# Close all active channels
+			channels.each_value do |c|
+				c.close if c.open?
+			end
+			
+			# Set client channel to zero
+      self.channel = channels[0]
 
-      self.channel = 0
-      send_frame(
-        Qrack::Protocol::Connection::Close.new(:reply_code => 200, :reply_text => 'Goodbye', :class_id => 0, :method_id => 0)
-      )
-      raise Bunny::ProtocolError, "Error closing connection" unless next_method.is_a?(Qrack::Protocol::Connection::CloseOk)
+			# Close connection to AMQP server
+			close_connection
 
+			# Close TCP Socket
       close_socket
     end
 
@@ -239,56 +239,19 @@ _Bunny_::_ProtocolError_ is raised. If successful, _Client_._status_ is set to <
 				# Create/get socket
 				socket
 				
-        @channel = 0
-        write(Qrack::Protocol::HEADER)
-        write([1, 1, Qrack::Protocol::VERSION_MAJOR, Qrack::Protocol::VERSION_MINOR].pack('C4'))
-        raise Bunny::ProtocolError, 'Connection initiation failed' unless next_method.is_a?(Qrack::Protocol::Connection::Start)
+				# Initiate connection
+				init_connection
 
-        send_frame(
-          Qrack::Protocol::Connection::StartOk.new(
-            {:platform => 'Ruby', :product => 'Bunny', :information => 'http://github.com/celldee/bunny', :version => VERSION},
-            'AMQPLAIN',
-            {:LOGIN => @user, :PASSWORD => @pass},
-            'en_US'
-          )
-        )
-
-        method = next_method
-        raise Bunny::ProtocolError, "Connection failed - user: #{@user}, pass: #{@pass}" if method.nil?
-
-        if method.is_a?(Qrack::Protocol::Connection::Tune)
-          send_frame(
-            Qrack::Protocol::Connection::TuneOk.new( :channel_max => 0, :frame_max => 131072, :heartbeat => 0)
-          )
-        end
-
-        send_frame(
-          Qrack::Protocol::Connection::Open.new(:virtual_host => @vhost, :capabilities => '', :insist => @insist)
-        )
-
-        case method = next_method
-        when Qrack::Protocol::Connection::OpenOk
-          break
-        when Qrack::Protocol::Connection::Redirect
-					raise Bunny::ConnectionError, "Cannot connect to the specified server - host: #{@host}, port: #{@port}" if @insist
-					
-          @host, @port = method.host.split(':')
-          close_socket
-        else
-          raise Bunny::ProtocolError, 'Cannot open connection'
-        end
+				# Open connection
+				break if open_connection == :ok
       end
 
-      @channel = 1
-      send_frame(Qrack::Protocol::Channel::Open.new)
-      raise Bunny::ProtocolError, "Cannot open channel #{channel}" unless next_method.is_a?(Qrack::Protocol::Channel::OpenOk)
-
-      send_frame(
-        Qrack::Protocol::Access::Request.new(:realm => '/data', :read => true, :write => true, :active => true, :passive => true)
-      )
-      method = next_method
-      raise Bunny::ProtocolError, 'Access denied' unless method.is_a?(Qrack::Protocol::Access::RequestOk)
-      self.ticket = method.ticket
+			# Open a channel
+			self.channel = get_channel
+			channel.open
+			
+			# Get access ticket
+			request_access
 
 			# return status
 			status
@@ -360,11 +323,141 @@ true, they are applied to the entire connection.
       # return confirmation
       :qos_ok
     end
+
+=begin rdoc
+
+=== DESCRIPTION:
+This method sets the channel to use standard transactions. The
+client must use this method at least once on a channel before
+using the Commit or Rollback methods.
+
+=end
+
+		def tx_select
+			send_frame(Qrack::Protocol::Tx::Select.new())
+			
+			raise Bunny::ProtocolError,
+        "Error initiating transactions for current channel" unless
+ 				next_method.is_a?(Qrack::Protocol::Tx::SelectOk)
+
+			# return confirmation
+			:select_ok
+		end
+		
+=begin rdoc
+
+=== DESCRIPTION:
+This method commits all messages published and acknowledged in
+the current transaction. A new transaction starts immediately
+after a commit.
+
+=end
+		
+		def tx_commit
+			send_frame(Qrack::Protocol::Tx::Commit.new())
+			
+			raise Bunny::ProtocolError,
+        "Error commiting transaction" unless
+ 				next_method.is_a?(Qrack::Protocol::Tx::CommitOk)
+
+			# return confirmation
+			:commit_ok
+		end
+		
+=begin rdoc
+
+=== DESCRIPTION:
+This method abandons all messages published and acknowledged in
+the current transaction. A new transaction starts immediately
+after a rollback.
+
+=end
+		
+		def tx_rollback
+			send_frame(Qrack::Protocol::Tx::Rollback.new())
+			
+			raise Bunny::ProtocolError,
+        "Error rolling back transaction" unless
+ 				next_method.is_a?(Qrack::Protocol::Tx::RollbackOk)
+
+			# return confirmation
+			:rollback_ok
+		end
 	
 		def logging=(bool)
 			@logging = bool
 			create_logger if @logging
 		end
+			
+		def channels
+			@channels ||= {}
+		end
+		
+		def get_channel
+			channels.each_value do |c|
+				return c if (!c.open? and c.number != 0)
+			end
+			# If no channel to re-use instantiate new one
+			Bunny::Channel.new(self)
+		end
+		
+		def init_connection
+			write(Qrack::Protocol::HEADER)
+      write([1, 1, Qrack::Protocol::VERSION_MAJOR, Qrack::Protocol::VERSION_MINOR].pack('C4'))
+      raise Bunny::ProtocolError, 'Connection initiation failed' unless next_method.is_a?(Qrack::Protocol::Connection::Start)
+		end
+		
+		def open_connection
+			send_frame(
+        Qrack::Protocol::Connection::StartOk.new(
+          {:platform => 'Ruby', :product => 'Bunny', :information => 'http://github.com/celldee/bunny', :version => VERSION},
+          'AMQPLAIN',
+          {:LOGIN => @user, :PASSWORD => @pass},
+          'en_US'
+        )
+      )
+
+      method = next_method
+      raise Bunny::ProtocolError, "Connection failed - user: #{@user}, pass: #{@pass}" if method.nil?
+
+      if method.is_a?(Qrack::Protocol::Connection::Tune)
+        send_frame(
+          Qrack::Protocol::Connection::TuneOk.new( :channel_max => @channel_max, :frame_max => @frame_max, :heartbeat => 0)
+        )
+      end
+
+      send_frame(
+        Qrack::Protocol::Connection::Open.new(:virtual_host => @vhost, :capabilities => '', :insist => @insist)
+      )
+
+      case method = next_method
+      when Qrack::Protocol::Connection::OpenOk
+        return :ok
+      when Qrack::Protocol::Connection::Redirect
+				raise Bunny::ConnectionError, "Cannot connect to the specified server - host: #{@host}, port: #{@port}" if @insist
+				
+        @host, @port = method.host.split(':')
+        close_socket
+      else
+        raise Bunny::ProtocolError, 'Cannot open connection'
+      end
+		end
+
+		def close_connection
+			send_frame(
+	      Qrack::Protocol::Connection::Close.new(:reply_code => 200, :reply_text => 'Goodbye', :class_id => 0, :method_id => 0)
+	    )
+	    raise Bunny::ProtocolError, "Error closing connection" unless next_method.is_a?(Qrack::Protocol::Connection::CloseOk)
+    end
+
+		def request_access
+			send_frame(
+        Qrack::Protocol::Access::Request.new(:realm => '/data', :read => true, :write => true, :active => true, :passive => true)
+      )
+      method = next_method
+      raise Bunny::ProtocolError, 'Access denied' unless method.is_a?(Qrack::Protocol::Access::RequestOk)
+      self.ticket = method.ticket
+		end
 
   private
 

data/lib/bunny/{client091.rb → client09.rb}

@@ -8,12 +8,7 @@ The Client class provides the major Bunny API methods.
 
 =end
 
-  class Client < Qrack::Client
-    CONNECT_TIMEOUT = 1.0
-    RETRY_DELAY     = 10.0
-
-    attr_reader   :status, :host, :vhost, :port, :logging, :spec
-    attr_accessor :channel, :logfile, :exchanges, :queues, :ticket
+  class Client09 < Qrack::Client
 
 =begin rdoc
 
@@ -33,26 +28,25 @@ Sets up a Bunny::Client object ready for connection to a broker/server. _Client_
 * <tt>:logging => true or false (_default_)</tt> - If set to _true_, session information is sent
   to STDOUT if <tt>:logfile</tt> has not been specified. Otherwise, session information is written to
   <tt>:logfile</tt>.
-* <tt>:insist => true or false (_default_)</tt> - In a configuration with multiple load-sharing
-  servers, the server may respond to a Connection::Open method with a Connection::Redirect. The insist
-  option, if set to _true_, tells the server that the client is insisting on a connection to the
-  specified server.
 
 =end
 
     def initialize(opts = {})
-			@spec = opts[:spec] || '0-8'
+			@spec = '0-9-1'
 			@host = opts[:host] || 'localhost'
-			@port = opts[:port] || Qrack::Protocol::PORT
+			@port = opts[:port] || Qrack::Protocol09::PORT
       @user   = opts[:user]  || 'guest'
       @pass   = opts[:pass]  || 'guest'
       @vhost  = opts[:vhost] || '/'
+			@frame_max = opts[:frame_max] || 131072
+			@channel_max = opts[:channel_max] || 5
 			@logfile = opts[:logfile] || nil
 			@logging = opts[:logging] || false
-      @insist = opts[:insist]
       @status = :not_connected
 			@logger = nil
 			create_logger if @logging
+			# Create channel 0
+      @channel = Bunny::Channel09.new(self, true)
     end
 
 =begin rdoc
@@ -83,7 +77,8 @@ Exchange
 =end
 
 		def exchange(name, opts = {})
-			exchanges[name] ||= Bunny::Exchange.new(self, name, opts)
+			return exchanges[name] if exchanges.has_key?(name)
+			exchanges[name] ||= Bunny::Exchange09.new(self, name, opts)
 		end
 
 =begin rdoc
@@ -140,8 +135,7 @@ Queue
 
       return queues[name] if queues.has_key?(name)
 
-      queue = Bunny::Queue.new(self, name, opts)
-      queues[queue.name] = queue
+      queue = Bunny::Queue09.new(self, name, opts)
 	  end
 	
 =begin rdoc
@@ -158,9 +152,8 @@ Returns hash of queues declared by Bunny.
 
     def send_frame(*args)
       args.each do |data|
-        data.ticket  = ticket if ticket and data.respond_to?(:ticket=)
-        data         = data.to_frame(channel) unless data.is_a?(Qrack::Transport::Frame)
-        data.channel = channel
+        data         = data.to_frame(channel.number) unless data.is_a?(Qrack::Transport09::Frame)
+        data.channel = channel.number
 
         @logger.info("send") { data } if @logging
         write(data.to_s)
@@ -169,20 +162,18 @@ Returns hash of queues declared by Bunny.
     end
 
     def next_frame
-      frame = Qrack::Transport::Frame.parse(buffer)
+      frame = Qrack::Transport09::Frame.parse(buffer)
 			@logger.info("received") { frame } if @logging
       frame
     end
 
-    def next_method
-      next_payload
-    end
-
     def next_payload
       frame = next_frame
-      frame and frame.payload
+			frame.payload
     end
 
+		alias next_method next_payload
+
 =begin rdoc
 
 === DESCRIPTION:
@@ -197,17 +188,18 @@ _Bunny_::_ProtocolError_ is raised. If successful, _Client_._status_ is set to <
 =end
 
     def close
-      send_frame(
-        Qrack::Protocol::Channel::Close.new(:reply_code => 200, :reply_text => 'bye', :method_id => 0, :class_id => 0)
-      )
-      raise Bunny::ProtocolError, "Error closing channel #{channel}" unless next_method.is_a?(Qrack::Protocol::Channel::CloseOk)
-
-      self.channel = 0
-      send_frame(
-        Qrack::Protocol::Connection::Close.new(:reply_code => 200, :reply_text => 'Goodbye', :class_id => 0, :method_id => 0)
-      )
-      raise Bunny::ProtocolError, "Error closing connection" unless next_method.is_a?(Qrack::Protocol::Connection::CloseOk)
-
+			# Close all active channels
+			channels.each_value do |c|
+				c.close if c.open?
+			end
+			
+			# Set client channel to zero
+      self.channel = channels[0]
+
+			# Close connection to AMQP server
+			close_connection
+
+			# Close TCP socket
       close_socket
     end
 
@@ -235,60 +227,18 @@ _Bunny_::_ProtocolError_ is raised. If successful, _Client_._status_ is set to <
 =end
 		
 		def start_session
-      loop do
-				# Create/get socket
-				socket
-				
-        @channel = 0
-        write(Qrack::Protocol::HEADER)
-        write([1, 1, Qrack::Protocol::VERSION_MINOR, Qrack::Protocol::VERSION_MAJOR].pack('C4'))
-        raise Bunny::ProtocolError, 'Connection initiation failed' unless next_method.is_a?(Qrack::Protocol::Connection::Start)
-
-        send_frame(
-          Qrack::Protocol::Connection::StartOk.new(
-            {:platform => 'Ruby', :product => 'Bunny', :information => 'http://github.com/celldee/bunny', :version => VERSION},
-            'AMQPLAIN',
-            {:LOGIN => @user, :PASSWORD => @pass},
-            'en_US'
-          )
-        )
-
-        method = next_method
-        raise Bunny::ProtocolError, "Connection failed - user: #{@user}, pass: #{@pass}" if method.nil?
-
-        if method.is_a?(Qrack::Protocol::Connection::Tune)
-          send_frame(
-            Qrack::Protocol::Connection::TuneOk.new( :channel_max => 0, :frame_max => 131072, :heartbeat => 0)
-          )
-        end
-
-        send_frame(
-          Qrack::Protocol::Connection::Open.new(:virtual_host => @vhost, :capabilities => '', :insist => @insist)
-        )
-
-        case method = next_method
-        when Qrack::Protocol::Connection::OpenOk
-          break
-        when Qrack::Protocol::Connection::Redirect
-					raise Bunny::ConnectionError, "Cannot connect to the specified server - host: #{@host}, port: #{@port}" if @insist
-					
-          @host, @port = method.host.split(':')
-          close_socket
-        else
-          raise Bunny::ProtocolError, 'Cannot open connection'
-        end
-      end
-
-      @channel = 1
-      send_frame(Qrack::Protocol::Channel::Open.new)
-      raise Bunny::ProtocolError, "Cannot open channel #{channel}" unless next_method.is_a?(Qrack::Protocol::Channel::OpenOk)
-
-      send_frame(
-        Qrack::Protocol::Access::Request.new(:realm => '/data', :read => true, :write => true, :active => true, :passive => true)
-      )
-      method = next_method
-      raise Bunny::ProtocolError, 'Access denied' unless method.is_a?(Qrack::Protocol::Access::RequestOk)
-      self.ticket = method.ticket
+			# Create/get socket
+			socket
+			
+			# Initiate connection
+			init_connection
+			
+			# Open connection
+			open_connection
+
+			# Open a channel
+			self.channel = get_channel
+			channel.open
 
 			# return status
 			status
@@ -314,20 +264,173 @@ the message, potentially then delivering it to an alternative subscriber.
 		def recover(opts = {})
 
 	    send_frame(
-	      Qrack::Protocol::Basic::Recover.new({ :requeue => false }.merge(opts))
+	      Qrack::Protocol09::Basic::Recover.new({ :requeue => false }.merge(opts))
 	    )
 
 	  end
 	
+=begin rdoc
+
+=== DESCRIPTION:
+
+Requests a specific quality of service. The QoS can be specified for the current channel
+or for all channels on the connection. The particular properties and semantics of a QoS
+method always depend on the content class semantics. Though the QoS method could in principle
+apply to both peers, it is currently meaningful only for the server.
+
+==== Options:
+
+* <tt>:prefetch_size => size in no. of octets (default = 0)</tt> - The client can request that
+messages be sent in advance so that when the client finishes processing a message, the following
+message is already held locally, rather than needing to be sent down the channel. Prefetching gives
+a performance improvement. This field specifies the prefetch window size in octets. The server
+will send a message in advance if it is equal to or smaller in size than the available prefetch
+size (and also falls into other prefetch limits). May be set to zero, meaning "no specific limit",
+although other prefetch limits may still apply. The prefetch-size is ignored if the no-ack option
+is set.
+* <tt>:prefetch_count => no. messages (default = 1)</tt> - Specifies a prefetch window in terms
+of whole messages. This field may be used in combination with the prefetch-size field; a message
+will only be sent in advance if both prefetch windows (and those at the channel and connection level)
+allow it. The prefetch-count is ignored if the no-ack option is set.
+* <tt>:global => true or false (_default_)</tt> - By default the QoS settings apply to the current channel only. If set to
+true, they are applied to the entire connection.
+
+=end
+
+		def qos(opts = {})
+
+      send_frame(
+        Qrack::Protocol09::Basic::Qos.new({ :prefetch_size => 0, :prefetch_count => 1, :global => false }.merge(opts))
+      )
+
+      raise Bunny::ProtocolError,
+        "Error specifying Quality of Service" unless
+ 				next_method.is_a?(Qrack::Protocol09::Basic::QosOk)
+
+      # return confirmation
+      :qos_ok
+    end
+
+=begin rdoc
+
+=== DESCRIPTION:
+This method sets the channel to use standard transactions. The
+client must use this method at least once on a channel before
+using the Commit or Rollback methods.
+
+=end
+
+		def tx_select
+			send_frame(Qrack::Protocol09::Tx::Select.new())
+			
+			raise Bunny::ProtocolError,
+        "Error initiating transactions for current channel" unless
+ 				next_method.is_a?(Qrack::Protocol09::Tx::SelectOk)
+
+			# return confirmation
+			:select_ok
+		end
+		
+=begin rdoc
+
+=== DESCRIPTION:
+This method commits all messages published and acknowledged in
+the current transaction. A new transaction starts immediately
+after a commit.
+
+=end
+		
+		def tx_commit
+			send_frame(Qrack::Protocol09::Tx::Commit.new())
+			
+			raise Bunny::ProtocolError,
+        "Error commiting transaction" unless
+ 				next_method.is_a?(Qrack::Protocol09::Tx::CommitOk)
+
+			# return confirmation
+			:commit_ok
+		end
+		
+=begin rdoc
+
+=== DESCRIPTION:
+This method abandons all messages published and acknowledged in
+the current transaction. A new transaction starts immediately
+after a rollback.
+
+=end
+		
+		def tx_rollback
+			send_frame(Qrack::Protocol09::Tx::Rollback.new())
+			
+			raise Bunny::ProtocolError,
+        "Error rolling back transaction" unless
+ 				next_method.is_a?(Qrack::Protocol09::Tx::RollbackOk)
+
+			# return confirmation
+			:rollback_ok
+		end
+	
 		def logging=(bool)
 			@logging = bool
 			create_logger if @logging
 		end
+		
+		def channels
+			@channels ||= {}
+		end
+		
+		def get_channel
+			channels.each_value do |c|
+				return c if (!c.open? and c.number != 0)
+			end
+			# If no channel to re-use instantiate new one
+			Bunny::Channel09.new(self)
+		end
+		
+		def init_connection
+			write(Qrack::Protocol09::HEADER)
+      write([0, Qrack::Protocol09::VERSION_MAJOR, Qrack::Protocol09::VERSION_MINOR, Qrack::Protocol09::REVISION].pack('C4'))
+      raise Bunny::ProtocolError, 'Connection initiation failed' unless next_method.is_a?(Qrack::Protocol09::Connection::Start)
+		end
+		
+		def open_connection
+			send_frame(
+        Qrack::Protocol09::Connection::StartOk.new(
+          :client_properties => {:platform => 'Ruby', :product => 'Bunny', :information => 'http://github.com/celldee/bunny', :version => VERSION},
+          :mechanism => 'PLAIN',
+					:response => "\0" + @user + "\0" + @pass,
+          :locale => 'en_US'
+        )
+      )
+
+      method = next_method
+      raise Bunny::ProtocolError, "Connection failed - user: #{@user}, pass: #{@pass}" if method.nil?
+
+      if method.is_a?(Qrack::Protocol09::Connection::Tune)
+        send_frame(
+          Qrack::Protocol09::Connection::TuneOk.new( :channel_max => @channel_max, :frame_max => @frame_max, :heartbeat => 0)
+        )
+      end
+
+      send_frame(
+        Qrack::Protocol09::Connection::Open.new(:virtual_host => @vhost, :reserved_1 => 0, :reserved_2 => false)
+      )
+
+      raise Bunny::ProtocolError, 'Cannot open connection' unless next_method.is_a?(Qrack::Protocol09::Connection::OpenOk)
+		end
+		
+		def close_connection
+			send_frame(
+        Qrack::Protocol09::Connection::Close.new(:reply_code => 200, :reply_text => 'Goodbye', :class_id => 0, :method_id => 0)
+      )
+      raise Bunny::ProtocolError, "Error closing connection" unless next_method.is_a?(Qrack::Protocol09::Connection::CloseOk)
+		end
 
   private
 
     def buffer
-      @buffer ||= Qrack::Transport::Buffer.new(self)
+      @buffer ||= Qrack::Transport09::Buffer.new(self)
     end
 
     def send_command(cmd, *args)