rabbitmq 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 244f595aa2d3971af7abf7ca4cc7ef6c56c210c1
-  data.tar.gz: 3d416e1b3667a19c547bc11a81ca0cdf6c2530ed
+  metadata.gz: 1c1c764cdfb743927b47bbd5165898582458c656
+  data.tar.gz: dda4411b342ca6e609562976f6fc981d9eb67577
 SHA512:
-  metadata.gz: 9440df7f81db2e10d88d69816da91a1f059db6581c5d7e136b58bee98b5e516e4f8250ad87f7bbb43ff53b790915da1d44566b05998f33036b06b9e8742d9e3a
-  data.tar.gz: 48489bb898751dd7a433e5a7456216a08650736b6b84b9fcc67acd21eef003da45d4d60f767626458d92569394c8e9c5cc7b446f378a7a1a3c00a3d033ec3b9f
+  metadata.gz: 6d3cee85a69364b25a15087b264fb47c906bbd1dd94c76a9fb56ffb06171f093ef9ffa78363dabb0dca23c2def71bf2bbe45c2d4a9e0b029e92074beb6dd4c9e
+  data.tar.gz: 5d418e13636abdd2189c7b49072abdf2ca4a9ed053dc7711d2fc60d009067a8a3202ecb77548d3c77df671d84ce49c8d1991d8110e10352ad2813c5dd4b85da3

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Joe McIlvain
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/ext/rabbitmq/Rakefile

@@ -0,0 +1,42 @@
+
+require 'rake/clean'
+
+FILES = {}
+
+task :default => :build
+
+def self.file_task(filename, opts, &block)
+  name, dep = opts.is_a?(Hash) ? opts.to_a.first : [opts, nil]
+  
+  FILES[name] = filename
+  CLEAN.include filename
+  task name => filename
+  
+  if dep
+    file filename => FILES[dep], &block
+  else
+    file filename, &block
+  end
+end
+
+file_task 'rabbitmq-c.tar.gz', :download_tarball do
+  version = "0.6.0"
+  release = "https://github.com/alanxz/rabbitmq-c/releases/download/v#{version}/rabbitmq-c-#{version}.tar.gz"
+  system "wget #{release}"
+  system "mv #{File.basename(release)} #{FILES[:download_tarball]}"
+end
+
+file_task 'rabbitmq-c', :download => :download_tarball do
+  system "tar -xf #{FILES[:download_tarball]}"
+  system "mv rabbitmq-c-* #{FILES[:download]}"
+end
+
+file_task 'config.status', :configure => :download do
+  system "bash -c 'cd #{FILES[:download]} && ./configure'"
+  system "cp #{FILES[:download]}/#{FILES[:configure]} ./"
+end
+
+file_task 'librabbitmq.so', :build => :configure do
+  system "bash -c 'cd #{FILES[:download]} && make'"
+  system "cp #{FILES[:download]}/librabbitmq/.libs/#{FILES[:build]} ."
+end

data/lib/rabbitmq.rb

@@ -1,2 +1,8 @@
 
 require_relative 'rabbitmq/ffi'
+require_relative 'rabbitmq/ffi/ext'
+require_relative 'rabbitmq/ffi/error'
+
+require_relative 'rabbitmq/util'
+
+require_relative 'rabbitmq/connection'

data/lib/rabbitmq/connection.rb

