amq-protocol 1.0.0.pre7 → 1.0.0

data/.gitmodules

@@ -1,3 +1,3 @@
-[submodule "vendor/rabbitmq-codegen"]
-	path = vendor/rabbitmq-codegen
+[submodule "codegen/rabbitmq-codegen"]
+	path = codegen/rabbitmq-codegen
 	url = git://github.com/rabbitmq/rabbitmq-codegen.git

data/ChangeLog.md

@@ -0,0 +1,23 @@
+## Changes between 1.0.0.pre6 and 1.0.0.pre7
+
+### AMQ::Settings
+
+`AMQ::Settings` extracts settings merging logic and AMQP/AMQPS URI parsing from `amq-client`.
+Parsing follows the same convention amqp gem and RabbitMQ Java client follow.
+
+Examples:
+
+``` ruby
+AMQ::Settings.parse_amqp_url("amqp://dev.rabbitmq.com")            # => vhost is nil, so default (/) will be used
+AMQ::Settings.parse_amqp_url("amqp://dev.rabbitmq.com/")           # => vhost is an empty string
+AMQ::Settings.parse_amqp_url("amqp://dev.rabbitmq.com/%2Fvault")   # => vhost is /vault
+AMQ::Settings.parse_amqp_url("amqp://dev.rabbitmq.com/production") # => vhost is production
+AMQ::Settings.parse_amqp_url("amqp://dev.rabbitmq.com/a.b.c")      # => vhost is a.b.c
+AMQ::Settings.parse_amqp_url("amqp://dev.rabbitmq.com/foo/bar")    # => ArgumentError
+```
+
+
+### AMQ::Protocol::TLS_PORT
+
+`AMQ::Protocol::TLS_PORT` is a new constant that contains default AMQPS 0.9.1 port,
+5671.

data/LICENSE

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

data/README.md

@@ -2,11 +2,9 @@
 
 amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not an
 AMQP client: amq-protocol only handles serialization and deserialization.
-If you want to write your own AMQP client, this gem can help you with that.
 
