amq-protocol 1.5.0 → 1.6.0

data/.gitignore

@@ -12,3 +12,4 @@ Gemfile.lock
 .bundle/*
 bin/*
 *.bundle
+Makefile

data/Gemfile

@@ -4,7 +4,9 @@ source "https://rubygems.org"
 
 group :development do
   # excludes Windows, Rubinius and JRuby
-  gem "perftools.rb", :platform => :mri_18
+  gem "ruby-prof", :platform => :mri
+
+  gem "rake"
 end
 
 group :test do

data/Rakefile

@@ -0,0 +1,55 @@
+require "bundler"
+Bundler.setup
+
+require "rake"
+require "rspec/core/rake_task"
+
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "amq/protocol/version"
+
+task :gem => :build
+task :build do
+  system "gem build amq-protocol.gemspec"
+end
+
+task :install => :build do
+  system "gem install amq-protocol-#{AMQ::Protocol::VERSION}.gem"
+end
+
+def extension
+  RUBY_PLATFORM =~ /darwin/ ? "bundle" : "so"
+end
+
+def compile!
+  puts "Compiling native extensions..."
+  Dir.chdir(Pathname(__FILE__).dirname + "ext/") do
+    `bundle exec ruby extconf.rb`
+    `make`
+    `cp client.#{extension} ../lib/amq/protocol/native/`
+  end
+end
+
+RSpec::Core::RakeTask.new("spec") do |spec|
+  spec.pattern = "spec/**/*_spec.rb"
+end
+
+RSpec::Core::RakeTask.new("clean_spec") do |spec|
+  spec.pattern = "spec/**/*_spec.rb"
+end
+
+task :compile do
+  compile!
+end
+
+task :clean do
+  puts "Cleaning out native extensions..."
+  begin
+    Dir.chdir(Pathname(__FILE__).dirname + "lib/amq-protocol/native") do
+      `rm client.#{extension}`
+    end
+  rescue Exception => e
+    puts e.message
+  end
+end
+
+task :default => [:compile, :spec, :clean, :clean_spec]

data/benchmarks/pure/body_framing_with_256k_payload.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib"))
+
+require "amq/protocol/client"
+require "benchmark"
+
+FRAME_SIZE = 128 * 1024
+
+puts
+puts "-" * 80
+puts "Benchmarking on #{RUBY_DESCRIPTION}"
+
+n = 250_000
+
+# warm up the JIT, etc
+puts "Doing a warmup run..."
+15_000.times { AMQ::Protocol::Method.encode_body("a" * 256 * 1024, 1, FRAME_SIZE) }
+
+t  = Benchmark.realtime do
+  n.times { AMQ::Protocol::Method.encode_body("a" * 256 * 1024, 1, FRAME_SIZE) }
+end
+r  = (n.to_f/t.to_f)
+
+puts "AMQ::Protocol::Method.encode_body rate: #{(r / 1000).round(2)} KGHz"
+puts
+puts "-" * 80

data/benchmarks/pure/body_framing_with_2k_payload.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib"))
+
+require "amq/protocol/client"
+require "benchmark"
+
+FRAME_SIZE = 128 * 1024
+
+puts
+puts "-" * 80
+puts "Benchmarking on #{RUBY_DESCRIPTION}"
+
+n = 250_000
+
+# warm up the JIT, etc
+puts "Doing a warmup run..."
+15_000.times { AMQ::Protocol::Method.encode_body("ab" * 1024, 1, FRAME_SIZE) }
+
+t  = Benchmark.realtime do
+  n.times { AMQ::Protocol::Method.encode_body("ab" * 1024, 1, FRAME_SIZE) }
+end
+r  = (n.to_f/t.to_f)
+
+puts "AMQ::Protocol::Method.encode_body rate: #{(r / 1000).round(2)} KGHz"
+puts
+puts "-" * 80

data/codegen/codegen_helpers.py

