amq-protocol 0.9.5 → 1.0.0.pre1

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ruby-head
+  - jruby-18mode
   - jruby-19mode
   - jruby-head
 notifications:

data/LICENSE

@@ -1,5 +1,4 @@
 Copyright (c) 2010 – 2011 Jakub Šťastný aka Botanicus
-Copyright (c) 2011 - 2012 Michael S. Klishin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/amqp_0.9.1_changes.json

@@ -1 +1 @@
-{"tx": {"select-ok": ["client"], "rollback": ["server"], "commit": ["server"], "rollback-ok": ["client"], "select": ["server"], "commit-ok": ["client"]}, "exchange": {"delete-ok": ["client"], "declare-ok": ["client"], "declare": ["server"], "delete": ["server"], "bind": ["server"], "bind-ok": ["client"], "unbind": ["server"], "unbind-ok": ["client"]}, "queue": {"unbind": ["server"], "unbind-ok": ["client"], "purge-ok": ["client"], "bind": ["server"], "purge": ["server"], "declare-ok": ["client"], "delete-ok": ["client"], "delete": ["server"], "declare": ["server"], "bind-ok": ["client"]}, "connection": {"secure": ["client"], "secure-ok": ["server"], "open-ok": ["client"], "close-ok": ["client", "server"], "start": ["client"], "tune": ["client"], "start-ok": ["server"], "close": ["client", "server"], "open": ["server"], "tune-ok": ["server"]}, "basic": {"qos": ["server"], "consume": ["server"], "reject": ["server"], "get": ["server"], "ack": ["client", "server"], "get-ok": ["client"], "consume-ok": ["client"], "deliver": ["client"], "recover-ok": ["client"], "publish": ["server"], "cancel": ["server", "client"], "recover-async": ["server"], "get-empty": ["client"], "qos-ok": ["client"], "return": ["client"], "recover": ["server"], "cancel-ok": ["client"]}, "channel": {"flow-ok": ["server", "client"], "flow": ["server", "client"], "open-ok": ["client"], "close-ok": ["client", "server"], "close": ["client", "server"], "open": ["server"]}}
+{"tx": {"select-ok": ["client"], "rollback": ["server"], "commit": ["server"], "rollback-ok": ["client"], "select": ["server"], "commit-ok": ["client"]}, "exchange": {"delete-ok": ["client"], "declare-ok": ["client"], "declare": ["server"], "delete": ["server"], "bind": ["server"], "bind-ok": ["client"], "unbind": ["server"], "unbind-ok": ["client"]}, "queue": {"unbind": ["server"], "unbind-ok": ["client"], "purge-ok": ["client"], "bind": ["server"], "purge": ["server"], "declare-ok": ["client"], "delete-ok": ["client"], "delete": ["server"], "declare": ["server"], "bind-ok": ["client"]}, "connection": {"secure": ["client"], "secure-ok": ["server"], "open-ok": ["client"], "close-ok": ["client", "server"], "start": ["client"], "tune": ["client"], "start-ok": ["server"], "close": ["client", "server"], "open": ["server"], "tune-ok": ["server"]}, "basic": {"qos": ["server"], "consume": ["server"], "reject": ["server"], "get": ["server"], "ack": ["client", "server"], "get-ok": ["client"], "consume-ok": ["client"], "deliver": ["client"], "recover-ok": ["client"], "publish": ["server"], "cancel": ["server"], "recover-async": ["server"], "get-empty": ["client"], "qos-ok": ["client"], "return": ["client"], "recover": ["server"], "cancel-ok": ["client"]}, "channel": {"flow-ok": ["server", "client"], "flow": ["server", "client"], "open-ok": ["client"], "close-ok": ["client", "server"], "close": ["client", "server"], "open": ["server"]}}

data/codegen_helpers.py

@@ -4,11 +4,11 @@ def genSingleEncode(spec, cValue, unresolved_domain):
     buffer = []
     type = spec.resolveDomain(unresolved_domain)
     if type == 'shortstr':
-        buffer.append("buffer << %s.to_s.bytesize.chr" % (cValue,))
-        buffer.append("buffer << %s.to_s" % (cValue,))
+        buffer.append("buffer << %s.bytesize.chr" % (cValue,))
+        buffer.append("buffer << %s" % (cValue,))
     elif type == 'longstr':
-        buffer.append("buffer << [%s.to_s.bytesize].pack(PACK_UINT32)" % (cValue,))
-        buffer.append("buffer << %s.to_s" % (cValue,))
+        buffer.append("buffer << [%s.bytesize].pack(PACK_UINT32)" % (cValue,))
+        buffer.append("buffer << %s" % (cValue,))
     elif type == 'octet':
         buffer.append("buffer << [%s].pack(PACK_CHAR)" % (cValue,))
     elif type == 'short':
@@ -87,9 +87,17 @@ def genSingleSimpleDecode(spec, field):
     type = spec.resolveDomain(unresolved_domain)
     buffer = []
     if type == 'shortstr':
