rubywmq 1.1.1 → 2.0.0.pre

data/ext/wmq.c

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
+ *  Copyright 2006 J. Reid Morrison
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -80,9 +80,6 @@ void Init_wmq() {
     QueueManager_selector_id_init();
     QueueManager_command_id_init();
     wmq_structs_id_init();
-
-    rb_require("wmq/wmq_temp");
-    rb_require("wmq/wmq_const");
 }
 
 /*

data/ext/wmq.h

@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------
- *  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
+ *  Copyright 2006 J. Reid Morrison
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,6 +33,10 @@
    #define rb_str_set_len(str, length) (RSTRING_LEN(str) = (length))
 #endif
 
+#ifndef _int64
+   #define _int64 long long
+#endif
+
 #include <cmqc.h>
 #include <cmqxc.h>
 

data/ext/wmq_message.c

@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------
- *  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
+ *  Copyright 2006 J. Reid Morrison
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

data/ext/wmq_mq_load.c

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
+ *  Copyright 2006 J. Reid Morrison
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

data/ext/wmq_queue.c

@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------
- *  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
+ *  Copyright 2006 J. Reid Morrison
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

data/ext/wmq_queue_manager.c

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
+ *  Copyright 2006 J. Reid Morrison
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

data/lib/wmq.rb

@@ -1,23 +1,14 @@
-################################################################################
-#  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-################################################################################
+require 'wmq/version'
+require 'wmq/constants'
+require 'wmq/constants_admin'
+require 'wmq/queue_manager'
+require 'wmq/message'
 
-# Load wmq that uses auto-load library.
-# 
-# If it fails, then it is likely due to this platform not being supported
-# by auto load facility in Ruby WMQ, so try to load client linked library
+# Load wmq using the auto-load library.
+#
+# If it fails, then it is most likely since this platform is not supported
+# by the auto load facility in Ruby WMQ, so try to load client linked library
+# For Example AIX does not support Autoload whereas Windows and Linux are supported
 begin
   require 'wmq/wmq'
 rescue LoadError

data/lib/wmq/message.rb

@@ -0,0 +1,70 @@
+# Message Ruby methods
+module WMQ
+  # Message contains the message descriptor (MQMD), data
+  # and any headers.
+  #
+  # Note:
+  # * The format in the descriptor applies only to the format of the data portion,
+  #   not the format of any included headers
+  # * The message format can ONLY be supplied in the descriptor.
+  #   * I.e. It is the format of the data, Not the headers.
+  #   * On the wire formats are determined automatically by the :header_type key for
+  #     each header
+  #   * Other WebSphere MQ interfaces require that the formats be "daisy-chained"
+  #     * I.e. The MQMD.Format is actually the format of the first header
+  #     * Ruby WMQ removes this tedious requirement and performs this
+  #       requirement automatically under the covers
+  #   * The format of any header should not be supplied in the descriptor or any header
+  #
+  # Message has the following attributes:
+  # * descriptor = {
+  #                                                           # WebSphere MQ Equivalent
+  #     :format             => WMQ::MQFMT_STRING,             # MQMD.Format - Format of data only
+  #                            WMQ::MQFMT_NONE                #   Do not supply header formats here
+  #     :original_length    => Number                         # MQMD.OriginalLength
+  #     :priority           => 0 .. 9                         # MQMD.Priority
+  #     :put_time           => String                         # MQMD.PutTime
+  #     :msg_id             => String                         ...
+  #     :expiry             => Number
+  #     :persistence        => Number
+  #     :reply_to_q         => String
+  #     :correl_id          => String
+  #     :feedback           => Number
+  #     :offset             => Number
+  #     :report             => Number
+  #     :msg_flags          => Number
+  #     :reply_to_q_mgr     => String
+  #     :appl_identity_data => String
+  #     :put_appl_name      => String
+  #     :user_identifier    => String
+  #     :msg_seq_number     => Number
+  #     :appl_origin_data   => String
+  #     :accounting_token   => String
+  #     :backout_count      => Number
+  #     :coded_char_set_id  => Number
+  #     :put_appl_type      => Number
+  #     :msg_type           => Number
+  #     :group_id           => String
+  #     :put_date           => String
+  #     :encoding           => Number
+  #   }
+  # * data => String
+  # * headers => Array of Hashes
+  #   * Note: Do not supply the format of any header. Ruby WMQ does this for you.
+  #
+  #    The following headers are supported:
+  #   * Rules And Formatting Header (RFH)
+  #       :header_type => :rf_header
+  #       :....
+  #   * Rules and Formatting V2 Header (RFH2)
+  #       ....
+  #   * Dead Letter Header
+  #   * CICS Header
+  #   * IMS Header
+  #   * Transmission Queue Header
+  #   * ...
+  class Message
+    attr_accessor :data, :descriptor, :headers
+  end
+
+end

data/{ext/lib/wmq_temp.rb → lib/wmq/queue_manager.rb}

@@ -1,35 +1,6 @@
-################################################################################
-#  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-################################################################################
-
+# QueueManager ruby methods
 module WMQ
-
-  # Temporary placeholder until the following code is moved to 'C'
-
-  #
   class QueueManager
-    def method_missing(name, *args)
-      if args.size == 1
-        self.execute({:command=>name}.merge(args[0]))
-      elsif args.size == 0
-        self.execute({:command=>name})
-      else
-        raise("Invalid arguments supplied to QueueManager#:#{name}, args:#{args}")
-      end
-    end
-
     # Execute any MQSC command against the queue manager
     #
     # Example
@@ -124,74 +95,16 @@ module WMQ
       return self.put(parms)
     end
 
-  end
+    # Expose Commands directly as Queue Manager methods
+    def method_missing(name, *args)
+      if args.size == 1
+        self.execute({:command=>name}.merge(args[0]))
+      elsif args.size == 0
+        self.execute({:command=>name})
+      else
+        raise("Invalid arguments supplied to QueueManager#:#{name}, args:#{args}")
+      end
+    end
 
-  # Message contains the message descriptor (MQMD), data
-  # and any headers.
-  #
-  # Note:
-  # * The format in the descriptor applies only to the format of the data portion,
-  #   not the format of any included headers
-  # * The message format can ONLY be supplied in the descriptor.
-  #   * I.e. It is the format of the data, Not the headers.
-  #   * On the wire formats are determined automatically by the :header_type key for 
-  #     each header
-  #   * Other WebSphere MQ interfaces require that the formats be "daisy-chained"
-  #     * I.e. The MQMD.Format is actually the format of the first header
-  #     * Ruby WMQ removes this tedious requirement and performs this
-  #       requirement automatically under the covers
-  #   * The format of any header should not be supplied in the descriptor or any header
-  #
-  # Message has the following attributes:
-  # * descriptor = {
-  #                                                           # WebSphere MQ Equivalent
-  #     :format             => WMQ::MQFMT_STRING,             # MQMD.Format - Format of data only
-  #                            WMQ::MQFMT_NONE                #   Do not supply header formats here
-  #     :original_length    => Number                         # MQMD.OriginalLength
-  #     :priority           => 0 .. 9                         # MQMD.Priority
-  #     :put_time           => String                         # MQMD.PutTime
-  #     :msg_id             => String                         ...
-  #     :expiry             => Number
-  #     :persistence        => Number
-  #     :reply_to_q         => String
-  #     :correl_id          => String
-  #     :feedback           => Number
-  #     :offset             => Number
-  #     :report             => Number
-  #     :msg_flags          => Number
-  #     :reply_to_q_mgr     => String
-  #     :appl_identity_data => String
-  #     :put_appl_name      => String
-  #     :user_identifier    => String
-  #     :msg_seq_number     => Number
-  #     :appl_origin_data   => String
-  #     :accounting_token   => String
-  #     :backout_count      => Number
-  #     :coded_char_set_id  => Number
-  #     :put_appl_type      => Number
-  #     :msg_type           => Number
-  #     :group_id           => String
-  #     :put_date           => String
-  #     :encoding           => Number
-  #   }
-  # * data => String
-  # * headers => Array of Hashes
-  #   * Note: Do not supply the format of any header. Ruby WMQ does this for you.
-  #   
-  #    The following headers are supported:
-  #   * Rules And Formatting Header (RFH)
-  #       :header_type => :rf_header
-  #       :....
-  #   * Rules and Formatting V2 Header (RFH2)
-  #       ....
-  #   * Dead Letter Header
-  #   * CICS Header
-  #   * IMS Header
-  #   * Transmission Queue Header
-  #   * ...
-  class Message
-    attr_reader :data, :descriptor, :headers
-    attr_writer :data, :descriptor, :headers
   end
-
 end

data/lib/wmq/version.rb

@@ -0,0 +1,3 @@
+module WMQ #:nodoc
+  VERSION = "2.0.0.pre"
+end

data/tests/test.rb

@@ -1,15 +1,14 @@
-# Shift include path to use locally built copy of rubywmq - For testing dev builds only
-#$:.unshift '../lib'
+# Allow test to be run in-place without requiring a gem install
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'rubygems'
-require 'wmq/wmq'
-require 'wmq/wmq_const_admin'
+require 'wmq'
 require 'test/unit'
 class TestTest < Test::Unit::TestCase
 
   def setup
     puts '****** setup: start ******'
-    @queue_manager = WMQ::QueueManager.new(:q_mgr_name => 'REID') #, :connection_name=>'localhost(1414)')
+    @queue_manager = WMQ::QueueManager.new(:q_mgr_name => 'TEST') #, :connection_name=>'localhost(1414)')
     @queue_manager.connect
 
     # Create Queue and clear any messages from the queue
@@ -161,7 +160,7 @@ class TestTest < Test::Unit::TestCase
       count = count + 1
     end
   end
-  
+
   def test_dlh
     puts '****** test_dlh ******'
     dlh = {:header_type     =>:dead_letter_header,
@@ -205,7 +204,7 @@ class TestTest < Test::Unit::TestCase
             }
     verify_header(cics, WMQ::MQFMT_NONE)
   end
-  
+
   def test_ims
     puts '****** test_ims ******'
     ims = {:header_type      =>:ims,
@@ -214,7 +213,7 @@ class TestTest < Test::Unit::TestCase
           }
     verify_header(ims, WMQ::MQFMT_STRING)
   end
-  
+
   def test_transmission_header
     puts '****** test_transmission_header ******'
     xqh = {:header_type     =>:xmit_q_header,
@@ -225,45 +224,45 @@ class TestTest < Test::Unit::TestCase
           }
     verify_header(xqh, WMQ::MQFMT_STRING)
   end
-  
+
   def test_rf_header
     puts '****** test_rf_header ******'
     rfh = {:header_type =>:rf_header,
-           :name_value  => {' name   s' => '  v a "l" u e 1  ', 
-                            'n a m e 2 ' => 'v a l u e  2', 
+           :name_value  => {' name   s' => '  v a "l" u e 1  ',
+                            'n a m e 2 ' => 'v a l u e  2',
                             '' => ['"', '""', '"""', '""""', ''],
                             'name3'=>['"value3"', '', '"',' value 43"']},
           }
     verify_header(rfh, WMQ::MQFMT_STRING)
   end
-  
+
   def test_rf_header_2
     puts '****** test_rf_header_2 ******'
     rfh2 = {:header_type =>:rf_header_2,
-            :xml => ['<hello>to the world</hello>', 
+            :xml => ['<hello>to the world</hello>',
                      '<another>xml like string</another>'],
            }
     verify_header(rfh2, WMQ::MQFMT_STRING)
   end
-  
+
   def test_multiple_headers
     puts '****** test_multiple_headers ******'
     headers = [{:header_type      => :rf_header_2,
-                :xml              => ['<hello>to the world</hello>', 
+                :xml              => ['<hello>to the world</hello>',
                                       '<another>xml like string</another>'],},
-                
+
                {:header_type      => :rf_header,
-                :name_value       => {' name   s' => '  v a l u e 1  ', 
-                                      'n a m e 2 ' => 'v a l u e  2', 
+                :name_value       => {' name   s' => '  v a l u e 1  ',
+                                      'n a m e 2 ' => 'v a l u e  2',
                                       'name3'=>['value3', '', 'value 43']} },
-                
+
                {:header_type      => :ims,
                 :l_term_override  => 'LTERM',
                 :reply_to_format  => WMQ::MQFMT_STRING},
-                
+
                {:header_type      => :rf_header,
-                :name_value       => {' name   s' => '  v a l u e 1  ', 
-                                      'n a m e 2 ' => 'v a l u e  2', 
+                :name_value       => {' name   s' => '  v a l u e 1  ',
+                                      'n a m e 2 ' => 'v a l u e  2',
                                       'name3'=>['value3', '', 'value 43']} },
 
                {:header_type      => :cics,
@@ -273,16 +272,16 @@ class TestTest < Test::Unit::TestCase
 
                {:header_type      => :rf_header_2,
                 :xml              => ['<hello>to the world</hello>', '<another>xml like string</another>'],},
-                
+
                {:header_type      => :xmit_q_header,
                 :remote_q_name    => 'SOME_REMOTE_QUEUE',
                 :remote_q_mgr_name=> 'SOME_REMOTE_Q_MGR',
                 :msg_type         => WMQ::MQMT_REQUEST,
                 :msg_id           => 'my message Id'},
-              ]              
+              ]
     verify_multiple_headers(headers, WMQ::MQFMT_STRING)
   end
-  
+
   def test_xmit_multiple_headers
     puts '****** test_xmit_q_header with ims header ******'
     headers = [{:header_type      => :xmit_q_header,
@@ -290,39 +289,30 @@ class TestTest < Test::Unit::TestCase
                 :remote_q_mgr_name=> 'SOME_REMOTE_Q_MGR',
                 :msg_type         => WMQ::MQMT_REQUEST,
                 :msg_id           => 'my message Id'},
-                
+
                {:header_type      => :ims,
                 :l_term_override  => 'LTERM',
                 :reply_to_format  => WMQ::MQFMT_STRING},
               ]
     verify_multiple_headers(headers, WMQ::MQFMT_STRING)
   end
-  
+
   def test_message_grouping
     puts '****** test_message_grouping ******'
     # Clear out queue of any messages
     @in_queue.each { |message| }
-    
+
     msg = WMQ::Message.new
     msg.data = 'First'
     msg.descriptor[:msg_flags] = WMQ::MQMF_MSG_IN_GROUP
     assert_equal(@out_queue.put(:message=>msg, :options => WMQ::MQPMO_LOGICAL_ORDER), true)
-    
+
     msg.data = 'Second'
     assert_equal(@out_queue.put(:message=>msg, :options => WMQ::MQPMO_LOGICAL_ORDER), true)
-    
+
     msg.data = 'Last'
     msg.descriptor[:msg_flags] = WMQ::MQMF_LAST_MSG_IN_GROUP
     assert_equal(@out_queue.put(:message=>msg, :options => WMQ::MQPMO_LOGICAL_ORDER), true)
-
-    # Now retrieve the messages destructively
-    message = WMQ::Message.new
-    test_sizes.each do |size|
-      assert_equal(true, @in_queue.get(:message=>message, :match=>WMQ::MQMO_NONE))
-      assert_equal(size, message.data.length)
-      str = '0123456789ABCDEF' * (size/16) + '0123456789ABCDEF'[0,size%16]
-      assert_equal(str, message.data)
-    end
   end
-  
+
 end