@@ -16,9 +16,9 @@ def genSingleEncode(spec, cValue, unresolved_domain):
     elif type == 'long':
         buffer.append("buffer << [%s].pack(PACK_UINT32)" % (cValue,))
     elif type == 'longlong':
-        buffer.append("buffer << AMQ::Hacks.pack_uint64_big_endian(%s)" % (cValue,))
+        buffer.append("buffer << AMQ::Pack.pack_uint64_big_endian(%s)" % (cValue,))
     elif type == 'timestamp':
-        buffer.append("buffer << AMQ::Hacks.pack_uint64_big_endian(%s)" % (cValue,))
+        buffer.append("buffer << AMQ::Pack.pack_uint64_big_endian(%s)" % (cValue,))
     elif type == 'bit':
         raise "Can't encode bit in genSingleEncode"
     elif type == 'table':
@@ -58,7 +58,7 @@ def genSingleDecode(spec, field):
         buffer.append("%s = data[offset, 4].unpack(PACK_UINT32).first" % (cLvalue,))
         buffer.append("offset += 4")
     elif type == 'longlong':
-        buffer.append("%s = AMQ::Hacks.unpack_uint64_big_endian(data[offset, 8]).first" % (cLvalue,))
+        buffer.append("%s = AMQ::Pack.unpack_uint64_big_endian(data[offset, 8]).first" % (cLvalue,))
         buffer.append("offset += 8")
     elif type == 'timestamp':
         buffer.append("%s = data[offset, 8].unpack(PACK_UINT32_X2).first" % (cLvalue,))
@@ -97,7 +97,7 @@ def genSingleSimpleDecode(spec, field):
     elif type == 'long':
         buffer.append("data.unpack(PACK_UINT32).first")
     elif type == 'longlong':
-        buffer.append("AMQ::Hacks.unpack_uint64_big_endian(data).first")
+        buffer.append("AMQ::Pack.unpack_uint64_big_endian(data).first")
     elif type == 'timestamp':
         buffer.append("Time.at(data.unpack(PACK_UINT32_X2).last)")
     elif type == 'bit':

data/codegen/protocol.rb.pytemplate

@@ -5,35 +5,19 @@
 # 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/pack"
+
 require "amq/protocol/table"
 require "amq/protocol/frame"
-require "amq/hacks"
+
+require "amq/protocol/constants"
+require "amq/protocol/exceptions"
 
 module AMQ
   module Protocol
     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
-
-    PACK_INT8               = 'c'.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        = 'G'.freeze
-
-
 
     # @return [Array] Collection of subclasses of AMQ::Protocol::Class.
     def self.classes
@@ -45,63 +29,6 @@ module AMQ
       Protocol::Method.methods
     end
 
-    class Error < StandardError
-      DEFAULT_MESSAGE = "AMQP error".freeze
-
-      def self.inherited(subclass)
-        @_subclasses ||= []
-        @_subclasses << subclass
-      end # self.inherited(subclazz)
-
-      def self.subclasses_with_values
-        @_subclasses.select{ |k| defined?(k::VALUE) }
-      end # self.subclasses_with_values
-
-      def self.[](code)
-        if result = subclasses_with_values.detect { |klass| klass::VALUE == code }
-          result
-        else
-          raise "No such exception class for code #{code}" unless result
-        end # if
-      end # self.[]
-
-      def initialize(message = self.class::DEFAULT_MESSAGE)
-        super(message)
-      end
-    end
-
-    class FrameTypeError < Protocol::Error
-      def initialize(types)
-        super("Must be one of #{types.inspect}")
-      end
-    end
-
-    class EmptyResponseError < Protocol::Error
-      DEFAULT_MESSAGE = "Empty response received from the server."
-
-      def initialize(message = self.class::DEFAULT_MESSAGE)
-        super(message)
-      end
-    end
-
-    class BadResponseError < Protocol::Error
-      def initialize(argument, expected, actual)
-        super("Argument #{argument} has to be #{expected.inspect}, was #{data.inspect}")
-      end
-    end
-
-    class SoftError < Protocol::Error
-      def self.inherited(subclass)
-        Error.inherited(subclass)
-      end # self.inherited(subclass)
-    end
-
-    class HardError < Protocol::Error
-      def self.inherited(subclass)
-        Error.inherited(subclass)
-      end # self.inherited(subclass)
-    end
-
     % for tuple in spec.constants:
     % if tuple[2] == "soft-error" or tuple[2] == "hard-error":
     class ${codegen.to_ruby_class_name(tuple[0])} < ${codegen.to_ruby_class_name(tuple[2])}