-        buffer.append("data.to_s")
+        # buffer.append("length = data.unpack(PACK_CHAR)[0]")
+        # buffer.append("result = data[offset..-1]")
+        # buffer.append("raise 'Bad size: #{length} expected, got #{result.bytesize}' if result.bytesize != length")
+        # buffer.append("result")
+        buffer.append("data")
     elif type == 'longstr':
-        buffer.append("data.to_s")
+        # buffer.append("length = data.unpack(PACK_CHAR)[0]")
+        # buffer.append("result = data[offset..-1]")
+        # buffer.append("raise 'Bad size: #{length} expected, got #{result.bytesize}' if result.bytesize != length")
+        # buffer.append("result")
+        buffer.append("data")
     elif type == 'octet':
         buffer.append("data.unpack(PACK_CHAR).first")
     elif type == 'short':

data/lib/amq/protocol/client.rb

@@ -17,17 +17,19 @@ module AMQ
     # caching
     EMPTY_STRING = "".freeze
 
-    PACK_CHAR               = "C".freeze
-    PACK_UINT16             = "n".freeze
-    PACK_UINT16_X2          = "n2".freeze
-    PACK_UINT32             = "N".freeze
-    PACK_UINT32_X2          = "N2".freeze
-    PACK_INT64              = "q".freeze
-    PACK_UCHAR_UINT32       = "CN".freeze
-    PACK_CHAR_UINT16_UINT32 = "cnN".freeze
-
-    PACK_32BIT_FLOAT        = "f".freeze
-    PACK_64BIT_FLOAT        = "d".freeze
+    PACK_CHAR               = 'C'.freeze
+    PACK_UINT16             = 'n'.freeze
+    PACK_UINT16_X2          = 'n2'.freeze
+    PACK_UINT32             = 'N'.freeze
+    PACK_UINT32_X2          = 'N2'.freeze
+    PACK_INT64              = 'q'.freeze
+    PACK_UCHAR_UINT32       = 'CN'.freeze
+    PACK_CHAR_UINT16_UINT32 = 'cnN'.freeze
+
+    PACK_32BIT_FLOAT        = 'f'.freeze
+    PACK_64BIT_FLOAT        = 'd'.freeze
+
+
 
     # @return [Array] Collection of subclasses of AMQ::Protocol::Class.
     def self.classes
@@ -168,8 +170,9 @@ module AMQ
       VALUE = 541
     end
 
-    # We don"t instantiate the following classes,
-    # as we don"t actually need any per-instance state.
+
+    # We don't instantiate the following classes,
+    # as we don't actually need any per-instance state.
     # Also, this is pretty low-level functionality,
     # hence it should have a reasonable performance.
     # As everyone knows, garbage collector in MRI performs
@@ -177,10 +180,10 @@ module AMQ
     # not creating any objects, but only use class as
     # a struct. Creating classes is quite expensive though,
     # but here the inheritance comes handy and mainly
-    # as we can"t simply make a reference to a function,
-    # we can"t use a hash or an object. I"ve been also
+    # as we can't simply make a reference to a function,
+    # we can't use a hash or an object. I've been also
     # considering to have just a bunch of methods, but
-    # here"s the problem, that after we"d require this file,
+    # here's the problem, that after we'd require this file,
     # all these methods would become global which would
     # be a bad, bad thing to do.
     class Class
@@ -277,6 +280,8 @@ module AMQ
       @name = "connection"
       @method_id = 10
 
+
+
       class Start < Protocol::Method
         @name = "connection.start"
         @method_id = 10
@@ -316,6 +321,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class StartOk < Protocol::Method
@@ -324,25 +331,27 @@ module AMQ
         @index = 0x000A000B # 10, 11, 655371
         @packed_indexes = [10, 11].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["client_properties = nil", "mechanism = "PLAIN"", "response = nil", "locale = "en_US""]
+        # [u'client_properties = nil', u"mechanism = u'PLAIN'", u'response = nil', u"locale = u'en_US'"]
         def self.encode(client_properties, mechanism, response, locale)
           channel = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << AMQ::Protocol::Table.encode(client_properties)
-          buffer << mechanism.to_s.bytesize.chr
-          buffer << mechanism.to_s
-          buffer << [response.to_s.bytesize].pack(PACK_UINT32)
-          buffer << response.to_s
-          buffer << locale.to_s.bytesize.chr
-          buffer << locale.to_s
+          buffer << mechanism.bytesize.chr
+          buffer << mechanism
+          buffer << [response.bytesize].pack(PACK_UINT32)
+          buffer << response
+          buffer << locale.bytesize.chr
+          buffer << locale
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class Secure < Protocol::Method
@@ -369,6 +378,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class SecureOk < Protocol::Method
@@ -377,20 +388,22 @@ module AMQ
         @index = 0x000A0015 # 10, 21, 655381
         @packed_indexes = [10, 21].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["response = nil"]