@@ -0,0 +1,112 @@
+
+module RabbitMQ
+  class Connection
+    def initialize *args
+      @ptr = FFI.amqp_new_connection
+      parse_info(*args)
+      create_socket!
+      
+      @finalizer = self.class.send :create_finalizer_for, @ptr
+      ObjectSpace.define_finalizer self, @finalizer
+    end
+    
+    def destroy
+      if @finalizer
+        @finalizer.call
+        ObjectSpace.undefine_finalizer self
+      end
+      @ptr = @socket = @finalizer = nil
+    end
+    
+    class DestroyedError < RuntimeError; end
+    
+    # @private
+    def self.create_finalizer_for(ptr)
+      Proc.new do
+        FFI.amqp_connection_close(ptr, 200)
+        FFI.amqp_destroy_connection(ptr)
+      end
+    end
+    
+    def user;     @info[:user];     end
+    def password; @info[:password]; end
+    def host;     @info[:host];     end
+    def vhost;    @info[:vhost];    end
+    def port;     @info[:port];     end
+    def ssl?;     @info[:ssl];      end
+    
+    def max_channels;   @max_channels   ||= 0;      end; attr_writer :max_channels
+    def max_frame_size; @max_frame_size ||= 131072; end; attr_writer :max_frame_size
+    def heartbeat_interval; 0; end # not fully implemented in librabbitmq
+    
+    def start
+      close # Close if already open
+      connect_socket!
+      login!
+      open_channel!
+    end
+    
+    def close
+      raise DestroyedError unless @ptr
+      FFI.amqp_connection_close(@ptr, 200)
+    end
+    
+    private def parse_info url=nil
+      info = FFI::ConnectionInfo.new
+      
+      if url
+        url_ptr = Util.strdup_ptr(url)
+        Util.error_check :"parsing connection URL",
+          FFI.amqp_parse_url(url_ptr, info)
+        
+        # We must copy ConnectionInfo before the url_ptr is freed.
+        @info = info.to_h
+        url_ptr.free
+      else
+        FFI.amqp_default_connection_info(info)
+        @info = info.to_h
+      end
+    end
+    
+    private def create_socket!
+      raise DestroyedError unless @ptr
+      
+      @socket = FFI.amqp_tcp_socket_new(@ptr)
+      Util.null_check :"creating a socket", @socket
+    end
+    
+    private def connect_socket!
+      raise DestroyedError unless @ptr
+      raise NotImplementedError if ssl?
+      
+      create_socket!
+      Util.error_check :"opening a socket",
+        FFI.amqp_socket_open(@socket, host, port)
+    end
+    
+    private def login!
+      raise DestroyedError unless @ptr
+      
+      rpc_check :"logging in",
+        FFI.amqp_login(@ptr, vhost, max_channels, max_frame_size,
+          heartbeat_interval, :plain, :string, user, :string, password)
+      
+      @server_properties = FFI::Table.new(FFI.amqp_get_server_properties(@ptr)).to_h
+    end
+    
+    private def open_channel!(number=1)
+      raise DestroyedError unless @ptr
+      
+      FFI.amqp_channel_open(@ptr, number)
+      rpc_check :"opening channel", FFI.amqp_get_rpc_reply(@ptr)
+    end
+    
+    private def rpc_check action, res
+      case res[:reply_type]
+      when :library_exception; Util.error_check action, res[:library_error]
+      when :server_exception;  raise NotImplementedError
+      else res
+      end
+    end
+  end
+end

data/lib/rabbitmq/ffi.rb

@@ -6,24 +6,10 @@ module RabbitMQ
   module FFI
     extend ::FFI::Library
     
-    def self.available?
-      @available
-    end
-    
-    begin
-      lib_name = 'librabbitmq'
-      lib_paths = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64']
-        .map { |path| "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}" }
-      ffi_lib lib_paths + [lib_name]
-      @available = true
-    rescue LoadError
-      warn ""
-      warn "WARNING: #{self} is not available without librabbitmq."
-      warn ""
-      @available = false
-    end
+    ffi_lib \
+      File.expand_path("../../ext/rabbitmq/librabbitmq.so", File.dirname(__FILE__))
     
-    if available?
+    begin # TODO: remove begin/end block
       opts = {
         blocking: true  # only necessary on MRI to deal with the GIL.
       }
@@ -33,10 +19,87 @@ module RabbitMQ
       attach_function :amqp_version_number, [], :uint32, **opts
       attach_function :amqp_version,        [], :string, **opts
       