@@ -111,21 +38,6 @@ module AMQ
     % endif
     % endfor
 
-    # 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
-    # really badly, which is another good reason for
-    # 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
-    # considering to have just a bunch of methods, but
-    # 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
       @classes = Array.new
 
@@ -195,6 +107,7 @@ module AMQ
         # 4 bytes of frame payload length
         # 1 byte of payload trailer FRAME_END byte
         limit        = frame_size - 8
+        return [BodyFrame.new(body, channel)] if body.bytesize < limit
 
         # Otherwise String#slice on 1.9 will operate with code points,
         # and we need bytes. MK.
@@ -203,24 +116,14 @@ module AMQ
         array = Array.new
         while body
           payload, body = body[0, limit], body[limit, body.length - limit]
-          # array << [0x03, payload]
           array << BodyFrame.new(payload, channel)
         end
 
         array
       end
 
-      # We can return different:
-      # - instantiate given subclass of Method
-      # - create an OpenStruct object
-      # - create a hash
-      # - yield params into the block rather than just return
-      # @api plugin
       def self.instantiate(*args, &block)
         self.new(*args, &block)
-        # or OpenStruct.new(args.first)
-        # or args.first
-        # or block.call(*args)
       end
     end
 
@@ -250,7 +153,6 @@ module AMQ
 
       % endif
 
-      ## TODO: not only basic, resp. in fact it's only this class, but not necessarily in the future, rather check if properties are empty #}
       % if klass.name == "basic" :
       def self.encode_properties(body_size, properties)
         pieces, flags = [], 0
@@ -263,7 +165,7 @@ module AMQ
 
         # result = [${klass.index}, 0, body_size, flags].pack('n2Qn')
         result = [${klass.index}, 0].pack(PACK_UINT16_X2)
-        result += AMQ::Hacks.pack_uint64_big_endian(body_size)
+        result += AMQ::Pack.pack_uint64_big_endian(body_size)
         result += [flags].pack(PACK_UINT16)
         result + pieces.join(EMPTY_STRING)
       end
@@ -376,8 +278,7 @@ module AMQ
           % if klass.name == "connection":
           channel = 0
           % endif
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           % for line in helpers.genEncodeMethodDefinition(spec, method):
           ${line}
           % endfor
@@ -385,9 +286,8 @@ module AMQ
           frames = [MethodFrame.new(buffer, channel)]
           % if "user_headers" in method.args():
           properties, headers = self.split_headers(user_headers)
-          # TODO: what shall I do with the headers?
           if properties.nil? or properties.empty?
-            raise RuntimeError.new("Properties can not be empty!") # TODO: or can they?
+            raise RuntimeError.new("Properties can not be empty!")
           end
           properties_payload = Basic.encode_properties(payload.bytesize, properties)
           frames << HeaderFrame.new(properties_payload, channel)

data/lib/amq/{hacks.rb → pack.rb}

@@ -2,10 +2,10 @@
 
 require 'amq/endianness'
 
-# Ruby doesn't support pack to/unpack from
-# 64bit string in network byte order.
 module AMQ
-  module Hacks
+  # Implements pack to/unpack from 64bit string in network byte order
+  # compatible with Ruby 1.8+.
+  module Pack
     UINT64 = "Q".freeze
     INT16  = "c".freeze
 
@@ -47,7 +47,7 @@ module AMQ
       end
     end
   end
-end
 