+        # [u'response = nil']
         def self.encode(response)
           channel = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
-          buffer << [response.to_s.bytesize].pack(PACK_UINT32)
-          buffer << response.to_s
+          buffer << [response.bytesize].pack(PACK_UINT32)
+          buffer << response
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class Tune < Protocol::Method
@@ -421,6 +434,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class TuneOk < Protocol::Method
@@ -429,21 +444,23 @@ module AMQ
         @index = 0x000A001F # 10, 31, 655391
         @packed_indexes = [10, 31].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["channel_max = false", "frame_max = false", "heartbeat = false"]
+        # [u'channel_max = false', u'frame_max = false', u'heartbeat = false']
         def self.encode(channel_max, frame_max, heartbeat)
           channel = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [channel_max].pack(PACK_UINT16)
           buffer << [frame_max].pack(PACK_UINT32)
           buffer << [heartbeat].pack(PACK_UINT16)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class Open < Protocol::Method
@@ -452,27 +469,29 @@ module AMQ
         @index = 0x000A0028 # 10, 40, 655400
         @packed_indexes = [10, 40].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["virtual_host = "/"", "capabilities = EMPTY_STRING", "insist = false"]
+        # [u"virtual_host = u'/'", u'capabilities = EMPTY_STRING', u'insist = false']
         def self.encode(virtual_host)
           capabilities = EMPTY_STRING
           insist = false
           channel = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
-          buffer << virtual_host.to_s.bytesize.chr
-          buffer << virtual_host.to_s
-          buffer << capabilities.to_s.bytesize.chr
-          buffer << capabilities.to_s
+          buffer << virtual_host.bytesize.chr
+          buffer << virtual_host
+          buffer << capabilities.bytesize.chr
+          buffer << capabilities
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if insist
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class OpenOk < Protocol::Method
@@ -499,6 +518,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Close < Protocol::Method
@@ -536,18 +557,19 @@ module AMQ
         end
 
         # @return
-        # ["reply_code = nil", "reply_text = EMPTY_STRING", "class_id = nil", "method_id = nil"]
+        # [u'reply_code = nil', u'reply_text = EMPTY_STRING', u'class_id = nil', u'method_id = nil']
         def self.encode(reply_code, reply_text, class_id, method_id)
           channel = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [reply_code].pack(PACK_UINT16)
-          buffer << reply_text.to_s.bytesize.chr
-          buffer << reply_text.to_s
+          buffer << reply_text.bytesize.chr
+          buffer << reply_text
           buffer << [class_id].pack(PACK_UINT16)
           buffer << [method_id].pack(PACK_UINT16)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class CloseOk < Protocol::Method
@@ -573,36 +595,42 @@ module AMQ
         # []
         def self.encode()
           channel = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           MethodFrame.new(buffer, channel)
         end
+
       end
+
     end
 
     class Channel < Protocol::Class
       @name = "channel"
       @method_id = 20
 
+
+
       class Open < Protocol::Method
         @name = "channel.open"
         @method_id = 10
         @index = 0x0014000A # 20, 10, 1310730
         @packed_indexes = [20, 10].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["out_of_band = EMPTY_STRING"]
+        # [u'out_of_band = EMPTY_STRING']
         def self.encode(channel, out_of_band)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
-          buffer << out_of_band.to_s.bytesize.chr
-          buffer << out_of_band.to_s
+          buffer << out_of_band.bytesize.chr
+          buffer << out_of_band
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class OpenOk < Protocol::Method
@@ -629,6 +657,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Flow < Protocol::Method
@@ -656,15 +686,16 @@ module AMQ
         end
 
         # @return
-        # ["active = nil"]
+        # [u'active = nil']
         def self.encode(channel, active)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if active
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class FlowOk < Protocol::Method
@@ -692,15 +723,16 @@ module AMQ
         end
 
         # @return
-        # ["active = nil"]
+        # [u'active = nil']
         def self.encode(channel, active)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if active
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class Close < Protocol::Method
@@ -738,17 +770,18 @@ module AMQ
         end
 
         # @return
-        # ["reply_code = nil", "reply_text = EMPTY_STRING", "class_id = nil", "method_id = nil"]
+        # [u'reply_code = nil', u'reply_text = EMPTY_STRING', u'class_id = nil', u'method_id = nil']
         def self.encode(channel, reply_code, reply_text, class_id, method_id)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [reply_code].pack(PACK_UINT16)
-          buffer << reply_text.to_s.bytesize.chr
-          buffer << reply_text.to_s
+          buffer << reply_text.bytesize.chr
+          buffer << reply_text
           buffer << [class_id].pack(PACK_UINT16)
           buffer << [method_id].pack(PACK_UINT16)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class CloseOk < Protocol::Method
@@ -773,38 +806,43 @@ module AMQ
         # @return
         # []
         def self.encode(channel)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           MethodFrame.new(buffer, channel)
         end
