rmq 0.0.3 → 0.0.4

data/lib/rmq/constants.rb

@@ -776,6 +776,7 @@ module RMQ
     def decode_reason_code(reason_code)
       reason_codes = {
        0 => :MQRC_NONE,
+       2002 => :MQRC_ALREADY_CONNECTED,
        2019 => :MQRC_HOBJ_ERROR,
        2033 => :MQRC_NO_MSG_AVAILABLE,
        2037 => :MQRC_NOT_OPEN_FOR_INPUT,

data/lib/rmq/message_descriptor.rb

@@ -22,6 +22,7 @@ module RMQ
         :Persistence, :long,
         :MsgId, [:char, 24],
         :CorrelId, [:char, 24],
+        :BackoutCount, :long,
         :ReplyToQ, [:char, 48],
         :ReplyToQMgr, [:char, 48],
         :UserIdentifier, [:char, 12],

data/lib/rmq/mqclient.rb

@@ -210,7 +210,7 @@ module RMQ
       raise RMQException.new(completion_code_ptr.read_long, reason_code_ptr.read_long), "Cannot close queue" if completion_code_ptr.read_long != MQCC_OK
     end
 
-    def put_message_on_queue(connection_handle, queue_handle, payload)
+    def put_message_on_queue(connection_handle, queue_handle, payload, reply_queue_name = "")
       message_options = MQClient::PutMessageOptions.new
       message_options[:StrucId] = MQClient::PutMessageOptions::MQPMO_STRUC_ID
       message_options[:Version] = MQClient::PutMessageOptions::MQPMO_VERSION_1
@@ -223,7 +223,7 @@ module RMQ
       message_descriptor[:MsgType] = MQClient::MessageDescriptor::MQMT_DATAGRAM
       message_descriptor[:Priority] = 1
       message_descriptor[:Persistence] = MQClient::MessageDescriptor::MQPER_PERSISTENT
-      message_descriptor[:ReplyToQ] = ""
+      message_descriptor[:ReplyToQ] = reply_queue_name
 
       completion_code_ptr = FFI::MemoryPointer.new :long
       reason_code_ptr = FFI::MemoryPointer.new :long

data/lib/rmq/queue.rb

@@ -9,10 +9,10 @@ module RMQ
       @queue_name = name
     end
 
-    def put_message(payload)
+    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)
+      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

data/lib/rmq/queue_manager.rb

@@ -19,6 +19,8 @@ module RMQ
     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

data/lib/rmq/version.rb

@@ -1,3 +1,3 @@
 module RMQ
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/rmq/queue_manager_spec.rb

@@ -19,6 +19,12 @@ describe RMQ::QueueManager do
     lambda { RMQ::QueueManager::connect("INVALID_NAME") }.should raise_error(RMQ::RMQException)
   end
 
+  it "should warn about missing MQSERVER environment variable" do
+    ENV['MQSERVER'] = ""
+
+    lambda { RMQ::QueueManager::connect(SpecHelper::DATA[:queue_manager]) }.should raise_error(RuntimeError)
+  end
+
   it "should create a new queue" do
     @qm = RMQ::QueueManager::connect(SpecHelper::DATA[:queue_manager])
     queue = @qm.create_queue("RMQ.SAMPLE")

data/spec/rmq/queue_spec.rb

@@ -24,4 +24,8 @@ describe RMQ::Queue do
     @queue.get_message.should == "I want to read this back"
   end
 
+  it "should put a message on a queue and use a reply queue name" do
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'rspec'
 require 'rmq'
 
-ENV['MQSERVER'] = "SYSTEM.DEF.SVRCONN/TCP/127.0.0.1(1414)"
+MQSERVER = "SYSTEM.DEF.SVRCONN/TCP/127.0.0.1(1414)"
 
 module SpecHelper
   DATA = {
@@ -12,4 +12,8 @@ end
 RSpec.configure do |config|
   config.color_enabled = true
   config.formatter     = 'documentation'
+
+  config.before(:each) do
+    ENV['MQSERVER'] = MQSERVER
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmq
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22394232 !ruby/object:Gem::Requirement
+  requirement: &21388056 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *22394232
+  version_requirements: *21388056
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &22393944 !ruby/object:Gem::Requirement
+  requirement: &21387768 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22393944
+  version_requirements: *21387768
 description: Ruby wrapper around MQ series client library
 email: sns@caimito.net
 executables: []