rabbitmq 0.1.1 → 0.2.0

data/lib/rabbitmq/ffi.rb

@@ -6,6 +6,7 @@ module RabbitMQ
   module FFI
     extend ::FFI::Library
     
+    ffi_lib ::FFI::Library::LIBC
     ffi_lib \
       File.expand_path("../../ext/rabbitmq/librabbitmq.so", File.dirname(__FILE__))
     
@@ -14,11 +15,45 @@ module RabbitMQ
         blocking: true  # only necessary on MRI to deal with the GIL.
       }
       
-      # The following definition is based on library version 0.5.2
+      attach_function :free,   [:pointer], :void,    **opts
+      attach_function :malloc, [:size_t],  :pointer, **opts
       
       attach_function :amqp_version_number, [], :uint32, **opts
       attach_function :amqp_version,        [], :string, **opts
       
+      Status = enum ::FFI::TypeDefs[:int], [
+        :ok,                          0x0,
+        :no_memory,                  -0x0001,
+        :bad_amqp_data,              -0x0002,
+        :unknown_class,              -0x0003,
+        :unknown_method,             -0x0004,
+        :hostname_resolution_failed, -0x0005,
+        :incompatible_amqp_version,  -0x0006,
+        :connection_closed,          -0x0007,
+        :bad_url,                    -0x0008,
+        :socket_error,               -0x0009,
+        :invalid_parameter,          -0x000A,
+        :table_too_big,              -0x000B,
+        :wrong_method,               -0x000C,
+        :timeout,                    -0x000D,
+        :timer_failure,              -0x000E,
+        :heartbeat_timeout,          -0x000F,
+        :unexpected_state,           -0x0010,
+        :unexpected_socket_closed,   -0x0011,
+        :unexpected_socket_inuse,    -0x0012,
+        :tcp_error,                  -0x0100,
+        :tcp_socketlib_init_error,   -0x0101,
+        :ssl_error,                  -0x0200,
+        :ssl_hostname_verify_failed, -0x0201,
+        :ssl_peer_verify_failed,     -0x0202,
+        :ssl_connection_failed,      -0x0203,
+      ]
+      
+      DeliveryMode = enum ::FFI::TypeDefs[:uint8], [
+        :nonpersistent, 1,
+        :persistent,    2,
+      ]
+      
       class Timeval < ::FFI::Struct
         layout :tv_sec,  :time_t,
                :tv_usec, :suseconds_t
@@ -98,8 +133,10 @@ module RabbitMQ
         :confirm_select_ok,    0x0055000B, # 85, 11; 5570571
       ]
       
-      Flags   = :uint32
-      Channel = :uint16
+      Flags = :uint32
+      
+      Channel = ::FFI::TypeDefs[:uint16]
+      CHANNEL_MAX_ID = 2 ** (Channel.size * 8) - 1
       
       class Bytes < ::FFI::Struct
         layout :len,   :size_t,
@@ -189,6 +226,13 @@ module RabbitMQ
                :decoded, :pointer
       end
       
+      FrameType = enum ::FFI::TypeDefs[:uint8], [
+        :method,    1,
+        :header,    2,
+        :body,      3,
+        :heartbeat, 8,
+      ]
+      
       class FramePayloadProperties < ::FFI::Struct
         layout :class_id,  :uint16,
                :body_size, :uint64,
@@ -210,8 +254,8 @@ module RabbitMQ
                :protocol_header, FramePayloadProtocolHeader
       end
       
-      class Frame < ::FFI::Union
-        layout :frame_type, :uint8,
+      class Frame < ::FFI::Struct
+        layout :frame_type, FrameType,
                :channel,    Channel,
                :payload,    FramePayload
       end
@@ -226,7 +270,7 @@ module RabbitMQ
       class RpcReply < ::FFI::Struct
         layout :reply_type,    ResponseType,
                :reply,         Method,