+
       end
+
     end
 
     class Exchange < Protocol::Class
       @name = "exchange"
       @method_id = 40
 
+
+
       class Declare < Protocol::Method
         @name = "exchange.declare"
         @method_id = 10
         @index = 0x0028000A # 40, 10, 2621450
         @packed_indexes = [40, 10].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["ticket = 0", "exchange = nil", "type = "direct"", "passive = false", "durable = false", "auto_delete = false", "internal = false", "nowait = false", "arguments = {}"]
+        # [u'ticket = 0', u'exchange = nil', u"type = u'direct'", u'passive = false', u'durable = false', u'auto_delete = false', u'internal = false', u'nowait = false', u'arguments = {}']
         def self.encode(channel, exchange, type, passive, durable, auto_delete, internal, nowait, arguments)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << exchange.to_s.bytesize.chr
-          buffer << exchange.to_s
-          buffer << type.to_s.bytesize.chr
-          buffer << type.to_s
+          buffer << exchange.bytesize.chr
+          buffer << exchange
+          buffer << type.bytesize.chr
+          buffer << type
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if passive
           bit_buffer = bit_buffer | (1 << 1) if durable
@@ -815,6 +853,7 @@ module AMQ
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class DeclareOk < Protocol::Method
@@ -835,6 +874,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Delete < Protocol::Method
@@ -843,25 +884,27 @@ module AMQ
         @index = 0x00280014 # 40, 20, 2621460
         @packed_indexes = [40, 20].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["ticket = 0", "exchange = nil", "if_unused = false", "nowait = false"]
+        # [u'ticket = 0', u'exchange = nil', u'if_unused = false', u'nowait = false']
         def self.encode(channel, exchange, if_unused, nowait)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << exchange.to_s.bytesize.chr
-          buffer << exchange.to_s
+          buffer << exchange.bytesize.chr
+          buffer << exchange
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if if_unused
           bit_buffer = bit_buffer | (1 << 1) if nowait
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class DeleteOk < Protocol::Method
@@ -882,6 +925,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Bind < Protocol::Method
@@ -890,29 +935,31 @@ module AMQ
         @index = 0x0028001E # 40, 30, 2621470
         @packed_indexes = [40, 30].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["ticket = 0", "destination = nil", "source = nil", "routing_key = EMPTY_STRING", "nowait = false", "arguments = {}"]
+        # [u'ticket = 0', u'destination = nil', u'source = nil', u'routing_key = EMPTY_STRING', u'nowait = false', u'arguments = {}']
         def self.encode(channel, destination, source, routing_key, nowait, arguments)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << destination.to_s.bytesize.chr
-          buffer << destination.to_s
-          buffer << source.to_s.bytesize.chr
-          buffer << source.to_s
-          buffer << routing_key.to_s.bytesize.chr
-          buffer << routing_key.to_s
+          buffer << destination.bytesize.chr
+          buffer << destination
+          buffer << source.bytesize.chr
+          buffer << source
+          buffer << routing_key.bytesize.chr
+          buffer << routing_key
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if nowait
           buffer << [bit_buffer].pack(PACK_CHAR)
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class BindOk < Protocol::Method
@@ -933,6 +980,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Unbind < Protocol::Method
@@ -941,29 +990,31 @@ module AMQ
         @index = 0x00280028 # 40, 40, 2621480
         @packed_indexes = [40, 40].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["ticket = 0", "destination = nil", "source = nil", "routing_key = EMPTY_STRING", "nowait = false", "arguments = {}"]
+        # [u'ticket = 0', u'destination = nil', u'source = nil', u'routing_key = EMPTY_STRING', u'nowait = false', u'arguments = {}']
         def self.encode(channel, destination, source, routing_key, nowait, arguments)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << destination.to_s.bytesize.chr
-          buffer << destination.to_s
-          buffer << source.to_s.bytesize.chr
-          buffer << source.to_s
-          buffer << routing_key.to_s.bytesize.chr
-          buffer << routing_key.to_s
+          buffer << destination.bytesize.chr
+          buffer << destination
+          buffer << source.bytesize.chr
+          buffer << source
+          buffer << routing_key.bytesize.chr
+          buffer << routing_key
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if nowait
           buffer << [bit_buffer].pack(PACK_CHAR)
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class UnbindOk < Protocol::Method
@@ -984,32 +1035,38 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
+
     end
 
     class Queue < Protocol::Class
       @name = "queue"
       @method_id = 50
 
+
+
       class Declare < Protocol::Method
         @name = "queue.declare"
         @method_id = 10
         @index = 0x0032000A # 50, 10, 3276810
         @packed_indexes = [50, 10].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["ticket = 0", "queue = EMPTY_STRING", "passive = false", "durable = false", "exclusive = false", "auto_delete = false", "nowait = false", "arguments = {}"]