-## How does amq-protocol relate to amqp gem, amq-client and libraries like bunny?
-
-See [this page about AMQP gems family](https://github.com/ruby-amqp/amq-client/blob/master/README.textile)
+If you want to write your own AMQP client, this gem will handle all the serialization
+needs for you, including RabbitMQ extensions to AMQP 0.9.1.
 
 
 ## Installation
@@ -23,11 +21,11 @@ Make sure you have Python, pip and the mako templating package installed:
 amq-protocol uses RabbitMQ protocol code generation library that is in Python, so there is some
 Python involved in the build.
 
-To regenerate `lib/amq/protocol/client.rb` from the source (`protocol.rb.pytemplate`), run
+To regenerate `lib/amq/protocol/client.rb` from the source (`codegen/*` files), run
 
     ./generate.rb
 
-To make changes, **do not edit client.rb directly**. Instead, edit `protocol.rb.pytemplate` and regenerate.
+To make changes, **do not edit client.rb directly**. Instead, edit the `codegen/protocol.rb.pytemplate` and regenerate.
 
 To run tests, use
 
@@ -40,8 +38,21 @@ To run tests, use
 amq-protocol is maintained by [Michael Klishin](https://github.com/michaelklishin).
 
 
-## Links
+## CI Status
+
+[![Build Status](https://secure.travis-ci.org/ruby-amqp/amq-protocol.png)](https://travis-ci.org/ruby-amqp/amq-protocol)
+
+
+## Development
+
+Please report any issues you may find to our [Issue tracker](http://github.com/ruby-amqp/amq-protocol/issues) on GitHub.
+
+
+## Mailing List
+
+Any questions you may have should be sent to the [Ruby AMQP mailing list](http://groups.google.com/group/ruby-amqp).
+
+
+## License
 
- * [Continous integration server](http://travis-ci.org/#!/ruby-amqp/amq-protocol)
- * [Ruby AMQP mailing list](http://groups.google.com/group/ruby-amqp)
- * [Issue tracker](http://github.com/ruby-amqp/amq-protocol/issues)
+MIT (see LICENSE in the repository root).

data/{codegen.py → codegen/codegen.py}

@@ -6,7 +6,7 @@
 
 import os, sys, re
 
-sys.path.append(os.path.join("vendor", "rabbitmq-codegen"))
+sys.path.append(os.path.join("codegen", "rabbitmq-codegen"))
 
 from amqp_codegen import *
 try:
@@ -61,7 +61,7 @@ AmqpEntity.__init__ = new_init
 
 # method.accepted_by("server")
 # method.accepted_by("client", "server")
-accepted_by_update = json.loads(file("amqp_0.9.1_changes.json").read())
+accepted_by_update = json.loads(file("codegen/amqp_0.9.1_changes.json").read())
 
 def accepted_by(self, *receivers):
     def get_accepted_by(self):
@@ -147,7 +147,7 @@ def generateMain(type):
     def main(json_spec_path):
         spec = AmqpSpecObject(json_spec_path)
         spec.type = type
-        print render("protocol.rb.pytemplate", spec = spec)
+        print render("codegen/protocol.rb.pytemplate", spec = spec)
 
     return main
 

data/{protocol.rb.pytemplate → codegen/protocol.rb.pytemplate}

@@ -2,8 +2,8 @@
 # encoding: binary
 
 # THIS IS AN AUTOGENERATED FILE, DO NOT MODIFY
-# IT DIRECTLY ! FOR CHANGES, PLEASE UPDATE CODEGEN.PY
-# IN THE ROOT DIRECTORY OF THE AMQ-PROTOCOL REPOSITORY.<% import codegen_helpers as helpers %><% import re, os, codegen %>
+# IT DIRECTLY ! FOR CHANGES, PLEASE UPDATE FILES
+# IN THE ./codegen DIRECTORY OF THE AMQ-PROTOCOL REPOSITORY.<% import codegen_helpers as helpers %><% import re, os, codegen %>
 
 require "amq/protocol/table"
 require "amq/protocol/frame"
@@ -14,6 +14,8 @@ module AMQ
     PROTOCOL_VERSION = "${spec.major}.${spec.minor}.${spec.revision}".freeze
     PREAMBLE         = "${'AMQP\\x00\\x%02x\\x%02x\\x%02x' % (spec.major, spec.minor, spec.revision)}".freeze
     DEFAULT_PORT     = ${spec.port}
+    TLS_PORT         = 5671
+    SSL_PORT         = 5671
 
     # caching
     EMPTY_STRING = "".freeze

data/generate.rb

@@ -5,14 +5,14 @@ def sh(*args)
   system(*args)
 end
 
-spec = "vendor/rabbitmq-codegen/amqp-rabbitmq-0.9.1.json"
+spec = "codegen/rabbitmq-codegen/amqp-rabbitmq-0.9.1.json"
 unless File.exist?(spec)
   sh "git submodule update --init"
 end
 
 path = "lib/amq/protocol/client.rb"
-sh "./codegen.py client #{spec} #{path}"
+puts "Running ./codegen/codegen.py client #{spec} #{path}"
+sh "./codegen/codegen.py client #{spec} #{path}"
 if File.file?(path)
-  sh "./post-processing.rb #{path}"
   sh "ruby -c #{path}"
 end

data/lib/amq/protocol/client.rb

@@ -1,8 +1,8 @@
 # encoding: binary
 
 # THIS IS AN AUTOGENERATED FILE, DO NOT MODIFY
-# IT DIRECTLY ! FOR CHANGES, PLEASE UPDATE CODEGEN.PY
-# IN THE ROOT DIRECTORY OF THE AMQ-PROTOCOL REPOSITORY.
+# IT DIRECTLY ! FOR CHANGES, PLEASE UPDATE FILES
+# IN THE ./codegen DIRECTORY OF THE AMQ-PROTOCOL REPOSITORY.
 
 require "amq/protocol/table"
 require "amq/protocol/frame"
@@ -13,21 +13,25 @@ module AMQ
     PROTOCOL_VERSION = "0.9.1".freeze
     PREAMBLE         = "AMQP\x00\x00\x09\x01".freeze
     DEFAULT_PORT     = 5672
+    TLS_PORT         = 5671
+    SSL_PORT         = 5671
 
     # 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_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_32BIT_FLOAT        = "f".freeze
-    PACK_64BIT_FLOAT        = "d".freeze
 
     # @return [Array] Collection of subclasses of AMQ::Protocol::Class.
     def self.classes
@@ -168,8 +172,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 +182,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 +282,8 @@ module AMQ
       @name = "connection"
       @method_id = 10
 
+
+
       class Start < Protocol::Method
         @name = "connection.start"
         @method_id = 10
@@ -316,6 +323,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class StartOk < Protocol::Method
@@ -324,15 +333,16 @@ 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
@@ -343,6 +353,7 @@ module AMQ
           buffer << locale.to_s
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class Secure < Protocol::Method
@@ -369,6 +380,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class SecureOk < Protocol::Method
@@ -377,20 +390,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
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class Tune < Protocol::Method
@@ -421,6 +436,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class TuneOk < Protocol::Method
@@ -429,21 +446,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,17 +471,18 @@ 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
@@ -473,6 +493,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class OpenOk < Protocol::Method
@@ -499,6 +520,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Close < Protocol::Method
@@ -536,10 +559,10 @@ 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
@@ -548,6 +571,7 @@ module AMQ
           buffer << [method_id].pack(PACK_UINT16)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class CloseOk < Protocol::Method
@@ -573,36 +597,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
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class OpenOk < Protocol::Method
@@ -629,6 +659,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Flow < Protocol::Method
@@ -656,15 +688,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 +725,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,9 +772,9 @@ 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
@@ -749,6 +783,7 @@ module AMQ
           buffer << [method_id].pack(PACK_UINT16)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class CloseOk < Protocol::Method
@@ -773,32 +808,37 @@ 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
@@ -815,6 +855,7 @@ module AMQ
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class DeclareOk < Protocol::Method
@@ -835,6 +876,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Delete < Protocol::Method
@@ -843,15 +886,16 @@ 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
@@ -862,6 +906,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class DeleteOk < Protocol::Method
@@ -882,6 +927,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Bind < Protocol::Method
@@ -890,15 +937,16 @@ 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
@@ -913,6 +961,7 @@ module AMQ
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class BindOk < Protocol::Method
@@ -933,6 +982,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Unbind < Protocol::Method
@@ -941,15 +992,16 @@ 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
@@ -964,6 +1016,7 @@ module AMQ
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class UnbindOk < Protocol::Method
@@ -984,28 +1037,34 @@ 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
@@ -1020,6 +1079,7 @@ module AMQ
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class DeclareOk < Protocol::Method
@@ -1052,6 +1112,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Bind < Protocol::Method
@@ -1060,15 +1122,16 @@ 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
@@ -1083,6 +1146,7 @@ module AMQ
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class BindOk < Protocol::Method
@@ -1103,6 +1167,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Purge < Protocol::Method
@@ -1111,15 +1177,16 @@ 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
@@ -1129,6 +1196,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class PurgeOk < Protocol::Method
@@ -1153,6 +1221,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Delete < Protocol::Method
@@ -1161,15 +1231,16 @@ 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
@@ -1181,6 +1252,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class DeleteOk < Protocol::Method
@@ -1205,6 +1277,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Unbind < Protocol::Method
@@ -1213,15 +1287,16 @@ 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
@@ -1233,6 +1308,7 @@ module AMQ
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class UnbindOk < Protocol::Method
@@ -1253,7 +1329,10 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
+
     end
 
     class Basic < Protocol::Class
@@ -1279,7 +1358,7 @@ module AMQ
 
       # 1 << 15
       def self.encode_content_type(value)
-        buffer = ""
+        buffer = ''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [0, 0x8000, buffer]
@@ -1287,7 +1366,7 @@ module AMQ
 
       # 1 << 14
       def self.encode_content_encoding(value)
-        buffer = ""
+        buffer = ''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [1, 0x4000, buffer]
@@ -1295,28 +1374,28 @@ module AMQ
 
       # 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 = ''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [5, 0x0400, buffer]
@@ -1324,7 +1403,7 @@ module AMQ
 
       # 1 << 9
       def self.encode_reply_to(value)
-        buffer = ""
+        buffer = ''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [6, 0x0200, buffer]
@@ -1332,7 +1411,7 @@ module AMQ
 
       # 1 << 8
       def self.encode_expiration(value)
-        buffer = ""
+        buffer = ''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [7, 0x0100, buffer]
@@ -1340,7 +1419,7 @@ module AMQ
 
       # 1 << 7
       def self.encode_message_id(value)
-        buffer = ""
+        buffer = ''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [8, 0x0080, buffer]
@@ -1348,14 +1427,14 @@ module AMQ
 
       # 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 = ''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [10, 0x0020, buffer]
@@ -1363,7 +1442,7 @@ module AMQ
 
       # 1 << 4
       def self.encode_user_id(value)
-        buffer = ""
+        buffer = ''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [11, 0x0010, buffer]
@@ -1371,7 +1450,7 @@ module AMQ
 
       # 1 << 3
       def self.encode_app_id(value)
-        buffer = ""
+        buffer = ''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [12, 0x0008, buffer]
@@ -1379,12 +1458,14 @@ module AMQ
 
       # 1 << 2
       def self.encode_cluster_id(value)
-        buffer = ""
+        buffer = ''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [13, 0x0004, buffer]
       end
 
+
+
       def self.encode_properties(body_size, properties)
         pieces, flags = [], 0
 
@@ -1394,7 +1475,7 @@ module AMQ
           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 +1517,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 +1575,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 +1592,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class QosOk < Protocol::Method
@@ -1530,6 +1613,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Consume < Protocol::Method
@@ -1538,15 +1623,16 @@ 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
@@ -1562,6 +1648,7 @@ module AMQ
           buffer << AMQ::Protocol::Table.encode(arguments)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class ConsumeOk < Protocol::Method
@@ -1588,6 +1675,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Cancel < Protocol::Method
@@ -1620,9 +1709,9 @@ module AMQ
         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
@@ -1631,6 +1720,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class CancelOk < Protocol::Method
@@ -1657,6 +1747,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Publish < Protocol::Method
@@ -1665,15 +1757,16 @@ 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
@@ -1694,6 +1787,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 +1827,8 @@ module AMQ
         def self.has_content?
           true
         end
+
+
       end
 
       class Deliver < Protocol::Method
@@ -1776,6 +1872,8 @@ module AMQ
         def self.has_content?
           true
         end
+
+
       end
 
       class Get < Protocol::Method
@@ -1784,15 +1882,16 @@ 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
@@ -1802,6 +1901,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class GetOk < Protocol::Method
@@ -1843,6 +1943,8 @@ module AMQ
         def self.has_content?
           true
         end
+
+
       end
 
       class GetEmpty < Protocol::Method
@@ -1869,6 +1971,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Ack < Protocol::Method
@@ -1899,9 +2003,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 +2013,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class Reject < Protocol::Method
@@ -1917,14 +2022,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 +2038,7 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           MethodFrame.new(buffer, channel)
         end
+
       end
 
       class RecoverAsync < Protocol::Method
@@ -1940,20 +2047,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 +2071,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 +2107,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Nack < Protocol::Method
@@ -2028,9 +2141,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 +2152,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 +2177,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 +2202,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Commit < Protocol::Method
@@ -2091,6 +2212,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 +2220,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 +2245,8 @@ module AMQ
         def self.has_content?
           false
         end
+
+
       end
 
       class Rollback < Protocol::Method
@@ -2130,6 +2255,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 +2263,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 +2288,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 +2325,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 +2359,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 +2376,4 @@ module AMQ
     end
   end
 end
+