-# AMQ::Hacks.pack_uint64_big_endian(17)
-# AMQ::Hacks.unpack_uint64_big_endian("\x00\x00\x00\x00\x00\x00\x00\x11")
+  # Backwards compatibility
+  Hacks = Pack
+end

data/lib/amq/protocol/client.rb

@@ -4,35 +4,19 @@
 # IT DIRECTLY ! FOR CHANGES, PLEASE UPDATE FILES
 # IN THE ./codegen DIRECTORY OF THE AMQ-PROTOCOL REPOSITORY.
 
+require "amq/pack"
+
 require "amq/protocol/table"
 require "amq/protocol/frame"
-require "amq/hacks"
+
+require "amq/protocol/constants"
+require "amq/protocol/exceptions"
 
 module AMQ
   module Protocol
     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_INT8               = 'c'.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        = 'G'.freeze
-
-
 
     # @return [Array] Collection of subclasses of AMQ::Protocol::Class.
     def self.classes
@@ -44,63 +28,6 @@ module AMQ
       Protocol::Method.methods
     end
 
-    class Error < StandardError
-      DEFAULT_MESSAGE = "AMQP error".freeze
-
-      def self.inherited(subclass)
-        @_subclasses ||= []
-        @_subclasses << subclass
-      end # self.inherited(subclazz)
-
-      def self.subclasses_with_values
-        @_subclasses.select{ |k| defined?(k::VALUE) }
-      end # self.subclasses_with_values
-
-      def self.[](code)
-        if result = subclasses_with_values.detect { |klass| klass::VALUE == code }
-          result
-        else
-          raise "No such exception class for code #{code}" unless result
-        end # if
-      end # self.[]
-
-      def initialize(message = self.class::DEFAULT_MESSAGE)
-        super(message)
-      end
-    end
-
-    class FrameTypeError < Protocol::Error
-      def initialize(types)
-        super("Must be one of #{types.inspect}")
-      end
-    end
-
-    class EmptyResponseError < Protocol::Error
-      DEFAULT_MESSAGE = "Empty response received from the server."
-
-      def initialize(message = self.class::DEFAULT_MESSAGE)
-        super(message)
-      end
-    end
-
-    class BadResponseError < Protocol::Error
-      def initialize(argument, expected, actual)
-        super("Argument #{argument} has to be #{expected.inspect}, was #{data.inspect}")
-      end
-    end
-
-    class SoftError < Protocol::Error
-      def self.inherited(subclass)
-        Error.inherited(subclass)
-      end # self.inherited(subclass)
-    end
-
-    class HardError < Protocol::Error
-      def self.inherited(subclass)
-        Error.inherited(subclass)
-      end # self.inherited(subclass)
-    end
-
     class ContentTooLarge < SoftError
       VALUE = 311
     end
@@ -174,21 +101,6 @@ module AMQ
     end
 
 
-    # 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
-    # really badly, which is another good reason for
-    # 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
-    # considering to have just a bunch of methods, but
-    # 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
       @classes = Array.new
 
@@ -258,6 +170,7 @@ module AMQ
         # 4 bytes of frame payload length
         # 1 byte of payload trailer FRAME_END byte
         limit        = frame_size - 8
+        return [BodyFrame.new(body, channel)] if body.bytesize < limit
 
         # Otherwise String#slice on 1.9 will operate with code points,
         # and we need bytes. MK.
@@ -266,24 +179,14 @@ module AMQ
         array = Array.new
         while body
           payload, body = body[0, limit], body[limit, body.length - limit]
-          # array << [0x03, payload]
           array << BodyFrame.new(payload, channel)
         end
 
         array
       end
 
-      # We can return different:
-      # - instantiate given subclass of Method
-      # - create an OpenStruct object
-      # - create a hash
-      # - yield params into the block rather than just return
-      # @api plugin
       def self.instantiate(*args, &block)
         self.new(*args, &block)
-        # or OpenStruct.new(args.first)
-        # or args.first
-        # or block.call(*args)
       end
     end
 