+        # [u'ticket = 0', u'queue = EMPTY_STRING', u'passive = false', u'durable = false', u'exclusive = false', u'auto_delete = false', u'nowait = false', u'arguments = {}']
         def self.encode(channel, queue, passive, durable, exclusive, auto_delete, nowait, arguments)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << queue.to_s.bytesize.chr
-          buffer << queue.to_s
+          buffer << queue.bytesize.chr
+          buffer << queue
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if passive
           bit_buffer = bit_buffer | (1 << 1) if durable
@@ -1020,6 +1077,7 @@ module AMQ
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class DeclareOk < Protocol::Method
@@ -1052,6 +1110,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Bind < Protocol::Method
@@ -1060,29 +1120,31 @@ module AMQ
         @index = 0x00320014 # 50, 20, 3276820
         @packed_indexes = [50, 20].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["ticket = 0", "queue = EMPTY_STRING", "exchange = nil", "routing_key = EMPTY_STRING", "nowait = false", "arguments = {}"]
+        # [u'ticket = 0', u'queue = EMPTY_STRING', u'exchange = nil', u'routing_key = EMPTY_STRING', u'nowait = false', u'arguments = {}']
         def self.encode(channel, queue, exchange, routing_key, nowait, arguments)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << queue.to_s.bytesize.chr
-          buffer << queue.to_s
-          buffer << exchange.to_s.bytesize.chr
-          buffer << exchange.to_s
-          buffer << routing_key.to_s.bytesize.chr
-          buffer << routing_key.to_s
+          buffer << queue.bytesize.chr
+          buffer << queue
+          buffer << exchange.bytesize.chr
+          buffer << exchange
+          buffer << routing_key.bytesize.chr
+          buffer << routing_key
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if nowait
           buffer << [bit_buffer].pack(PACK_CHAR)
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class BindOk < Protocol::Method
@@ -1103,6 +1165,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Purge < Protocol::Method
@@ -1111,24 +1175,26 @@ module AMQ
         @index = 0x0032001E # 50, 30, 3276830
         @packed_indexes = [50, 30].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["ticket = 0", "queue = EMPTY_STRING", "nowait = false"]
+        # [u'ticket = 0', u'queue = EMPTY_STRING', u'nowait = false']
         def self.encode(channel, queue, nowait)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << queue.to_s.bytesize.chr
-          buffer << queue.to_s
+          buffer << queue.bytesize.chr
+          buffer << queue
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if nowait
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class PurgeOk < Protocol::Method
@@ -1153,6 +1219,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Delete < Protocol::Method
@@ -1161,19 +1229,20 @@ module AMQ
         @index = 0x00320028 # 50, 40, 3276840
         @packed_indexes = [50, 40].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["ticket = 0", "queue = EMPTY_STRING", "if_unused = false", "if_empty = false", "nowait = false"]
+        # [u'ticket = 0', u'queue = EMPTY_STRING', u'if_unused = false', u'if_empty = false', u'nowait = false']
         def self.encode(channel, queue, if_unused, if_empty, nowait)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << queue.to_s.bytesize.chr
-          buffer << queue.to_s
+          buffer << queue.bytesize.chr
+          buffer << queue
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if if_unused
           bit_buffer = bit_buffer | (1 << 1) if if_empty
@@ -1181,6 +1250,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class DeleteOk < Protocol::Method
@@ -1205,6 +1275,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Unbind < Protocol::Method
@@ -1213,26 +1285,28 @@ module AMQ
         @index = 0x00320032 # 50, 50, 3276850
         @packed_indexes = [50, 50].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["ticket = 0", "queue = EMPTY_STRING", "exchange = nil", "routing_key = EMPTY_STRING", "arguments = {}"]
+        # [u'ticket = 0', u'queue = EMPTY_STRING', u'exchange = nil', u'routing_key = EMPTY_STRING', u'arguments = {}']
         def self.encode(channel, queue, exchange, routing_key, arguments)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << queue.to_s.bytesize.chr
-          buffer << queue.to_s
-          buffer << exchange.to_s.bytesize.chr
-          buffer << exchange.to_s
-          buffer << routing_key.to_s.bytesize.chr
-          buffer << routing_key.to_s
+          buffer << queue.bytesize.chr
+          buffer << queue
+          buffer << exchange.bytesize.chr
+          buffer << exchange
+          buffer << routing_key.bytesize.chr
+          buffer << routing_key
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class UnbindOk < Protocol::Method
@@ -1253,7 +1327,10 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
+
     end
 
     class Basic < Protocol::Class
@@ -1279,122 +1356,124 @@ module AMQ
 
       # 1 << 15
       def self.encode_content_type(value)
-        buffer = ""
-        buffer << value.to_s.bytesize.chr
-        buffer << value.to_s
+        buffer = ''
+        buffer << value.bytesize.chr
+        buffer << value
         [0, 0x8000, buffer]
       end
 
       # 1 << 14
       def self.encode_content_encoding(value)
