rmq 0.0.6 → 0.0.7

data/lib/rmq/object_descriptor.rb

@@ -1,41 +1,41 @@
-module RMQ
-  module MQClient
-
-    class ObjectDescriptor < FFI::Struct
-      MQOD_STRUC_ID             = "OD  "
-      MQOD_VERSION_1            = 1
-
-      # Object Types
-      MQOT_NONE       = 0
-      MQOT_Q          = 1
-      MQOT_NAMELIST   = 2
-      MQOT_PROCESS    = 3
-      MQOT_STORAGE_CLASS = 4
-      MQOT_Q_MGR      = 5
-      MQOT_CHANNEL    = 6
-      MQOT_AUTH_INFO  = 7
-      MQOT_TOPIC      = 8
-      MQOT_CF_STRUC   = 10
-      MQOT_LISTENER   = 11
-      MQOT_SERVICE    = 12
-      MQOT_RESERVED_1 = 999
-      
-      
-      layout  :StrucId, [:char, 4],
-        :Version, :long,
-        :ObjectType, :long,
-        :ObjectName, [:char, 48],
-        :ObjectQMgrName, [:char, 48],
-        :DynamicQName, [:char, 48],
-        :AlternateUserId, [:char, 12],
-        :RecsPresent, :long,
-        :KnownDestCount, :long,
-        :UnknownDestCount, :long,
-        :InvalidDestCount, :long,
-        :ObjectRecOffset, :long,
-        :ResponseRecOffset, :long,
-        :ObjectRecPtr, :pointer,
-        :ResponseRecPtr, :pointer
-    end
-  end
-end
+module RMQ
+  module MQClient
+
+    class ObjectDescriptor < FFI::Struct
+      MQOD_STRUC_ID             = "OD  "
+      MQOD_VERSION_1            = 1
+
+      # Object Types
+      MQOT_NONE       = 0
+      MQOT_Q          = 1
+      MQOT_NAMELIST   = 2
+      MQOT_PROCESS    = 3
+      MQOT_STORAGE_CLASS = 4
+      MQOT_Q_MGR      = 5
+      MQOT_CHANNEL    = 6
+      MQOT_AUTH_INFO  = 7
+      MQOT_TOPIC      = 8
+      MQOT_CF_STRUC   = 10
+      MQOT_LISTENER   = 11
+      MQOT_SERVICE    = 12
+      MQOT_RESERVED_1 = 999
+      
+      
+      layout  :StrucId, [:char, 4],
+        :Version, :long,
+        :ObjectType, :long,
+        :ObjectName, [:char, 48],
+        :ObjectQMgrName, [:char, 48],
+        :DynamicQName, [:char, 48],
+        :AlternateUserId, [:char, 12],
+        :RecsPresent, :long,
+        :KnownDestCount, :long,
+        :UnknownDestCount, :long,
+        :InvalidDestCount, :long,
+        :ObjectRecOffset, :long,
+        :ResponseRecOffset, :long,
+        :ObjectRecPtr, :pointer,
+        :ResponseRecPtr, :pointer
+    end
+  end
+end

data/lib/rmq/put_message_options.rb

@@ -1,31 +1,31 @@
-module RMQ
-  module MQClient
-
-    class PutMessageOptions < FFI::Struct
-      MQPMO_STRUC_ID    = "PMO "
-      MQPMO_VERSION_1   = 1
-      MQPMO_SYNCPOINT   = 0x00000002
-
-      layout  :StrucId, [:char, 4],
-        :Version, :long,
-        :Options, :long,
-        :Timeout, :long,
-        :Context, :long,
-        :KnownDestCount, :long,
-        :UnknownDestCount, :long,
-        :InvalidDestCount, :long,
-        :ResolvedQName, [:char, 48],
-        :ResolvedQMgrName, [:char, 48],
-        :RecsPresent, :long,
-        :PutMsgRecFields, :long,
-        :PutMsgRecOffset, :long,
-        :ResponseRecOffset, :long,
-        :PutMsgRecPtr, :pointer,
-        :ResponseRecPtr, :pointer,
-        :OriginalMsgHandle, :int64,
-        :NewMsgHandle, :int64,
-        :Action, :long,
-        :PubLevel, :long
-    end
-  end
-end
+module RMQ
+  module MQClient
+
+    class PutMessageOptions < FFI::Struct
+      MQPMO_STRUC_ID    = "PMO "
+      MQPMO_VERSION_1   = 1
+      MQPMO_SYNCPOINT   = 0x00000002
+
+      layout  :StrucId, [:char, 4],
+        :Version, :long,
+        :Options, :long,
+        :Timeout, :long,
+        :Context, :long,
+        :KnownDestCount, :long,
+        :UnknownDestCount, :long,
+        :InvalidDestCount, :long,
+        :ResolvedQName, [:char, 48],
+        :ResolvedQMgrName, [:char, 48],
+        :RecsPresent, :long,
+        :PutMsgRecFields, :long,
+        :PutMsgRecOffset, :long,
+        :ResponseRecOffset, :long,
+        :PutMsgRecPtr, :pointer,
+        :ResponseRecPtr, :pointer,
+        :OriginalMsgHandle, :int64,
+        :NewMsgHandle, :int64,
+        :Action, :long,
+        :PubLevel, :long
+    end
+  end
+end