-      Boolean      = :int
-      MethodNumber = :uint32
-      Flags        = :uint32
-      Channel      = :uint16
+      class Timeval < ::FFI::Struct
+        layout :tv_sec,  :time_t,
+               :tv_usec, :suseconds_t
+      end
+      
+      class Boolean
+        extend ::FFI::DataConverter
+        native_type ::FFI::TypeDefs[:int]
+        def self.to_native val, ctx;   val ? 1 : 0; end
+        def self.from_native val, ctx; val != 0;    end
+      end
+      
+      MethodNumber = enum ::FFI::TypeDefs[:uint32], [
+        :connection_start,     0x000A000A, # 10, 10; 655370
+        :connection_start_ok,  0x000A000B, # 10, 11; 655371
+        :connection_secure,    0x000A0014, # 10, 20; 655380
+        :connection_secure_ok, 0x000A0015, # 10, 21; 655381
+        :connection_tune,      0x000A001E, # 10, 30; 655390
+        :connection_tune_ok,   0x000A001F, # 10, 31; 655391
+        :connection_open,      0x000A0028, # 10, 40; 655400
+        :connection_open_ok,   0x000A0029, # 10, 41; 655401
+        :connection_close,     0x000A0032, # 10, 50; 655410
+        :connection_close_ok,  0x000A0033, # 10, 51; 655411
+        :connection_blocked,   0x000A003C, # 10, 60; 655420
+        :connection_unblocked, 0x000A003D, # 10, 61; 655421
+        :channel_open,         0x0014000A, # 20, 10; 1310730
+        :channel_open_ok,      0x0014000B, # 20, 11; 1310731
+        :channel_flow,         0x00140014, # 20, 20; 1310740
+        :channel_flow_ok,      0x00140015, # 20, 21; 1310741
+        :channel_close,        0x00140028, # 20, 40; 1310760
+        :channel_close_ok,     0x00140029, # 20, 41; 1310761
+        :access_request,       0x001E000A, # 30, 10; 1966090
+        :access_request_ok,    0x001E000B, # 30, 11; 1966091
+        :exchange_declare,     0x0028000A, # 40, 10; 2621450
+        :exchange_declare_ok,  0x0028000B, # 40, 11; 2621451
+        :exchange_delete,      0x00280014, # 40, 20; 2621460
+        :exchange_delete_ok,   0x00280015, # 40, 21; 2621461
+        :exchange_bind,        0x0028001E, # 40, 30; 2621470
+        :exchange_bind_ok,     0x0028001F, # 40, 31; 2621471
+        :exchange_unbind,      0x00280028, # 40, 40; 2621480
+        :exchange_unbind_ok,   0x00280033, # 40, 51; 2621491
+        :queue_declare,        0x0032000A, # 50, 10; 3276810
+        :queue_declare_ok,     0x0032000B, # 50, 11; 3276811
+        :queue_bind,           0x00320014, # 50, 20; 3276820
+        :queue_bind_ok,        0x00320015, # 50, 21; 3276821
+        :queue_purge,          0x0032001E, # 50, 30; 3276830
+        :queue_purge_ok,       0x0032001F, # 50, 31; 3276831
+        :queue_delete,         0x00320028, # 50, 40; 3276840
+        :queue_delete_ok,      0x00320029, # 50, 41; 3276841
+        :queue_unbind,         0x00320032, # 50, 50; 3276850
+        :queue_unbind_ok,      0x00320033, # 50, 51; 3276851
+        :basic_qos,            0x003C000A, # 60, 10; 3932170
+        :basic_qos_ok,         0x003C000B, # 60, 11; 3932171
+        :basic_consume,        0x003C0014, # 60, 20; 3932180
+        :basic_consume_ok,     0x003C0015, # 60, 21; 3932181
+        :basic_cancel,         0x003C001E, # 60, 30; 3932190
+        :basic_cancel_ok,      0x003C001F, # 60, 31; 3932191
+        :basic_publish,        0x003C0028, # 60, 40; 3932200
+        :basic_return,         0x003C0032, # 60, 50; 3932210
+        :basic_deliver,        0x003C003C, # 60, 60; 3932220
+        :basic_get,            0x003C0046, # 60, 70; 3932230
+        :basic_get_ok,         0x003C0047, # 60, 71; 3932231
+        :basic_get_empty,      0x003C0048, # 60, 72; 3932232
+        :basic_ack,            0x003C0050, # 60, 80; 3932240
+        :basic_reject,         0x003C005A, # 60, 90; 3932250
+        :basic_recover_async,  0x003C0064, # 60, 100; 3932260
+        :basic_recover,        0x003C006E, # 60, 110; 3932270
+        :basic_recover_ok,     0x003C006F, # 60, 111; 3932271
+        :basic_nack,           0x003C0078, # 60, 120; 3932280
+        :tx_select,            0x005A000A, # 90, 10; 5898250
+        :tx_select_ok,         0x005A000B, # 90, 11; 5898251
+        :tx_commit,            0x005A0014, # 90, 20; 5898260
+        :tx_commit_ok,         0x005A0015, # 90, 21; 5898261
+        :tx_rollback,          0x005A001E, # 90, 30; 5898270
+        :tx_rollback_ok,       0x005A001F, # 90, 31; 5898271
+        :confirm_select,       0x0055000A, # 85, 10; 5570570
+        :confirm_select_ok,    0x0055000B, # 85, 11; 5570571
+      ]
+      
+      Flags   = :uint32
+      Channel = :uint16
       
       class Bytes < ::FFI::Struct
         layout :len,   :size_t,