-        buffer = ""
-        buffer << value.to_s.bytesize.chr
-        buffer << value.to_s
+        buffer = ''
+        buffer << value.bytesize.chr
+        buffer << value
         [1, 0x4000, buffer]
       end
 
       # 1 << 13
       def self.encode_headers(value)
-        buffer = ""
+        buffer = ''
         buffer << AMQ::Protocol::Table.encode(value)
         [2, 0x2000, buffer]
       end
 
       # 1 << 12
       def self.encode_delivery_mode(value)
-        buffer = ""
+        buffer = ''
         buffer << [value].pack(PACK_CHAR)
         [3, 0x1000, buffer]
       end
 
       # 1 << 11
       def self.encode_priority(value)
-        buffer = ""
+        buffer = ''
         buffer << [value].pack(PACK_CHAR)
         [4, 0x0800, buffer]
       end
 
       # 1 << 10
       def self.encode_correlation_id(value)
-        buffer = ""
-        buffer << value.to_s.bytesize.chr
-        buffer << value.to_s
+        buffer = ''
+        buffer << value.bytesize.chr
+        buffer << value
         [5, 0x0400, buffer]
       end
 
       # 1 << 9
       def self.encode_reply_to(value)
-        buffer = ""
-        buffer << value.to_s.bytesize.chr
-        buffer << value.to_s
+        buffer = ''
+        buffer << value.bytesize.chr
+        buffer << value
         [6, 0x0200, buffer]
       end
 
       # 1 << 8
       def self.encode_expiration(value)
-        buffer = ""
-        buffer << value.to_s.bytesize.chr
-        buffer << value.to_s
+        buffer = ''
+        buffer << value.bytesize.chr
+        buffer << value
         [7, 0x0100, buffer]
       end
 
       # 1 << 7
       def self.encode_message_id(value)
-        buffer = ""
-        buffer << value.to_s.bytesize.chr
-        buffer << value.to_s
+        buffer = ''
+        buffer << value.bytesize.chr
+        buffer << value
         [8, 0x0080, buffer]
       end
 
       # 1 << 6
       def self.encode_timestamp(value)
-        buffer = ""
+        buffer = ''
         buffer << AMQ::Hacks.pack_64_big_endian(value)
         [9, 0x0040, buffer]
       end
 
       # 1 << 5
       def self.encode_type(value)
-        buffer = ""
-        buffer << value.to_s.bytesize.chr
-        buffer << value.to_s
+        buffer = ''
+        buffer << value.bytesize.chr
+        buffer << value
         [10, 0x0020, buffer]
       end
 
       # 1 << 4
       def self.encode_user_id(value)
-        buffer = ""
-        buffer << value.to_s.bytesize.chr
-        buffer << value.to_s
+        buffer = ''
+        buffer << value.bytesize.chr
+        buffer << value
         [11, 0x0010, buffer]
       end
 
       # 1 << 3
       def self.encode_app_id(value)
-        buffer = ""
-        buffer << value.to_s.bytesize.chr
-        buffer << value.to_s
+        buffer = ''
+        buffer << value.bytesize.chr
+        buffer << value
         [12, 0x0008, buffer]
       end
 
       # 1 << 2
       def self.encode_cluster_id(value)
-        buffer = ""
-        buffer << value.to_s.bytesize.chr
-        buffer << value.to_s
+        buffer = ''
+        buffer << value.bytesize.chr
+        buffer << value
         [13, 0x0004, buffer]
       end
 
+
+
       def self.encode_properties(body_size, properties)
         pieces, flags = [], 0
 
-        properties.reject {|key, value| value.nil?}.each do |key, value|
-          i, f, result = self.__send__(:"encode_#{key}", value)
+        properties.each do |key, value|
+          i, f, result = self.send(:"encode_#{key}", value)
           flags |= f
           pieces[i] = result
         end
 
-        # result = [60, 0, body_size, flags].pack("n2Qn")
+        # result = [60, 0, body_size, flags].pack('n2Qn')
         result = [60, 0].pack(PACK_UINT16_X2)
         result += AMQ::Hacks.pack_64_big_endian(body_size)
         result += [flags].pack(PACK_UINT16)
@@ -1436,7 +1515,7 @@ module AMQ
         0x0004 => :shortstr,
       }
 