data/lib/rmq/queue.rb

@@ -1,55 +1,55 @@
-module RMQ
-  class Queue
-    include MQClient
-
-    # TODO add some caching for the queue handle
-
-    def initialize(queue_manager, name)
-      @queue_manager = queue_manager
-      @queue_name = name
-    end
-
-    # Puts a message onto the queue. A reply to queue name can be specified.
-    def put_message(payload, reply_queue_name = "")
-      @queue_handle = open_queue(@queue_manager.connection_handle, @queue_name, Constants::MQOO_OUTPUT) if @queue_handle.nil?
-
-      put_message_on_queue(@queue_manager.connection_handle, @queue_handle, payload, reply_queue_name)
-
-      close_queue(@queue_manager.connection_handle, @queue_handle, Constants::MQCO_NONE)
-      @queue_handle = nil
-    end
-
-    def depth
-      queue_depth(@queue_manager.connection_handle, @queue_name)
-    end
-
-    # Gets a message from the queue. A timeout period can be specified in seconds.
-    def get_message(timeout = 0)
-      @queue_handle = open_queue(@queue_manager.connection_handle, @queue_name, Constants::MQOO_INPUT_SHARED) if @queue_handle.nil?
-
-      if (timeout > 0)
-        begin_time = Time.now.to_i
-        begin
-          message = get_message_from_queue(@queue_manager.connection_handle, @queue_handle, timeout)
-        rescue RMQException
-          end_time = Time.now.to_i
-          raise RMQTimeOutError.new if end_time - begin_time >= timeout
-        end
-      else
-        message = get_message_from_queue(@queue_manager.connection_handle, @queue_handle, 0)
-      end
-
-      close_queue(@queue_manager.connection_handle, @queue_handle, Constants::MQCO_NONE)
-      @queue_handle = nil
-
-      message
-    end
-
-    # Gets a message from the queue and returns the payload only. A timeout period can be specified
-    # in seconds.
-    def get_message_payload(timeout = 0)
-      message = get_message(timeout)
-      message.payload
-    end
-  end
+module RMQ
+  class Queue
+    include MQClient
+
+    # TODO add some caching for the queue handle
+
+    def initialize(queue_manager, name)
+      @queue_manager = queue_manager
+      @queue_name = name
+    end
+
+    # Puts a message onto the queue. A reply to queue name can be specified.
+    def put_message(payload, reply_queue_name = "")
+      @queue_handle = open_queue(@queue_manager.connection_handle, @queue_name, Constants::MQOO_OUTPUT) if @queue_handle.nil?
+
+      put_message_on_queue(@queue_manager.connection_handle, @queue_handle, payload, reply_queue_name)
+
+      close_queue(@queue_manager.connection_handle, @queue_handle, Constants::MQCO_NONE)
+      @queue_handle = nil
+    end
+
+    def depth
+      queue_depth(@queue_manager.connection_handle, @queue_name)
+    end
+
+    # Gets a message from the queue. A timeout period can be specified in seconds.
+    def get_message(timeout = 0)
+      @queue_handle = open_queue(@queue_manager.connection_handle, @queue_name, Constants::MQOO_INPUT_SHARED) if @queue_handle.nil?
+
+      if (timeout > 0)
+        begin_time = Time.now.to_i
+        begin
+          message = get_message_from_queue(@queue_manager.connection_handle, @queue_handle, timeout)
+        rescue RMQException
+          end_time = Time.now.to_i
+          raise RMQTimeOutError.new if end_time - begin_time >= timeout
+        end
+      else
+        message = get_message_from_queue(@queue_manager.connection_handle, @queue_handle, 0)
+      end
+
+      close_queue(@queue_manager.connection_handle, @queue_handle, Constants::MQCO_NONE)
+      @queue_handle = nil
+
+      message
+    end
+
+    # Gets a message from the queue and returns the payload only. A timeout period can be specified
+    # in seconds.
+    def get_message_payload(timeout = 0)
+      message = get_message(timeout)
+      message.payload
+    end
+  end
 end