@@ -351,8 +254,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << AMQ::Protocol::Table.encode(client_properties)
           buffer << mechanism.to_s.bytesize.chr
           buffer << mechanism.to_s
@@ -408,8 +310,7 @@ module AMQ
         # [u'response = nil']
         def self.encode(response)
           channel = 0
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [response.to_s.bytesize].pack(PACK_UINT32)
           buffer << response.to_s
           MethodFrame.new(buffer, channel)
@@ -464,8 +365,7 @@ module AMQ
         # [u'channel_max = false', u'frame_max = false', u'heartbeat = false']
         def self.encode(channel_max, frame_max, heartbeat)
           channel = 0
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [channel_max].pack(PACK_UINT16)
           buffer << [frame_max].pack(PACK_UINT32)
           buffer << [heartbeat].pack(PACK_UINT16)
@@ -491,8 +391,7 @@ module AMQ
           capabilities = EMPTY_STRING
           insist = false
           channel = 0
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << virtual_host.to_s.bytesize.chr
           buffer << virtual_host.to_s
           buffer << capabilities.to_s.bytesize.chr
@@ -571,8 +470,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [reply_code].pack(PACK_UINT16)
           buffer << reply_text.to_s.bytesize.chr
           buffer << reply_text.to_s
@@ -606,8 +504,7 @@ module AMQ
         # []
         def self.encode()
           channel = 0
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           MethodFrame.new(buffer, channel)
         end
 
@@ -635,8 +532,7 @@ module AMQ
         # @return
         # [u'out_of_band = EMPTY_STRING']
         def self.encode(channel, out_of_band)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << out_of_band.to_s.bytesize.chr
           buffer << out_of_band.to_s
           MethodFrame.new(buffer, channel)
@@ -699,8 +595,7 @@ module AMQ
         # @return
         # [u'active = nil']
         def self.encode(channel, active)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if active
           buffer << [bit_buffer].pack(PACK_CHAR)
@@ -736,8 +631,7 @@ module AMQ
         # @return
         # [u'active = nil']
         def self.encode(channel, active)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if active
           buffer << [bit_buffer].pack(PACK_CHAR)
@@ -783,8 +677,7 @@ module AMQ
         # @return
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [reply_code].pack(PACK_UINT16)
           buffer << reply_text.to_s.bytesize.chr
           buffer << reply_text.to_s
@@ -817,8 +710,7 @@ module AMQ
         # @return
         # []
         def self.encode(channel)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           MethodFrame.new(buffer, channel)
         end
 
@@ -847,8 +739,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << exchange.to_s.bytesize.chr
           buffer << exchange.to_s
@@ -904,8 +795,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << exchange.to_s.bytesize.chr
           buffer << exchange.to_s
@@ -955,8 +845,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << destination.to_s.bytesize.chr
           buffer << destination.to_s
@@ -1010,8 +899,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << destination.to_s.bytesize.chr
           buffer << destination.to_s
@@ -1073,8 +961,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << queue.to_s.bytesize.chr
           buffer << queue.to_s
@@ -1140,8 +1027,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << queue.to_s.bytesize.chr
           buffer << queue.to_s
@@ -1195,8 +1081,7 @@ module AMQ
         # [u'ticket = 0', u'queue = EMPTY_STRING', u'nowait = false']
         def self.encode(channel, queue, nowait)
           ticket = 0
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << queue.to_s.bytesize.chr
           buffer << queue.to_s
@@ -1249,8 +1134,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << queue.to_s.bytesize.chr
           buffer << queue.to_s
@@ -1305,8 +1189,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << queue.to_s.bytesize.chr
           buffer << queue.to_s
@@ -1437,7 +1320,7 @@ module AMQ
       # 1 << 6
       def self.encode_timestamp(value)
         buffer = ''
-        buffer << AMQ::Hacks.pack_uint64_big_endian(value)
+        buffer << AMQ::Pack.pack_uint64_big_endian(value)
         [9, 0x0040, buffer]
       end
 