@@ -58,6 +121,27 @@ module RabbitMQ
                :entries,     :pointer
       end
       
+      FieldValueKind = enum ::FFI::TypeDefs[:uint8], [
+        :boolean,   't'.ord,
+        :i8,        'b'.ord,
+        :u8,        'B'.ord,
+        :i16,       's'.ord,
+        :u16,       'u'.ord,
+        :i32,       'I'.ord,
+        :u32,       'i'.ord,
+        :i64,       'l'.ord,
+        :u64,       'L'.ord,
+        :f32,       'f'.ord,
+        :f64,       'd'.ord,
+        :decimal,   'D'.ord,
+        :utf8,      'S'.ord,
+        :array,     'A'.ord,
+        :timestamp, 'T'.ord,
+        :table,     'F'.ord,
+        :void,      'V'.ord,
+        :bytes,     'x'.ord,
+      ]
+      
       class FieldValueValue < ::FFI::Union
         layout :boolean, Boolean,
                :i8,      :int8,
@@ -77,7 +161,7 @@ module RabbitMQ
       end
       
       class FieldValue < ::FFI::Struct
-        layout :kind,  :uint8,
+        layout :kind,  FieldValueKind,
                :value, FieldValueValue
       end
       
@@ -86,27 +170,6 @@ module RabbitMQ
                :value, FieldValue
       end
       
-      FieldValueKindEnum = enum [
-        :boolean,   't'.ord,
-        :i8,        'b'.ord,
-        :u8,        'B'.ord,
-        :i16,       's'.ord,
-        :u16,       'u'.ord,
-        :i32,       'I'.ord,
-        :u32,       'i'.ord,
-        :i64,       'l'.ord,
-        :u64,       'L'.ord,
-        :f32,       'f'.ord,
-        :f64,       'd'.ord,
-        :decimal,   'D'.ord,
-        :utf8,      'S'.ord,
-        :array,     'A'.ord,
-        :timestamp, 'T'.ord,
-        :table,     'F'.ord,
-        :void,      'V'.ord,
-        :bytes,     'x'.ord,
-      ]
-      
       class PoolBlocklist < ::FFI::Struct
         layout :num_blocks, :int,
                :blocklist,  :pointer
@@ -153,7 +216,7 @@ module RabbitMQ
                :payload,    FramePayload
       end
       