data/lib/rmq/queue_manager.rb

@@ -1,107 +1,107 @@
-require 'rmq/mqclient'
-
-module RMQ
-  class QueueManager
-    include MQClient
-    include Constants
-
-    attr_reader :connection_handle
-
-    def self.connect(queue_manager)
-      qm = QueueManager.new(queue_manager)
-      qm.connect
-
-      qm
-    end
-
-    def initialize(queue_manager)
-      @queue_manager = queue_manager
-    end
-
-    def connect
-      raise "Please set MQSERVER environment variable before trying to connect to a queue manager" if ENV['MQSERVER'].empty?
-
-      hconn_ptr = FFI::MemoryPointer.new :long
-      completion_code_ptr = FFI::MemoryPointer.new :long
-      reason_code_ptr = FFI::MemoryPointer.new :long
-
-      MQClient.mqconn(@queue_manager, hconn_ptr, completion_code_ptr, reason_code_ptr)
-
-      @connection_handle = hconn_ptr.read_long
-
-      unless completion_code_ptr.read_long == MQCC_OK
-        raise RMQException.new(completion_code_ptr.read_long, reason_code_ptr.read_long), "Cannot connect to queue manager #{@queue_manager}"
-      end
-    end
-
-    def disconnect
-      completion_code_ptr = FFI::MemoryPointer.new :long
-      reason_code_ptr = FFI::MemoryPointer.new :long
-      hconn_ptr = FFI::MemoryPointer.new :long
-
-      hconn_ptr.write_long @connection_handle
-      MQClient.mqdisc(hconn_ptr, completion_code_ptr, reason_code_ptr)
-
-      unless completion_code_ptr.read_long == MQCC_OK
-        raise RMQException.new(completion_code_ptr.read_long, reason_code_ptr.read_long), "Cannot disconnect from queue manager #{@queue_manager}"
-      end
-    end
-
-    def find_queue(queue_name)
-      queue_names = []
-
-      adminbag_handle = create_admin_bag
-      responsebag_handle = create_response_bag
-      add_string_to_bag(adminbag_handle, MQCA_Q_NAME, "*")
-      add_integer_to_bag(adminbag_handle, MQIA_Q_TYPE, MQQT_LOCAL)
-      add_inquiry(adminbag_handle, MQIA_CURRENT_Q_DEPTH)
-
-      execute(@connection_handle, MQCMD_INQUIRE_Q, MQHB_NONE, adminbag_handle, responsebag_handle, MQHO_NONE, MQHO_NONE)
-
-      number_of_bags = count_items(responsebag_handle, MQHA_BAG_HANDLE)
-
-      for bag_number in (0..number_of_bags - 1)
-        attributes_bag_handle = inquire_bag(responsebag_handle, MQHA_BAG_HANDLE, bag_number)
-        queue_names.push inquire_string(attributes_bag_handle, MQCA_Q_NAME, 0)
-      end
-
-      delete_bag(adminbag_handle)
-      delete_bag(responsebag_handle)
-
-      if queue_names.include?(queue_name)
-        RMQ::Queue.new(self, queue_name)
-      else
-        nil
-      end
-    end
-
-    def create_queue(queue_name)
-      adminbag_handle = create_admin_bag
-      responsebag_handle = create_response_bag
-      add_string_to_bag(adminbag_handle, MQCA_Q_NAME, queue_name)
-      add_integer_to_bag(adminbag_handle, MQIA_Q_TYPE, MQQT_LOCAL)
-      execute(@connection_handle, MQCMD_CREATE_Q, MQHB_NONE, adminbag_handle, responsebag_handle, MQHO_NONE, MQHO_NONE)
-
-      delete_bag(adminbag_handle)
-      delete_bag(responsebag_handle)
-
-      RMQ::Queue.new(self, queue_name)
-    end
-
-    def delete_queue(queue_name, purge = true)
-      adminbag_handle = create_admin_bag
-      responsebag_handle = create_response_bag
-      add_string_to_bag(adminbag_handle, MQCA_Q_NAME, queue_name)
-
-      if purge # delete queue regardless of messages in it
-        add_integer_to_bag(adminbag_handle, MQIACF_PURGE, MQPO_YES)
-      end
-
-      execute(@connection_handle, MQCMD_DELETE_Q, MQHB_NONE, adminbag_handle, responsebag_handle, MQHO_NONE, MQHO_NONE)
-
-      delete_bag(adminbag_handle)
-      delete_bag(responsebag_handle)
-    end
-
-  end
-end
+require 'rmq/mqclient'
+
+module RMQ
+  class QueueManager
+    include MQClient
+    include Constants
+
+    attr_reader :connection_handle
+
+    def self.connect(queue_manager)
+      qm = QueueManager.new(queue_manager)
+      qm.connect
+
+      qm
+    end
+
+    def initialize(queue_manager)
+      @queue_manager = queue_manager
+    end
+
+    def connect
+      raise "Please set MQSERVER environment variable before trying to connect to a queue manager" if ENV['MQSERVER'].empty?
+
+      hconn_ptr = FFI::MemoryPointer.new :long
+      completion_code_ptr = FFI::MemoryPointer.new :long
+      reason_code_ptr = FFI::MemoryPointer.new :long
+
+      MQClient.mqconn(@queue_manager, hconn_ptr, completion_code_ptr, reason_code_ptr)
+
+      @connection_handle = hconn_ptr.read_long
+
+      unless completion_code_ptr.read_long == MQCC_OK
+        raise RMQException.new(completion_code_ptr.read_long, reason_code_ptr.read_long), "Cannot connect to queue manager #{@queue_manager}"
+      end
+    end
+
+    def disconnect
+      completion_code_ptr = FFI::MemoryPointer.new :long
+      reason_code_ptr = FFI::MemoryPointer.new :long
+      hconn_ptr = FFI::MemoryPointer.new :long
+
+      hconn_ptr.write_long @connection_handle
+      MQClient.mqdisc(hconn_ptr, completion_code_ptr, reason_code_ptr)
+
+      unless completion_code_ptr.read_long == MQCC_OK
+        raise RMQException.new(completion_code_ptr.read_long, reason_code_ptr.read_long), "Cannot disconnect from queue manager #{@queue_manager}"
+      end
+    end
+
+    def find_queue(queue_name)
+      queue_names = []
+
+      adminbag_handle = create_admin_bag
+      responsebag_handle = create_response_bag
+      add_string_to_bag(adminbag_handle, MQCA_Q_NAME, "*")
+      add_integer_to_bag(adminbag_handle, MQIA_Q_TYPE, MQQT_LOCAL)
+      add_inquiry(adminbag_handle, MQIA_CURRENT_Q_DEPTH)
+
+      execute(@connection_handle, MQCMD_INQUIRE_Q, MQHB_NONE, adminbag_handle, responsebag_handle, MQHO_NONE, MQHO_NONE)
+
+      number_of_bags = count_items(responsebag_handle, MQHA_BAG_HANDLE)
+
+      for bag_number in (0..number_of_bags - 1)
+        attributes_bag_handle = inquire_bag(responsebag_handle, MQHA_BAG_HANDLE, bag_number)
+        queue_names.push inquire_string(attributes_bag_handle, MQCA_Q_NAME, 0)
+      end
+
+      delete_bag(adminbag_handle)
+      delete_bag(responsebag_handle)
+
+      if queue_names.include?(queue_name)
+        RMQ::Queue.new(self, queue_name)
+      else
+        nil
+      end
+    end
+
+    def create_queue(queue_name)
+      adminbag_handle = create_admin_bag
+      responsebag_handle = create_response_bag
+      add_string_to_bag(adminbag_handle, MQCA_Q_NAME, queue_name)
+      add_integer_to_bag(adminbag_handle, MQIA_Q_TYPE, MQQT_LOCAL)
+      execute(@connection_handle, MQCMD_CREATE_Q, MQHB_NONE, adminbag_handle, responsebag_handle, MQHO_NONE, MQHO_NONE)
+
+      delete_bag(adminbag_handle)
+      delete_bag(responsebag_handle)
+
+      RMQ::Queue.new(self, queue_name)
+    end
+
+    def delete_queue(queue_name, purge = true)
+      adminbag_handle = create_admin_bag
+      responsebag_handle = create_response_bag
+      add_string_to_bag(adminbag_handle, MQCA_Q_NAME, queue_name)
+
+      if purge # delete queue regardless of messages in it
+        add_integer_to_bag(adminbag_handle, MQIACF_PURGE, MQPO_YES)
+      end
+
+      execute(@connection_handle, MQCMD_DELETE_Q, MQHB_NONE, adminbag_handle, responsebag_handle, MQHO_NONE, MQHO_NONE)
+
+      delete_bag(adminbag_handle)
+      delete_bag(responsebag_handle)
+    end
+
+  end
+end