@@ -1486,7 +1369,7 @@ module AMQ
 
         # result = [60, 0, body_size, flags].pack('n2Qn')
         result = [60, 0].pack(PACK_UINT16_X2)
-        result += AMQ::Hacks.pack_uint64_big_endian(body_size)
+        result += AMQ::Pack.pack_uint64_big_endian(body_size)
         result += [flags].pack(PACK_UINT16)
         result + pieces.join(EMPTY_STRING)
       end
@@ -1592,8 +1475,7 @@ module AMQ
         # @return
         # [u'prefetch_size = false', u'prefetch_count = false', u'global = false']
         def self.encode(channel, prefetch_size, prefetch_count, global)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [prefetch_size].pack(PACK_UINT32)
           buffer << [prefetch_count].pack(PACK_UINT16)
           bit_buffer = 0
@@ -1641,8 +1523,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << queue.to_s.bytesize.chr
           buffer << queue.to_s
@@ -1720,8 +1601,7 @@ module AMQ
         # @return
         # [u'consumer_tag = nil', u'nowait = false']
         def self.encode(channel, consumer_tag, nowait)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << consumer_tag.to_s.bytesize.chr
           buffer << consumer_tag.to_s
           bit_buffer = 0
@@ -1775,8 +1655,7 @@ module AMQ
         # [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 << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << exchange.to_s.bytesize.chr
           buffer << exchange.to_s
@@ -1788,9 +1667,8 @@ module AMQ
           buffer << [bit_buffer].pack(PACK_CHAR)
           frames = [MethodFrame.new(buffer, channel)]
           properties, headers = self.split_headers(user_headers)
-          # TODO: what shall I do with the headers?
           if properties.nil? or properties.empty?
-            raise RuntimeError.new("Properties can not be empty!") # TODO: or can they?
+            raise RuntimeError.new("Properties can not be empty!")
           end
           properties_payload = Basic.encode_properties(payload.bytesize, properties)
           frames << HeaderFrame.new(properties_payload, channel)
@@ -1854,7 +1732,7 @@ module AMQ
           offset += 1
           consumer_tag = data[offset, length]
           offset += length
-          delivery_tag = AMQ::Hacks.unpack_uint64_big_endian(data[offset, 8]).first
+          delivery_tag = AMQ::Pack.unpack_uint64_big_endian(data[offset, 8]).first
           offset += 8
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
@@ -1901,8 +1779,7 @@ module AMQ
         # [u'ticket = 0', u'queue = EMPTY_STRING', u'no_ack = false']
         def self.encode(channel, queue, no_ack)
           ticket = 0
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [ticket].pack(PACK_UINT16)
           buffer << queue.to_s.bytesize.chr
           buffer << queue.to_s
@@ -1923,7 +1800,7 @@ module AMQ
         # @return
         def self.decode(data)
           offset = 0
-          delivery_tag = AMQ::Hacks.unpack_uint64_big_endian(data[offset, 8]).first
+          delivery_tag = AMQ::Pack.unpack_uint64_big_endian(data[offset, 8]).first
           offset += 8
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
@@ -1994,7 +1871,7 @@ module AMQ
         # @return
         def self.decode(data)
           offset = 0
-          delivery_tag = AMQ::Hacks.unpack_uint64_big_endian(data[offset, 8]).first
+          delivery_tag = AMQ::Pack.unpack_uint64_big_endian(data[offset, 8]).first
           offset += 8
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
@@ -2015,9 +1892,8 @@ module AMQ
         # @return
         # [u'delivery_tag = false', u'multiple = false']
         def self.encode(channel, delivery_tag, multiple)
-          buffer = ''
-          buffer << @packed_indexes
-          buffer << AMQ::Hacks.pack_uint64_big_endian(delivery_tag)
+          buffer = @packed_indexes.dup
+          buffer << AMQ::Pack.pack_uint64_big_endian(delivery_tag)
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if multiple
           buffer << [bit_buffer].pack(PACK_CHAR)