-               :library_error, :int
+               :library_error, Status
       end
       
       SaslMethod = enum [
@@ -235,48 +279,15 @@ module RabbitMQ
       
       ConnectionState = :pointer
       
-      Status = enum [
-        :ok,                          0x0,
-        :no_memory,                  -0x0001,
-        :bad_amqp_data,              -0x0002,
-        :unknown_class,              -0x0003,
-        :unknown_method,             -0x0004,
-        :hostname_resolution_failed, -0x0005,
-        :incompatible_amqp_version,  -0x0006,
-        :connection_closed,          -0x0007,
-        :bad_url,                    -0x0008,
-        :socket_error,               -0x0009,
-        :invalid_parameter,          -0x000A,
-        :table_too_big,              -0x000B,
-        :wrong_method,               -0x000C,
-        :timeout,                    -0x000D,
-        :timer_failure,              -0x000E,
-        :heartbeat_timeout,          -0x000F,
-        :unexpected_state,           -0x0010,
-        :unexpected_socket_closed,   -0x0011,
-        :unexpected_socket_inuse,    -0x0012,
-        :tcp_error,                  -0x0100,
-        :tcp_socketlib_init_error,   -0x0101,
-        :ssl_error,                  -0x0200,
-        :ssl_hostname_verify_failed, -0x0201,
-        :ssl_peer_verify_failed,     -0x0202,
-        :ssl_connection_failed,      -0x0203,
-      ]
-      
-      DeliveryMode = enum [
-        :nonpersistent, 1,
-        :persistent,    2,
-      ]
-      
       attach_function :amqp_constant_name,          [:int], :string, **opts
       attach_function :amqp_constant_is_hard_error, [:int], Boolean, **opts
       
-      attach_function :amqp_method_name,        [MethodNumber],                            :string, **opts
-      attach_function :amqp_method_has_content, [MethodNumber],                            Boolean, **opts
-      attach_function :amqp_decode_method,      [MethodNumber, Pool.ptr, Bytes, :pointer], Status,  **opts
-      attach_function :amqp_decode_properties,  [:uint16, Pool.ptr, Bytes, :pointer],      Status,  **opts
-      attach_function :amqp_encode_method,      [MethodNumber, :pointer, Bytes],           Status,  **opts
-      attach_function :amqp_encode_properties,  [:uint16, :pointer, Bytes],                Status,  **opts
+      attach_function :amqp_method_name,        [MethodNumber],                                :string, **opts
+      attach_function :amqp_method_has_content, [MethodNumber],                                Boolean, **opts
+      attach_function :amqp_decode_method,      [MethodNumber, Pool.ptr, Bytes.val, :pointer], Status,  **opts
+      attach_function :amqp_decode_properties,  [:uint16, Pool.ptr, Bytes.val, :pointer],      Status,  **opts
+      attach_function :amqp_encode_method,      [MethodNumber, :pointer, Bytes.val],           Status,  **opts
+      attach_function :amqp_encode_properties,  [:uint16, :pointer, Bytes.val],                Status,  **opts
       
       class ConnectionStart < ::FFI::Struct
         layout :version_major,     :uint8,
@@ -362,7 +373,7 @@ module RabbitMQ
         layout :reply_code, :uint16,
                :reply_text, Bytes,
                :class_id,   :uint16,
-               :method_i,   :uint16
+               :method_id,  :uint16
       end
       
       class ChannelCloseOk < ::FFI::Struct
@@ -391,7 +402,7 @@ module RabbitMQ
                :auto_delete, Boolean,
                :internal,    Boolean,
                :nowait,      Boolean,
-               :arguments,   Bytes
+               :arguments,   Table
       end
       
       class ExchangeDeclareOk < ::FFI::Struct
@@ -415,7 +426,7 @@ module RabbitMQ
                :source,      Bytes,
                :routing_key, Bytes,
                :nowait,      Boolean,
-               :arguments,   Bytes
+               :arguments,   Table
       end
       
       class ExchangeBindOk < ::FFI::Struct
@@ -428,7 +439,7 @@ module RabbitMQ
                :source,      Bytes,
                :routing_key, Bytes,
                :nowait,      Boolean,
-               :arguments,   Bytes
+               :arguments,   Table
       end
       
       class ExchangeUnbindOk < ::FFI::Struct
@@ -443,7 +454,7 @@ module RabbitMQ
                :exclusive,   Boolean,
                :auto_delete, Boolean,
                :nowait,      Boolean,
-               :arguments,   Bytes
+               :arguments,   Table
       end
       
       class QueueDeclareOk < ::FFI::Struct
@@ -458,7 +469,7 @@ module RabbitMQ
                :exchange,    Bytes,
                :routing_key, Bytes,
                :nowait,      Boolean,
-               :arguments,   Bytes
+               :arguments,   Table
       end
       
       class QueueBindOk < ::FFI::Struct
@@ -492,7 +503,7 @@ module RabbitMQ
                :queue,       Bytes,
                :exchange,    Bytes,
                :routing_key, Bytes,
-               :arguments,   Bytes
+               :arguments,   Table
       end
       
       class QueueUnbindOk < ::FFI::Struct
@@ -517,7 +528,7 @@ module RabbitMQ
                :no_ack,       Boolean,
                :exclusive,    Boolean,
                :nowait,       Boolean,
-               :arguments,    Bytes
+               :arguments,    Table
       end
       
       class BasicConsumeOk < ::FFI::Struct
@@ -674,7 +685,7 @@ module RabbitMQ
                :content_type,     Bytes,
                :content_encoding, Bytes,
                :headers,          Table,
-               :delivery_mode,    :uint8,
+               :delivery_mode,    DeliveryMode,
                :priority,         :uint8,
                :correlation_id,   Bytes,
                :reply_to,         Bytes,
@@ -687,25 +698,25 @@ module RabbitMQ
                :cluster_id,       Bytes
       end
       
-      attach_function :amqp_channel_open,     [ConnectionState, Channel],                                                   ChannelOpenOk.ptr,     **opts
-      attach_function :amqp_channel_flow,     [ConnectionState, Channel, Boolean],                                          ChannelFlowOk.ptr,     **opts
-      attach_function :amqp_exchange_declare, [ConnectionState, Channel, Bytes, Bytes, Boolean, Boolean, Table],            ExchangeDeclareOk.ptr, **opts
-      attach_function :amqp_exchange_delete,  [ConnectionState, Channel, Bytes, Boolean],                                   ExchangeDeleteOk.ptr,  **opts
-      attach_function :amqp_exchange_bind,    [ConnectionState, Channel, Bytes, Bytes, Bytes, Table],                       ExchangeBindOk.ptr,    **opts
-      attach_function :amqp_exchange_unbind,  [ConnectionState, Channel, Bytes, Bytes, Bytes, Table],                       ExchangeUnbindOk.ptr,  **opts
-      attach_function :amqp_queue_declare,    [ConnectionState, Channel, Bytes, Boolean, Boolean, Boolean, Boolean, Table], QueueDeclareOk.ptr,    **opts
-      attach_function :amqp_queue_bind,       [ConnectionState, Channel, Bytes, Bytes, Bytes, Table],                       QueueBindOk.ptr,       **opts
-      attach_function :amqp_queue_purge,      [ConnectionState, Channel, Bytes],                                            QueuePurgeOk.ptr,      **opts
-      attach_function :amqp_queue_delete,     [ConnectionState, Channel, Bytes, Boolean, Boolean],                          QueueDeleteOk.ptr,     **opts
-      attach_function :amqp_queue_unbind,     [ConnectionState, Channel, Bytes, Bytes, Bytes, Table],                       QueueUnbindOk.ptr,     **opts
-      attach_function :amqp_basic_qos,        [ConnectionState, Channel, :uint32, :uint16, Boolean],                        BasicQosOk.ptr,        **opts
-      attach_function :amqp_basic_consume,    [ConnectionState, Channel, Bytes, Bytes, Boolean, Boolean, Boolean, Table],   BasicConsumeOk.ptr,    **opts
-      attach_function :amqp_basic_cancel,     [ConnectionState, Channel, Bytes],                                            BasicCancelOk.ptr,     **opts
-      attach_function :amqp_basic_recover,    [ConnectionState, Channel, Boolean],                                          BasicRecoverOk.ptr,    **opts
-      attach_function :amqp_tx_select,        [ConnectionState, Channel],                                                   TxSelect.ptr,          **opts
-      attach_function :amqp_tx_commit,        [ConnectionState, Channel],                                                   TxCommit.ptr,          **opts
-      attach_function :amqp_tx_rollback,      [ConnectionState, Channel],                                                   TxRollback.ptr,        **opts
-      attach_function :amqp_confirm_select,   [ConnectionState, Channel],                                                   ConfirmSelect.ptr,     **opts
+      attach_function :amqp_channel_open,     [ConnectionState, Channel],                                                             ChannelOpenOk.ptr,     **opts
+      attach_function :amqp_channel_flow,     [ConnectionState, Channel, Boolean],                                                    ChannelFlowOk.ptr,     **opts
+      attach_function :amqp_exchange_declare, [ConnectionState, Channel, Bytes.val, Bytes.val, Boolean, Boolean, Table.val],          ExchangeDeclareOk.ptr, **opts
+      attach_function :amqp_exchange_delete,  [ConnectionState, Channel, Bytes.val, Boolean],                                         ExchangeDeleteOk.ptr,  **opts
+      attach_function :amqp_exchange_bind,    [ConnectionState, Channel, Bytes.val, Bytes.val, Bytes.val, Table.val],                 ExchangeBindOk.ptr,    **opts
+      attach_function :amqp_exchange_unbind,  [ConnectionState, Channel, Bytes.val, Bytes.val, Bytes.val, Table.val],                 ExchangeUnbindOk.ptr,  **opts
+      attach_function :amqp_queue_declare,    [ConnectionState, Channel, Bytes.val, Boolean, Boolean, Boolean, Boolean, Table.val],   QueueDeclareOk.ptr,    **opts
+      attach_function :amqp_queue_bind,       [ConnectionState, Channel, Bytes.val, Bytes.val, Bytes.val, Table.val],                 QueueBindOk.ptr,       **opts
+      attach_function :amqp_queue_purge,      [ConnectionState, Channel, Bytes.val],                                                  QueuePurgeOk.ptr,      **opts
+      attach_function :amqp_queue_delete,     [ConnectionState, Channel, Bytes.val, Boolean, Boolean],                                QueueDeleteOk.ptr,     **opts
+      attach_function :amqp_queue_unbind,     [ConnectionState, Channel, Bytes.val, Bytes.val, Bytes.val, Table.val],                 QueueUnbindOk.ptr,     **opts
+      attach_function :amqp_basic_qos,        [ConnectionState, Channel, :uint32, :uint16, Boolean],                                  BasicQosOk.ptr,        **opts
+      attach_function :amqp_basic_consume,    [ConnectionState, Channel, Bytes.val, Bytes.val, Boolean, Boolean, Boolean, Table.val], BasicConsumeOk.ptr,    **opts
+      attach_function :amqp_basic_cancel,     [ConnectionState, Channel, Bytes.val],                                                  BasicCancelOk.ptr,     **opts
+      attach_function :amqp_basic_recover,    [ConnectionState, Channel, Boolean],                                                    BasicRecoverOk.ptr,    **opts
+      attach_function :amqp_tx_select,        [ConnectionState, Channel],                                                             TxSelect.ptr,          **opts
+      attach_function :amqp_tx_commit,        [ConnectionState, Channel],                                                             TxCommit.ptr,          **opts
+      attach_function :amqp_tx_rollback,      [ConnectionState, Channel],                                                             TxRollback.ptr,        **opts
+      attach_function :amqp_confirm_select,   [ConnectionState, Channel],                                                             ConfirmSelect.ptr,     **opts
       
       attach_function :init_amqp_pool,        [Pool.ptr, :size_t],            :void,    **opts
       attach_function :recycle_amqp_pool,     [Pool.ptr],                     :void,    **opts
@@ -713,10 +724,10 @@ module RabbitMQ
       attach_function :amqp_pool_alloc,       [Pool.ptr, :size_t],            :pointer, **opts
       attach_function :amqp_pool_alloc_bytes, [Pool.ptr, :size_t, Bytes.ptr], :void,    **opts
       
-      attach_function :amqp_cstring_bytes,    [:string], Bytes, **opts
-      attach_function :amqp_bytes_malloc_dup, [Bytes],   Bytes, **opts
-      attach_function :amqp_bytes_malloc,     [:size_t], Bytes, **opts
-      attach_function :amqp_bytes_free,       [Bytes],   :void, **opts
+      attach_function :amqp_cstring_bytes,    [:string],     Bytes.val, **opts
+      attach_function :amqp_bytes_malloc_dup, [Bytes.val],   Bytes.val, **opts
+      attach_function :amqp_bytes_malloc,     [:size_t],     Bytes.val, **opts
+      attach_function :amqp_bytes_free,       [Bytes.val],   :void,     **opts
       
       attach_function :amqp_new_connection, [], ConnectionState, **opts
       attach_function :amqp_get_sockfd,         [ConnectionState],                   :int,   **opts
@@ -727,12 +738,12 @@ module RabbitMQ
       attach_function :amqp_get_heartbeat,      [ConnectionState],                   :int,   **opts
       attach_function :amqp_destroy_connection, [ConnectionState],                   Status, **opts
       
-      attach_function :amqp_handle_input,                     [ConnectionState, Bytes, Frame.ptr], Status,  **opts
-      attach_function :amqp_release_buffers_ok,               [ConnectionState],                   Boolean, **opts
-      attach_function :amqp_release_buffers,                  [ConnectionState],                   :void,   **opts
-      attach_function :amqp_maybe_release_buffers,            [ConnectionState],                   :void,   **opts
-      attach_function :amqp_maybe_release_buffers_on_channel, [ConnectionState, Channel],          :void,   **opts
-      attach_function :amqp_send_frame,                       [ConnectionState, Frame.ptr],        Status,  **opts
+      attach_function :amqp_handle_input,                     [ConnectionState, Bytes.val, Frame.ptr], Status,  **opts
+      attach_function :amqp_release_buffers_ok,               [ConnectionState],                       Boolean, **opts
+      attach_function :amqp_release_buffers,                  [ConnectionState],                       :void,   **opts
+      attach_function :amqp_maybe_release_buffers,            [ConnectionState],                       :void,   **opts
+      attach_function :amqp_maybe_release_buffers_on_channel, [ConnectionState, Channel],              :void,   **opts
+      attach_function :amqp_send_frame,                       [ConnectionState, Frame.ptr],            Status,  **opts
       
       attach_function :amqp_table_entry_cmp, [:pointer, :pointer], :int, **opts
       
@@ -743,19 +754,19 @@ module RabbitMQ
       attach_function :amqp_simple_wait_frame,         [ConnectionState, Frame.ptr],                         Status,  **opts
       attach_function :amqp_simple_wait_frame_noblock, [ConnectionState, Frame.ptr, Timeval.ptr],            Status,  **opts
       attach_function :amqp_simple_wait_method,        [ConnectionState, Channel, MethodNumber, Method.ptr], Status,  **opts
-      attach_function :amqp_send_method,               [ConnectionState, Channel, MethodNumber, Method.ptr], Status,  **opts
+      attach_function :amqp_send_method,               [ConnectionState, Channel, MethodNumber, :pointer],   Status,  **opts
       
-      attach_function :amqp_simple_rpc,            [ConnectionState, Channel, MethodNumber, :pointer, :pointer],                  RpcReply.by_value, **opts
-      attach_function :amqp_simple_rpc_decoded,    [ConnectionState, Channel, MethodNumber, MethodNumber, :pointer],              :pointer,          **opts
-      attach_function :amqp_get_rpc_reply,         [ConnectionState],                                                             RpcReply.by_value, **opts
-      attach_function :amqp_login,                 [ConnectionState, :string, :int, :int, :int, SaslMethod, :varargs],            RpcReply.by_value, **opts
-      attach_function :amqp_login_with_properties, [ConnectionState, :string, :int, :int, :int, Table.ptr, SaslMethod, :varargs], RpcReply.by_value, **opts
-      attach_function :amqp_channel_close,         [ConnectionState, Channel, :int],                                              RpcReply.by_value, **opts
-      attach_function :amqp_connection_close,      [ConnectionState, :int],                                                       RpcReply.by_value, **opts
+      attach_function :amqp_simple_rpc,            [ConnectionState, Channel, MethodNumber, :pointer, :pointer],                  RpcReply.val, **opts
+      attach_function :amqp_simple_rpc_decoded,    [ConnectionState, Channel, MethodNumber, MethodNumber, :pointer],              :pointer,     **opts
+      attach_function :amqp_get_rpc_reply,         [ConnectionState],                                                             RpcReply.val, **opts
+      attach_function :amqp_login,                 [ConnectionState, :string, :int, :int, :int, SaslMethod, :varargs],            RpcReply.val, **opts
+      attach_function :amqp_login_with_properties, [ConnectionState, :string, :int, :int, :int, Table.ptr, SaslMethod, :varargs], RpcReply.val, **opts
+      attach_function :amqp_channel_close,         [ConnectionState, Channel, :int],                                              RpcReply.val, **opts
+      attach_function :amqp_connection_close,      [ConnectionState, :int],                                                       RpcReply.val, **opts
       
-      attach_function :amqp_basic_publish, [ConnectionState, Channel, Bytes, Bytes, Boolean, Boolean, BasicProperties.ptr, Bytes], RpcReply.by_value, **opts
+      attach_function :amqp_basic_publish, [ConnectionState, Channel, Bytes.val, Bytes.val, Boolean, Boolean, BasicProperties.ptr, Bytes.val], Status, **opts
       
-      attach_function :amqp_basic_get,     [ConnectionState, Channel, Bytes, Boolean],            Status, **opts
+      attach_function :amqp_basic_get,     [ConnectionState, Channel, Bytes.val, Boolean],        Status, **opts
       attach_function :amqp_basic_ack,     [ConnectionState, Channel, :uint64, Boolean],          Status, **opts
       attach_function :amqp_basic_reject,  [ConnectionState, Channel, :uint64, Boolean],          Status, **opts
       attach_function :amqp_basic_nack,    [ConnectionState, Channel, :uint64, Boolean, Boolean], Status, **opts
@@ -765,8 +776,8 @@ module RabbitMQ
       attach_function :amqp_error_string,  [:int], :string, **opts
       attach_function :amqp_error_string2, [:int], :string, **opts
       
-      attach_function :amqp_decode_table, [Bytes, Pool.ptr, Table.ptr, :pointer], Status, **opts
-      attach_function :amqp_encode_table, [Bytes, Table.ptr, :pointer],           Status, **opts
+      attach_function :amqp_decode_table, [Bytes.val, Pool.ptr, Table.ptr, :pointer], Status, **opts
+      attach_function :amqp_encode_table, [Bytes.val, Table.ptr, :pointer],           Status, **opts
       attach_function :amqp_table_clone,  [Table.ptr, Table.ptr, Pool.ptr],       Status, **opts
       
       class Message < ::FFI::Struct
@@ -775,8 +786,8 @@ module RabbitMQ
                :pool,       Pool
       end
       
-      attach_function :amqp_read_message,    [ConnectionState, Channel, Message.ptr, :int], RpcReply.by_value, **opts
-      attach_function :amqp_destroy_message, [Message.ptr],                                 :void,             **opts
+      attach_function :amqp_read_message,    [ConnectionState, Channel, Message.ptr, :int], RpcReply.val, **opts
+      attach_function :amqp_destroy_message, [Message.ptr],                                 :void,        **opts
       
       class Envelope < ::FFI::Struct
         layout :channel,      Channel,
@@ -788,8 +799,8 @@ module RabbitMQ
                :message,      Message
       end
       
-      attach_function :amqp_consume_message,  [ConnectionState, Envelope.ptr, Timeval.ptr, :int], RpcReply.by_value, **opts
-      attach_function :amqp_destroy_envelope, [Envelope.ptr],                                     :void,             **opts
+      attach_function :amqp_consume_message,  [ConnectionState, Envelope.ptr, Timeval.ptr, :int], RpcReply.val, **opts
+      attach_function :amqp_destroy_envelope, [Envelope.ptr],                                     :void,        **opts
       
       class ConnectionInfo < ::FFI::Struct
         layout :user,     :string,

data/lib/rabbitmq/ffi/error.rb

@@ -29,12 +29,10 @@ module RabbitMQ
       end
       
       FFI::Status.symbols.each do |status|
-        message    = RabbitMQ::FFI.amqp_error_string2(status)
-        const_name = status.to_s.gsub(/((?:\A\w)|(?:_\w))/) { |x| x[-1].upcase }
-        
+        message = RabbitMQ::FFI.amqp_error_string2(status)
         kls = Class.new(Error) { define_method(:status_message) { message } }
         lookup_table[status] = kls
-        const_set const_name, kls
+        const_set Util.const_name(status), kls
       end
     end
     

data/lib/rabbitmq/ffi/ext.rb

@@ -2,6 +2,18 @@
 module RabbitMQ
   module FFI
     
+    class Timeval
+      def self.from(seconds)
+        obj = new
+        obj[:tv_sec] = seconds.to_i
+        obj[:tv_usec] = (seconds * 1_000_000).to_i
+        obj
+      end
+      
+      @zero = self.from(0)
+      class << self; attr_reader :zero; end
+    end
+    
     class ConnectionInfo
       def to_h
         members.map { |k| [k, self[k]] }.to_h
@@ -9,19 +21,29 @@ module RabbitMQ
     end
     
     class Bytes
-      def to_s
-        ::FFI::Pointer.new(self[:bytes]).read_bytes(self[:len])
+      def to_s(free=false)
+        size = self[:len]
+        s = size == 0 ? "" : self[:bytes].read_bytes(size)
+        free! if free
+        s
       end
       
-      def self.from_s(str)
-        size = str.bytesize
-        ptr  = Util.mem_ptr(size, release: false)
-        ptr.write_string(str)
-        
-        bytes = new
-        bytes[:len]   = str.bytesize
-        bytes[:bytes] = Util.mem_ptr(str.bytesize, release: false)
-        bytes
+      def free!
+        FFI.free(self[:bytes])
+        clear
+      end
+      
+      def self.from_s(str, borrow=false)
+        if borrow
+          FFI.amqp_cstring_bytes(str)
+        else
+          size = str.bytesize
+          bytes = FFI.amqp_bytes_malloc(size)
+          
+          bytes[:bytes].write_string(str)
+          bytes[:len] = size
+          bytes
+        end
       end
     end
     
@@ -34,28 +56,215 @@ module RabbitMQ
         end
       end
       
-      def to_value
-        kind  = self[:kind]
-        value = self[:value][value_member(kind)]
-        case kind
-        when :bytes;     value.to_s
-        when :utf8;      value.to_s.force_encoding(Encoding::UTF_8)
+      def to_value(free=false)
+        kind   = self[:kind]
+        value  = self[:value][value_member(kind)]
+        result = case kind
+        when :bytes;     value.to_s(free)
+        when :utf8;      value.to_s(free).force_encoding(Encoding::UTF_8)
         when :timestamp; Time.at(value / 1000.0)
-        when :table;     value.to_h
+        when :table;     value.to_h(free)
         when :array;     value.to_array_not_yet_implemented!
         when :decimal;   value.to_value_not_yet_implemented!
         else value
         end
+        
+        clear if free
+        result
+      end
+      
+      def free!
+        kind   = self[:kind]
+        value  = self[:value][value_member(kind)]
+        value.free! if value.respond_to? :free!
+        clear
+      end
+      
+      def self.from(value, borrow=false)
+        obj = new
+        obj[:kind], obj[:value] = case value
+        when String; [:bytes, FieldValueValue.new(Bytes.from_s(value, borrow).pointer)]
+        else raise NotImplementedError
+        end
+        obj
       end
     end
     
     class Table
-      def to_h
+      include Enumerable
+      
+      def each(*a, &b)
         entry_ptr = self[:entries]
-        entries   = self[:num_entries].times.map { |i|
-          entry = FFI::TableEntry.new(entry_ptr + i * FFI::TableEntry.size)
-          [entry[:key].to_s, entry[:value].to_value]
-        }.to_h
+        entries   = self[:num_entries].times.map do |i|
+          FFI::TableEntry.new(entry_ptr + i * FFI::TableEntry.size)
+        end
+        entries.each(*a, &b)
+      end
+      
+      def to_h(free=false)
+        result = self.map do |entry|
+          [entry[:key].to_s(free), entry[:value].to_value(free)]
+        end.to_h
+        
+        clear if free
+        result
+      end
+      
+      def free!
+        self.each do
+          entry[:key].free!
+          entry[:value].free!
+        end
+        FFI.free(self[:entries])
+        clear
+      end
+      
+      def self.from(params, borrow=false)
+        size      = params.size
+        entry_ptr = Util.mem_ptr(size * FFI::TableEntry.size, release: false)
+        params.each_with_index do |param, idx|
+          entry = FFI::TableEntry.new(entry_ptr + idx * FFI::TableEntry.size)
+          entry[:key]   = FFI::Bytes.from_s(param.first.to_s, borrow)
+          entry[:value] = FFI::FieldValue.from(param.last, borrow)
+        end
+        
+        obj = new
+        obj[:num_entries] = size
+        obj[:entries]     = entry_ptr
+        obj
+      end
+    end
+    
+    class Method
+      MethodClasses = FFI::MethodNumber.symbols.map do |name|
+        const_name = name.to_s.gsub(/((?:\A\w)|(?:_\w))/) { |x| x[-1].upcase }
+        [name, FFI.const_get(const_name)]
+      end.to_h.freeze
+      
+      MethodNames = MethodClasses.to_a.map(&:reverse).to_h.freeze
+      
+      def to_h(free=false)
+        { method: self[:id],
+          properties: self.decoded.to_h(free) }
+      end
+      
+      def decoded
+        MethodClasses.fetch(self[:id]).new(self[:decoded])
+      end
+      
+      def self.lookup(kls)
+        MethodNames.fetch(kls)
+      end
+      
+      def self.lookup_class(name)
+        MethodClasses.fetch(name)
+      end
+      
+      def self.from(decoded)
+        obj = new
+        obj[:id] = lookup(decoded.class)
+        obj[:decoded] = decoded.pointer
+        obj
+      end
+      
+      def self.has_content?(type)
+        case type
+        when :basic_publish; true
+        when :basic_return;  true
+        when :basic_deliver; true
+        when :basic_get_ok;  true
+        else                 false
+        end
+      end
+    end
+    
+    module MethodClassMixin
+      def apply(borrow=false, **params)
+        params.each do |key, value|
+          next if key == :dummy
+          case value
+          when String; value = FFI::Bytes.from_s(value, borrow)
+          when Hash;   value = FFI::Table.from(value, borrow)
+          end
+          self[key] = value
+        end
+        self
+      end
+      
+      def to_h(free=false)
+        result = {}
+        self.members.each do |key| [key, self[key]]
+          next if key == :dummy
+          value = self[key]
+          case value
+          when FFI::Bytes; value = value.to_s(free)
+          when FFI::Table; value = value.to_h(free)
+          end
+          result[key] = value
+        end
+        
+        # TODO: handle the inverse case of this transformation in apply method
+        if (method_id = result.delete(:method_id))
+          method_num = (result.delete(:class_id) << 16) + method_id
+          result[:method] = FFI::MethodNumber[method_num]
+        end
+        
+        clear if free
+        result
+      end
+      
+      def free!
+        self.values.each do |item|
+          item.free! if item.respond_to? :free!
+        end
+        clear
+      end
+    end
+    
+    Method::MethodClasses.each { |_, kls| kls.send(:include, MethodClassMixin) }
+    
+    BasicProperties.send(:include, MethodClassMixin)
+    
+    class FramePayloadProperties
+      def decoded
+        BasicProperties.new(self[:decoded])
+      end
+    end
+    
+    class Frame
+      def payload
+        member = case self[:frame_type]
+        when :method; :method
+        when :header; :properties
+        when :body;   :body_fragment
+        else; raise NotImplementedError, "frame type: #{self[:frame_type]}"
+        end
+        self[:payload][member]
+      end
+      
+      def as_method_to_h(free=false)
+        # TODO: raise correct error class with enough info for appropriate action
+        raise "Wrong frame type for method frame of event: #{self[:frame_type]}" \
+          unless self[:frame_type] == :method
+        
+        payload.to_h(free).merge(channel: self[:channel])
+      end
+      
+      def as_header_to_h(free=false)
+        # TODO: raise correct error class with enough info for appropriate action
+        raise "Wrong frame type for header frame of multiframe event: #{self[:frame_type]}" \
+          unless self[:frame_type] == :header
+        
+        properties = self[:payload][:properties]
+        { header: properties.decoded.to_h(free), body_size: properties[:body_size] }
+      end
+      
+      def as_body_to_s(free=false)
+        # TODO: raise correct error class with enough info for appropriate action
+        raise "Wrong frame type for body frame of multiframe event: #{self[:frame_type]}" \
+          unless self[:frame_type] == :body
+        
+        self[:payload][:body_fragment].to_s(free)
       end
     end