-      # Hash doesn"t give any guarantees on keys order, we will do it in a
+      # Hash doesn't give any guarantees on keys order, we will do it in a
       # straightforward way
       DECODE_PROPERTIES_KEYS = [
         0x8000,
@@ -1494,14 +1573,15 @@ module AMQ
         @index = 0x003C000A # 60, 10, 3932170
         @packed_indexes = [60, 10].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["prefetch_size = false", "prefetch_count = false", "global = false"]
+        # [u'prefetch_size = false', u'prefetch_count = false', u'global = false']
         def self.encode(channel, prefetch_size, prefetch_count, global)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [prefetch_size].pack(PACK_UINT32)
           buffer << [prefetch_count].pack(PACK_UINT16)
@@ -1510,6 +1590,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class QosOk < Protocol::Method
@@ -1530,6 +1611,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Consume < Protocol::Method
@@ -1538,21 +1621,22 @@ module AMQ
         @index = 0x003C0014 # 60, 20, 3932180
         @packed_indexes = [60, 20].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["ticket = 0", "queue = EMPTY_STRING", "consumer_tag = EMPTY_STRING", "no_local = false", "no_ack = false", "exclusive = false", "nowait = false", "arguments = {}"]
+        # [u'ticket = 0', u'queue = EMPTY_STRING', u'consumer_tag = EMPTY_STRING', u'no_local = false', u'no_ack = false', u'exclusive = false', u'nowait = false', u'arguments = {}']
         def self.encode(channel, queue, consumer_tag, no_local, no_ack, exclusive, nowait, arguments)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << queue.to_s.bytesize.chr
-          buffer << queue.to_s
-          buffer << consumer_tag.to_s.bytesize.chr
-          buffer << consumer_tag.to_s
+          buffer << queue.bytesize.chr
+          buffer << queue
+          buffer << consumer_tag.bytesize.chr
+          buffer << consumer_tag
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if no_local
           bit_buffer = bit_buffer | (1 << 1) if no_ack
@@ -1562,6 +1646,7 @@ module AMQ
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class ConsumeOk < Protocol::Method
@@ -1588,6 +1673,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Cancel < Protocol::Method
@@ -1596,41 +1683,24 @@ module AMQ
         @index = 0x003C001E # 60, 30, 3932190
         @packed_indexes = [60, 30].pack(PACK_UINT16_X2).freeze
 
-        # @return
-        def self.decode(data)
-          offset = 0
-          length = data[offset, 1].unpack(PACK_CHAR).first
-          offset += 1
-          consumer_tag = data[offset, length]
-          offset += length
-          bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
-          offset += 1
-          nowait = (bit_buffer & (1 << 0)) != 0
-          self.new(consumer_tag, nowait)
-        end
-
-        attr_reader :consumer_tag, :nowait
-        def initialize(consumer_tag, nowait)
-          @consumer_tag = consumer_tag
-          @nowait = nowait
-        end
 
         def self.has_content?
           false
         end
 
         # @return
-        # ["consumer_tag = nil", "nowait = false"]
+        # [u'consumer_tag = nil', u'nowait = false']
         def self.encode(channel, consumer_tag, nowait)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
-          buffer << consumer_tag.to_s.bytesize.chr
-          buffer << consumer_tag.to_s
+          buffer << consumer_tag.bytesize.chr
+          buffer << consumer_tag
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if nowait
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class CancelOk < Protocol::Method
@@ -1657,6 +1727,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Publish < Protocol::Method
@@ -1665,21 +1737,22 @@ module AMQ
         @index = 0x003C0028 # 60, 40, 3932200
         @packed_indexes = [60, 40].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           true
         end
 
         # @return
-        # ["ticket = 0", "exchange = EMPTY_STRING", "routing_key = EMPTY_STRING", "mandatory = false", "immediate = false", "user_headers = nil", "payload = """, "frame_size = nil"]
+        # [u'ticket = 0', u'exchange = EMPTY_STRING', u'routing_key = EMPTY_STRING', u'mandatory = false', u'immediate = false', 'user_headers = nil', 'payload = ""', 'frame_size = nil']
         def self.encode(channel, payload, user_headers, exchange, routing_key, mandatory, immediate, frame_size)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << exchange.to_s.bytesize.chr
-          buffer << exchange.to_s
-          buffer << routing_key.to_s.bytesize.chr
-          buffer << routing_key.to_s
+          buffer << exchange.bytesize.chr
+          buffer << exchange
+          buffer << routing_key.bytesize.chr
+          buffer << routing_key
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if mandatory
           bit_buffer = bit_buffer | (1 << 1) if immediate
@@ -1694,6 +1767,7 @@ module AMQ
           frames << HeaderFrame.new(properties_payload, channel)
           frames + self.encode_body(payload, channel, frame_size)
         end
+
       end
 
       class Return < Protocol::Method
@@ -1733,6 +1807,8 @@ module AMQ
         def self.has_content?
           true
         end
+
+
       end
 
       class Deliver < Protocol::Method
@@ -1776,6 +1852,8 @@ module AMQ
         def self.has_content?
           true
         end
+
+
       end
 
       class Get < Protocol::Method
@@ -1784,24 +1862,26 @@ module AMQ
         @index = 0x003C0046 # 60, 70, 3932230
         @packed_indexes = [60, 70].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["ticket = 0", "queue = EMPTY_STRING", "no_ack = false"]
+        # [u'ticket = 0', u'queue = EMPTY_STRING', u'no_ack = false']
         def self.encode(channel, queue, no_ack)
           ticket = 0
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << [ticket].pack(PACK_UINT16)
-          buffer << queue.to_s.bytesize.chr
-          buffer << queue.to_s
+          buffer << queue.bytesize.chr
+          buffer << queue
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if no_ack
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class GetOk < Protocol::Method
@@ -1843,6 +1923,8 @@ module AMQ
         def self.has_content?
           true
         end
+
+
       end
 
       class GetEmpty < Protocol::Method
@@ -1869,6 +1951,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Ack < Protocol::Method
@@ -1899,9 +1983,9 @@ module AMQ
         end
 
         # @return
-        # ["delivery_tag = false", "multiple = false"]
+        # [u'delivery_tag = false', u'multiple = false']
         def self.encode(channel, delivery_tag, multiple)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << AMQ::Hacks.pack_64_big_endian(delivery_tag)
           bit_buffer = 0
@@ -1909,6 +1993,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class Reject < Protocol::Method
@@ -1917,14 +2002,15 @@ module AMQ
         @index = 0x003C005A # 60, 90, 3932250
         @packed_indexes = [60, 90].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["delivery_tag = nil", "requeue = true"]
+        # [u'delivery_tag = nil', u'requeue = true']
         def self.encode(channel, delivery_tag, requeue)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << AMQ::Hacks.pack_64_big_endian(delivery_tag)
           bit_buffer = 0
@@ -1932,6 +2018,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class RecoverAsync < Protocol::Method
@@ -1940,20 +2027,22 @@ module AMQ
         @index = 0x003C0064 # 60, 100, 3932260
         @packed_indexes = [60, 100].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["requeue = false"]
+        # [u'requeue = false']
         def self.encode(channel, requeue)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if requeue
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class Recover < Protocol::Method
@@ -1962,20 +2051,22 @@ module AMQ
         @index = 0x003C006E # 60, 110, 3932270
         @packed_indexes = [60, 110].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
 
         # @return
-        # ["requeue = false"]
+        # [u'requeue = false']
         def self.encode(channel, requeue)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if requeue
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class RecoverOk < Protocol::Method
@@ -1996,6 +2087,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Nack < Protocol::Method
@@ -2028,9 +2121,9 @@ module AMQ
         end
 
         # @return
-        # ["delivery_tag = false", "multiple = false", "requeue = true"]
+        # [u'delivery_tag = false', u'multiple = false', u'requeue = true']
         def self.encode(channel, delivery_tag, multiple, requeue)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           buffer << AMQ::Hacks.pack_64_big_endian(delivery_tag)
           bit_buffer = 0
@@ -2039,19 +2132,24 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
+
     end
 
     class Tx < Protocol::Class
       @name = "tx"
       @method_id = 90
 
+
+
       class Select < Protocol::Method
         @name = "tx.select"
         @method_id = 10
         @index = 0x005A000A # 90, 10, 5898250
         @packed_indexes = [90, 10].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
@@ -2059,10 +2157,11 @@ module AMQ
         # @return
         # []
         def self.encode(channel)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class SelectOk < Protocol::Method
@@ -2083,6 +2182,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Commit < Protocol::Method
@@ -2091,6 +2192,7 @@ module AMQ
         @index = 0x005A0014 # 90, 20, 5898260
         @packed_indexes = [90, 20].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
@@ -2098,10 +2200,11 @@ module AMQ
         # @return
         # []
         def self.encode(channel)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class CommitOk < Protocol::Method
@@ -2122,6 +2225,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Rollback < Protocol::Method
@@ -2130,6 +2235,7 @@ module AMQ
         @index = 0x005A001E # 90, 30, 5898270
         @packed_indexes = [90, 30].pack(PACK_UINT16_X2).freeze
 
+
         def self.has_content?
           false
         end
@@ -2137,10 +2243,11 @@ module AMQ
         # @return
         # []
         def self.encode(channel)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class RollbackOk < Protocol::Method
@@ -2161,13 +2268,18 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
+
     end
 
     class Confirm < Protocol::Class
       @name = "confirm"
       @method_id = 85
 
+
+
       class Select < Protocol::Method
         @name = "confirm.select"
         @method_id = 10
@@ -2193,15 +2305,16 @@ module AMQ
         end
 
         # @return
-        # ["nowait = false"]
+        # [u'nowait = false']
         def self.encode(channel, nowait)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if nowait
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class SelectOk < Protocol::Method
@@ -2226,13 +2339,16 @@ module AMQ
         # @return
         # []
         def self.encode(channel)
-          buffer = ""
+          buffer = ''
           buffer << @packed_indexes
           MethodFrame.new(buffer, channel)
         end
+
       end
+
     end
 
+
     METHODS = begin
       Method.methods.inject(Hash.new) do |hash, klass|
         hash.merge!(klass.index => klass)
@@ -2240,3 +2356,4 @@ module AMQ
     end
   end
 end
+