@@ -2040,9 +1916,8 @@ module AMQ
         # @return
         # [u'delivery_tag = nil', u'requeue = true']
         def self.encode(channel, delivery_tag, requeue)
-          buffer = ''
-          buffer << @packed_indexes
-          buffer << AMQ::Hacks.pack_uint64_big_endian(delivery_tag)
+          buffer = @packed_indexes.dup
+          buffer << AMQ::Pack.pack_uint64_big_endian(delivery_tag)
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if requeue
           buffer << [bit_buffer].pack(PACK_CHAR)
@@ -2065,8 +1940,7 @@ module AMQ
         # @return
         # [u'requeue = false']
         def self.encode(channel, requeue)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if requeue
           buffer << [bit_buffer].pack(PACK_CHAR)
@@ -2089,8 +1963,7 @@ module AMQ
         # @return
         # [u'requeue = false']
         def self.encode(channel, requeue)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if requeue
           buffer << [bit_buffer].pack(PACK_CHAR)
@@ -2130,7 +2003,7 @@ module AMQ
         # @return
         def self.decode(data)
           offset = 0
-          delivery_tag = AMQ::Hacks.unpack_uint64_big_endian(data[offset, 8]).first
+          delivery_tag = AMQ::Pack.unpack_uint64_big_endian(data[offset, 8]).first
           offset += 8
           bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
           offset += 1
@@ -2153,9 +2026,8 @@ module AMQ
         # @return
         # [u'delivery_tag = false', u'multiple = false', u'requeue = true']
         def self.encode(channel, delivery_tag, multiple, requeue)
-          buffer = ''
-          buffer << @packed_indexes
-          buffer << AMQ::Hacks.pack_uint64_big_endian(delivery_tag)
+          buffer = @packed_indexes.dup
+          buffer << AMQ::Pack.pack_uint64_big_endian(delivery_tag)
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if multiple
           bit_buffer = bit_buffer | (1 << 1) if requeue
@@ -2200,8 +2072,7 @@ module AMQ
         # @return
         # [u'consumer_tag = EMPTY_STRING', u'credit = nil', u'drain = nil']
         def self.encode(channel, consumer_tag, credit, drain)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << consumer_tag.to_s.bytesize.chr
           buffer << consumer_tag.to_s
           buffer << [credit].pack(PACK_UINT32)
@@ -2239,8 +2110,7 @@ module AMQ
         # @return
         # [u'available = nil']
         def self.encode(channel, available)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << [available].pack(PACK_UINT32)
           MethodFrame.new(buffer, channel)
         end
@@ -2278,8 +2148,7 @@ module AMQ
         # @return
         # [u'consumer_tag = EMPTY_STRING', u'credit_drained = nil']
         def self.encode(channel, consumer_tag, credit_drained)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           buffer << consumer_tag.to_s.bytesize.chr
           buffer << consumer_tag.to_s
           buffer << [credit_drained].pack(PACK_UINT32)
@@ -2310,8 +2179,7 @@ module AMQ
         # @return
         # []
         def self.encode(channel)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           MethodFrame.new(buffer, channel)
         end
 
@@ -2353,8 +2221,7 @@ module AMQ
         # @return
         # []
         def self.encode(channel)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           MethodFrame.new(buffer, channel)
         end
 
@@ -2396,8 +2263,7 @@ module AMQ
         # @return
         # []
         def self.encode(channel)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           MethodFrame.new(buffer, channel)
         end
 
@@ -2460,8 +2326,7 @@ module AMQ
         # @return
         # [u'nowait = false']
         def self.encode(channel, nowait)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           bit_buffer = 0
           bit_buffer = bit_buffer | (1 << 0) if nowait
           buffer << [bit_buffer].pack(PACK_CHAR)
@@ -2492,8 +2357,7 @@ module AMQ
         # @return
         # []
         def self.encode(channel)
-          buffer = ''
-          buffer << @packed_indexes
+          buffer = @packed_indexes.dup
           MethodFrame.new(buffer, channel)
         end