-      ResponseTypeEnum = enum [
+      ResponseType = enum [
         :none, 0,
         :normal,
         :library_exception,
@@ -161,18 +224,18 @@ module RabbitMQ
       ]
       
       class RpcReply < ::FFI::Struct
-        layout :reply_type,    ResponseTypeEnum,
+        layout :reply_type,    ResponseType,
                :reply,         Method,
                :library_error, :int
       end
       
-      SaslMethodEnum = enum [
+      SaslMethod = enum [
         :plain, 0,
       ]
       
       ConnectionState = :pointer
       
-      StatusEnum = enum [
+      Status = enum [
         :ok,                          0x0,
         :no_memory,                  -0x0001,
         :bad_amqp_data,              -0x0002,
@@ -190,6 +253,8 @@ module RabbitMQ
         :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,
@@ -198,7 +263,7 @@ module RabbitMQ
         :ssl_connection_failed,      -0x0203,
       ]
       
-      DeliveryModeEnum = enum [
+      DeliveryMode = enum [
         :nonpersistent, 1,
         :persistent,    2,
       ]
@@ -208,10 +273,10 @@ module RabbitMQ
       
       attach_function :amqp_method_name,        [MethodNumber],                            :string, **opts
       attach_function :amqp_method_has_content, [MethodNumber],                            Boolean, **opts
-      attach_function :amqp_decode_method,      [MethodNumber, :pointer, Bytes, :pointer], :int,    **opts
-      attach_function :amqp_decode_properties,  [:uint16, :pointer, Bytes, :pointer],      :int,    **opts
-      attach_function :amqp_encode_method,      [MethodNumber, :pointer, Bytes],           :int,    **opts
-      attach_function :amqp_encode_properties,  [:uint16, :pointer, Bytes],                :int,    **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
       
       class ConnectionStart < ::FFI::Struct
         layout :version_major,     :uint8,
@@ -622,31 +687,31 @@ module RabbitMQ
                :cluster_id,       Bytes
       end
       
-      attach_function :amqp_channel_open,     [ConnectionState, Channel],                                                   :pointer, **opts
-      attach_function :amqp_channel_flow,     [ConnectionState, Channel, Boolean],                                          :pointer, **opts
-      attach_function :amqp_exchange_declare, [ConnectionState, Channel, Bytes, Bytes, Boolean, Boolean, Table],            :pointer, **opts
-      attach_function :amqp_exchange_delete,  [ConnectionState, Channel, Bytes, Boolean],                                   :pointer, **opts
-      attach_function :amqp_exchange_bind,    [ConnectionState, Channel, Bytes, Bytes, Bytes, Table],                       :pointer, **opts
-      attach_function :amqp_exchange_unbind,  [ConnectionState, Channel, Bytes, Bytes, Bytes, Table],                       :pointer, **opts
-      attach_function :amqp_queue_declare,    [ConnectionState, Channel, Bytes, Boolean, Boolean, Boolean, Boolean, Table], :pointer, **opts
-      attach_function :amqp_queue_bind,       [ConnectionState, Channel, Bytes, Bytes, Bytes, Table],                       :pointer, **opts
-      attach_function :amqp_queue_purge,      [ConnectionState, Channel, Bytes],                                            :pointer, **opts
-      attach_function :amqp_queue_delete,     [ConnectionState, Channel, Bytes, Boolean, Boolean],                          :pointer, **opts
-      attach_function :amqp_queue_unbind,     [ConnectionState, Channel, Bytes, Bytes, Bytes, Table],                       :pointer, **opts
-      attach_function :amqp_basic_qos,        [ConnectionState, Channel, :uint32, :uint16, Boolean],                        :pointer, **opts
-      attach_function :amqp_basic_consume,    [ConnectionState, Channel, Bytes, Bytes, Boolean, Boolean, Boolean, Table],   :pointer, **opts
-      attach_function :amqp_basic_cancel,     [ConnectionState, Channel, Bytes],                                            :pointer, **opts
-      attach_function :amqp_basic_recover,    [ConnectionState, Channel, Boolean],                                          :pointer, **opts
-      attach_function :amqp_tx_select,        [ConnectionState, Channel],                                                   :pointer, **opts
-      attach_function :amqp_tx_commit,        [ConnectionState, Channel],                                                   :pointer, **opts
-      attach_function :amqp_tx_rollback,      [ConnectionState, Channel],                                                   :pointer, **opts
-      attach_function :amqp_confirm_select,   [ConnectionState, Channel],                                                   :pointer, **opts
-      
-      attach_function :init_amqp_pool,        [:pointer, :size_t],           :void,    **opts
-      attach_function :recycle_amqp_pool,     [:pointer],                    :void,    **opts
-      attach_function :empty_amqp_pool,       [:pointer],                    :void,    **opts
-      attach_function :amqp_pool_alloc,       [:pointer, :size_t],           :pointer, **opts
-      attach_function :amqp_pool_alloc_bytes, [:pointer, :size_t, :pointer], :void,    **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, 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 :init_amqp_pool,        [Pool.ptr, :size_t],            :void,    **opts
+      attach_function :recycle_amqp_pool,     [Pool.ptr],                     :void,    **opts
+      attach_function :empty_amqp_pool,       [Pool.ptr],                     :void,    **opts
+      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
@@ -654,51 +719,55 @@ module RabbitMQ
       attach_function :amqp_bytes_free,       [Bytes],   :void, **opts
       
       attach_function :amqp_new_connection, [], ConnectionState, **opts
-      attach_function :amqp_get_sockfd,         [ConnectionState],                   :int,  **opts
-      attach_function :amqp_set_sockfd,         [ConnectionState, :int],             :void, **opts
-      attach_function :amqp_tune_connection,    [ConnectionState, :int, :int, :int], :int,  **opts
-      attach_function :amqp_get_channel_max,    [ConnectionState],                   :int,  **opts
-      attach_function :amqp_destroy_connection, [ConnectionState],                   :int,  **opts
-      
-      attach_function :amqp_handle_input,                     [ConnectionState, Bytes, :pointer], :int,    **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, :pointer],        :int,    **opts
+      attach_function :amqp_get_sockfd,         [ConnectionState],                   :int,   **opts
+      attach_function :amqp_set_sockfd,         [ConnectionState, :int],             :void,  **opts
+      attach_function :amqp_tune_connection,    [ConnectionState, :int, :int, :int], Status, **opts
+      attach_function :amqp_get_channel_max,    [ConnectionState],                   :int,   **opts
+      attach_function :amqp_get_frame_max,      [ConnectionState],                   :int,   **opts
+      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_table_entry_cmp, [:pointer, :pointer], :int, **opts
-      attach_function :amqp_open_socket,     [:string, :int],      :int, **opts
-      
-      attach_function :amqp_send_header,               [ConnectionState],                                  :int,    **opts
-      attach_function :amqp_frames_enqueued,           [ConnectionState],                                  Boolean, **opts
-      attach_function :amqp_simple_wait_frame,         [ConnectionState, :pointer],                        :int,    **opts
-      attach_function :amqp_simple_wait_frame_noblock, [ConnectionState, :pointer, :pointer],              :int,    **opts
-      attach_function :amqp_simple_wait_method,        [ConnectionState, Channel, MethodNumber, :pointer], :int,    **opts
-      attach_function :amqp_send_method,               [ConnectionState, Channel, MethodNumber, :pointer], :int,    **opts
-      
-      attach_function :amqp_simple_rpc,            [ConnectionState, Channel, MethodNumber, :pointer, :pointer],           RpcReply, **opts
-      attach_function :amqp_simple_rpc_decoded,    [ConnectionState, Channel, MethodNumber, MethodNumber, :pointer],       :pointer, **opts
-      attach_function :amqp_get_rpc_reply,         [ConnectionState],                                                      RpcReply, **opts
-      attach_function :amqp_login,                 [ConnectionState, :string, :int, :int, :int, SaslMethodEnum],           RpcReply, **opts
-      attach_function :amqp_login_with_properties, [ConnectionState, :string, :int, :int, :int, :pointer, SaslMethodEnum], RpcReply, **opts
-      attach_function :amqp_channel_close,         [ConnectionState, Channel, :int],                                       RpcReply, **opts
-      attach_function :amqp_connection_close,      [ConnectionState, :int],                                                RpcReply, **opts
-      
-      attach_function :amqp_basic_publish, [ConnectionState, Channel, Bytes, Bytes, Boolean, Boolean, :pointer, Bytes], :int, **opts
-      attach_function :amqp_basic_ack,     [ConnectionState, Channel, :uint64, Boolean],                                :int, **opts
-      attach_function :amqp_basic_get,     [ConnectionState, Channel, Bytes, Boolean],                                  :int, **opts
-      attach_function :amqp_basic_reject,  [ConnectionState, Channel, :uint64, Boolean],                                :int, **opts
-      attach_function :amqp_basic_nack,    [ConnectionState, Channel, :uint64, Boolean, Boolean],                       :int, **opts
+      
+      attach_function :amqp_open_socket, [:string, :int], Status, **opts
+      
+      attach_function :amqp_send_header,               [ConnectionState],                                    Status,  **opts
+      attach_function :amqp_frames_enqueued,           [ConnectionState],                                    Boolean, **opts
+      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_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_basic_publish, [ConnectionState, Channel, Bytes, Bytes, Boolean, Boolean, BasicProperties.ptr, Bytes], RpcReply.by_value, **opts
+      
+      attach_function :amqp_basic_get,     [ConnectionState, Channel, Bytes, 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
       
       attach_function :amqp_data_in_buffer, [ConnectionState], Boolean, **opts
       
       attach_function :amqp_error_string,  [:int], :string, **opts
       attach_function :amqp_error_string2, [:int], :string, **opts
       
-      attach_function :amqp_decode_table, [Bytes, :pointer, :pointer, :pointer], :int, **opts
-      attach_function :amqp_encode_table, [Bytes, :pointer, :pointer],           :int, **opts
-      attach_function :amqp_table_clone,  [:pointer, :pointer, :pointer],        :int, **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_table_clone,  [Table.ptr, Table.ptr, Pool.ptr],       Status, **opts
       
       class Message < ::FFI::Struct
         layout :properties, BasicProperties,
@@ -706,8 +775,8 @@ module RabbitMQ
                :pool,       Pool
       end
       
-      attach_function :amqp_read_message,    [ConnectionState, Channel, :pointer, :int], RpcReply, **opts
-      attach_function :amqp_destroy_message, [:pointer],                                 :void,    **opts
+      attach_function :amqp_read_message,    [ConnectionState, Channel, Message.ptr, :int], RpcReply.by_value, **opts
+      attach_function :amqp_destroy_message, [Message.ptr],                                 :void,             **opts
       
       class Envelope < ::FFI::Struct
         layout :channel,      Channel,
@@ -719,8 +788,8 @@ module RabbitMQ
                :message,      Message
       end
       
-      attach_function :amqp_consume_message,  [ConnectionState, :pointer, :pointer, :int], RpcReply, **opts
-      attach_function :amqp_destroy_envelope, [:pointer],                                  :void,    **opts
+      attach_function :amqp_consume_message,  [ConnectionState, Envelope.ptr, Timeval.ptr, :int], RpcReply.by_value, **opts
+      attach_function :amqp_destroy_envelope, [Envelope.ptr],                                     :void,             **opts
       
       class ConnectionInfo < ::FFI::Struct
         layout :user,     :string,
@@ -731,13 +800,23 @@ module RabbitMQ
                :ssl,      Boolean
       end
       
-      attach_function :amqp_default_connection_info, [:pointer],                          :void,    **opts
-      attach_function :amqp_parse_url,               [:string, :pointer],                 :int,     **opts
-      attach_function :amqp_socket_open,             [:pointer, :string, :int],           :int,     **opts
-      attach_function :amqp_socket_open_noblock,     [:pointer, :string, :int, :pointer], :int,     **opts
-      attach_function :amqp_socket_get_sockfd,       [:pointer],                          :int,     **opts
-      attach_function :amqp_get_socket,              [ConnectionState],                   :pointer, **opts
-      attach_function :amqp_get_server_properties,   [ConnectionState],                   Table,    **opts
+      attach_function :amqp_default_connection_info, [ConnectionInfo.ptr],                   :void,    **opts
+      attach_function :amqp_parse_url,               [:pointer, ConnectionInfo.ptr],         Status,   **opts
+      attach_function :amqp_socket_open,             [:pointer, :string, :int],              Status,   **opts
+      attach_function :amqp_socket_open_noblock,     [:pointer, :string, :int, Timeval.ptr], Status,   **opts
+      attach_function :amqp_socket_get_sockfd,       [:pointer],                             :int,     **opts
+      attach_function :amqp_get_socket,              [ConnectionState],                      :pointer, **opts
+      attach_function :amqp_get_server_properties,   [ConnectionState],                      Table,    **opts
+      
+      attach_function :amqp_tcp_socket_new,        [ConnectionState], :pointer, **opts
+      attach_function :amqp_tcp_socket_set_sockfd, [:pointer, :int],  :void,    **opts
+      
+      attach_function :amqp_ssl_socket_new,             [ConnectionState],                      :pointer, **opts
+      attach_function :amqp_ssl_socket_set_cacert,      [:pointer, :string],                    Status,   **opts
+      attach_function :amqp_ssl_socket_set_key,         [:pointer, :string, :string],           Status,   **opts
+      attach_function :amqp_ssl_socket_set_key_buffer,  [:pointer, :string, :pointer, :size_t], Status,   **opts
+      attach_function :amqp_ssl_socket_set_verify,      [:pointer, Boolean],                    :void,    **opts
+      attach_function :amqp_set_initialize_ssl_library, [Boolean],                              :void,    **opts
     end
   end
 end

data/lib/rabbitmq/ffi/error.rb

@@ -0,0 +1,42 @@
+
+module RabbitMQ
+  module FFI
+    
+    class Error < RuntimeError
+      def initialize message=nil
+        @message = message
+      end
+      
+      def message
+        if @message && status_message; "#{status_message} - #{@message}"
+        elsif @message;                @message
+        elsif status_message;          status_message
+        else;                          ""
+        end
+      end
+      
+      def status_message
+        nil
+      end
+      
+      @lookup_table = {}
+      class << self
+        attr_reader :lookup_table
+      end
+      
+      def self.lookup status
+        lookup_table.fetch(status)
+      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 }
+        
+        kls = Class.new(Error) { define_method(:status_message) { message } }
+        lookup_table[status] = kls
+        const_set const_name, kls
+      end
+    end
+    
+  end
+end

data/lib/rabbitmq/ffi/ext.rb

@@ -0,0 +1,63 @@
+
+module RabbitMQ
+  module FFI
+    
+    class ConnectionInfo
+      def to_h
+        members.map { |k| [k, self[k]] }.to_h
+      end
+    end
+    
+    class Bytes
+      def to_s
+        ::FFI::Pointer.new(self[:bytes]).read_bytes(self[:len])
+      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
+      end
+    end
+    
+    class FieldValue
+      private def value_member(kind)
+        case kind
+        when :utf8;      :bytes
+        when :timestamp; :u64
+        else kind
+        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)
+        when :timestamp; Time.at(value / 1000.0)
+        when :table;     value.to_h
+        when :array;     value.to_array_not_yet_implemented!
+        when :decimal;   value.to_value_not_yet_implemented!
+        else value
+        end
+      end
+    end
+    
+    class Table
+      def to_h
+        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
+      end
+    end
+    
+  end
+end

data/lib/rabbitmq/util.rb

@@ -0,0 +1,36 @@
+
+class RabbitMQ::FFI::Error < RuntimeError; end
+
+module RabbitMQ::Util
+  class << self
+    
+    def error_check action, status
+      return if status == :ok
+      raise RabbitMQ::FFI::Error.lookup(status), "while #{action}"
+    end
+    
+    def null_check action, obj
+      return unless obj.nil?
+      raise RabbitMQ::FFI::Error, "while #{action} - got unexpected null"
+    end
+    
+    def mem_ptr size, count: 1, clear: true, release: true
+      ptr = ::FFI::MemoryPointer.new(size, count, clear)
+      ptr.autorelease = false unless release
+      ptr
+    end
+    
+    def arg_ptr type, **kwargs
+      type = ::FFI::TypeDefs[type] if type.is_a?(Symbol)
+      mem_ptr(type.size, clear: false, **kwargs)
+    end
+    
+    def strdup_ptr str, **kwargs
+      str = str + "\x00"
+      ptr = mem_ptr(str.bytesize, **kwargs)
+      ptr.write_string(str)
+      ptr
+    end
+    
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -111,12 +111,19 @@ dependencies:
 description: A Ruby RabbitMQ client library based on FFI bindings for librabbitmq.
 email: joe.eli.mac@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/rabbitmq/Rakefile
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
+- ext/rabbitmq/Rakefile
 - lib/rabbitmq.rb
+- lib/rabbitmq/connection.rb
 - lib/rabbitmq/ffi.rb
+- lib/rabbitmq/ffi/error.rb
+- lib/rabbitmq/ffi/ext.rb
+- lib/rabbitmq/util.rb
 homepage: https://github.com/jemc/rabbitmq/
 licenses:
 - MIT