stomp 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c1af3ce3e6d76e26362590b5b2682fd74cfc71f9f94fc6d369bcae1558f714f
-  data.tar.gz: 81f87f94f4c99db3d91b375d306124fb7a82214e5676ccbeed000effc99dc1d7
+  metadata.gz: 7c814395091688edc6d4c400dea004f855feb2b7f53f9a20ca080b2876e570e5
+  data.tar.gz: b7cec9807723d92292e565b2864909b6ef332ceb931a050745b36fb1b6ee0f14
 SHA512:
-  metadata.gz: 40efd1dde628a05c2a2906afd6cf85deab3e1d6cf6e0a582d0ffcc63c700064de755650b5e52cbe948ed65aa3f4ae0b3bb3fb2406504941d7f850e7f9916ef4a
-  data.tar.gz: 0ce1c9009da73d68fcdaefa64d10ecce427ed4451cbebdae9d42bda99d49c8c42f38bd70a0420dfeed8e817f31af1c1c3cd6bc990a93e7a22e8422e86f31555f
+  metadata.gz: e2305dac6286107dae1328aebad529e7960d2bc7d95ebc9cbcdea57395df4a1e28f28965a50a4735ba2d5b6f6d85a1f3847ceb93d7b801d9aca940c2b4a8ef7c
+  data.tar.gz: 74923725f94122d707defb178107f5d90c77a16d3e2f1741ac771bafa863d26911db287b61f12c1e7332f2ae02ac25375c449528ddcf85875eed582796ba8e74

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Stomp Gem Change Log
 
+## 1.4.6 20181105
+
+* Fix broken JRuby support.  Issue #153.
+* Rework many tests for JRuby support.
+* Add optional debug output to all tests.
+
 ## 1.4.5 20181027
 
 * Add option for no timeout on network read

data/README.md

@@ -45,6 +45,7 @@ An implementation of the Stomp protocol for Ruby. See:
         :start_timeout => 0,                # Timeout around Stomp::Client initialization
         :sslctx_newparm => nil,             # Param for SSLContext.new
         :ssl_post_conn_check => true,       # Further verify broker identity
+        :nto_cmd_read => true,              # No timeout on COMMAND read
       }
 
       # for a client
@@ -93,7 +94,8 @@ A Stomp URL must begin with 'stomp://' and can be in one of the following forms:
 
 See _CHANGELOG.rdoc_ for details.
 
-* Gem version 1.4.5. Miscellaneous fixes, see CHANGELOG.md for details.
+* Gem version 1.4.6. Fix version 1.4.5 which breaks JRuby support.
+* Gem version 1.4.5. JRuby broken here.  Use is not recommended.
 * Gem version 1.4.4. Miscellaneous fixes, see CHANGELOG.md for details.
 * Gem version 1.4.3. Fix broken install.  Do not try to install 1.4.2.
 * Gem version 1.4.2. Fix memory leak, and others !: see CHANGELOG.md for details.
@@ -318,7 +320,7 @@ Rafael Rosa
 2010-03-23
 </td>
 <td style="border: 1px solid black;padding-left: 10px;" >
-(0074)
+(0087)
 </td>
 <td style="border: 1px solid black;padding-left: 10px;" >
 <span style="font-weight: bold;" >
@@ -804,3 +806,4 @@ Meg Richards
 </td>
 </tr>
 </table>
+

data/examples/ssl/SSL.md

@@ -120,7 +120,7 @@ Subcase B - When your broker _does_ require client authentication:
 
 * Expect connection failure (broker must be sent a valid client certificate).
 
-### Use Case 3 - Authentification by broker, no authentification by  broker
+### Use Case 3 - Authentification by broker, no authentification by client
 
 Subcase A - When your broker does _not_ require client authentication:
 

data/lib/connection/netio.rb

@@ -61,14 +61,6 @@ module Stomp
             raise Stomp::Error::HandShakeDetectedError
           end
 
-          # Check for a valid frame name from the server.
-          frname = line.chomp
-          p [ "_receive_frame_name_check", frname ] if drdbg
-          unless  SERVER_FRAMES[frname]
-            sfex = Stomp::Error::ServerFrameNameError.new(frname)
-            raise sfex
-          end
-
           p [ "_receive_norm_lend", line, Time.now ] if drdbg
           line = _normalize_line_end(line) if @protocol >= Stomp::SPL_12
 
@@ -157,6 +149,12 @@ module Stomp
           p [ "_receive_new_message" ] if drdbg
           msg = Message.new(message_header + "\n" + message_body + "\0", @protocol >= Stomp::SPL_11)
           p [ "_receive_decode_headers", msg.command, msg.headers ] if drdbg
+          # Check for a valid frame name from the server.
+          p [ "_receive_frame_name_check", msg.command ] if drdbg
+          unless  SERVER_FRAMES[msg.command]
+            sfex = Stomp::Error::ServerFrameNameError.new(msg.command)
+            raise sfex
+          end
           #
           if @protocol >= Stomp::SPL_11 && msg.command != Stomp::CMD_CONNECTED
             msg.headers = _decodeHeaders(msg.headers)
@@ -172,16 +170,16 @@ module Stomp
       #
       def _is_ready?(s)
         rdy = s.ready?
-        ### p [ "isr?", rdy ]
+        #p [ "isr?", rdy ]
         return rdy unless @jruby
-        ### p [ "jrdychk", rdy.class ]
+        #p [ "jrdychk", rdy.class ]
         if rdy.class == NilClass
           # rdy = true
           rdy = false # A test
         else
           rdy = (rdy.class == Fixnum || rdy.class == TrueClass) ? true : false
         end
-        ### p [ "isr?_last", rdy ]
+        #p [ "isr?_last", rdy ]
         rdy
       end
 
@@ -515,17 +513,17 @@ module Stomp
           if @protocol == Stomp::SPL_10 || (@protocol >= Stomp::SPL_11 && !@hbr)
             if @jruby
               # Handle JRuby specific behavior.
-              ### p [ "ilrjr00", _is_ready?(read_socket), RUBY_VERSION ]
+              #p [ "ilrjr00", _is_ready?(read_socket), RUBY_VERSION ]
               if RUBY_VERSION <  "2"
                 while true
-                  ### p [ "ilrjr01A1", _is_ready?(read_socket) ]
+                  #p [ "ilrjr01A1", _is_ready?(read_socket) ]
                   line = _interruptible_gets(read_socket) # Data from wire
                   break unless line == "\n"
                   line = ''
                 end
               else # RUBY_VERSION >= "2"
                 while _is_ready?(read_socket)
-                  ### p [ "ilrjr01B2", _is_ready?(read_socket) ]
+                  #p [ "ilrjr01B2", _is_ready?(read_socket) ]
                   line = _interruptible_gets(read_socket) # Data from wire
                   break unless line == "\n"
                   line = ''

data/lib/stomp/version.rb

@@ -6,8 +6,8 @@ module Stomp
   module Version  #:nodoc: all
     MAJOR = 1
     MINOR = 4
-    PATCH = 5
-    # PATCH = "5.plvl.001"
+    PATCH = 6
+    # PATCH = "6.plvl.001"
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/stomp.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: stomp 1.4.5 ruby lib
+# stub: stomp 1.4.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "stomp".freeze
-  s.version = "1.4.5"
+  s.version = "1.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Brian McCallister".freeze, "Marius Mathiesen".freeze, "Thiago Morello".freeze, "Guy M. Allard".freeze]
-  s.date = "2018-10-27"
+  s.date = "2018-11-05"
   s.description = "Ruby client for the Stomp messaging protocol.  Note that this gem is no longer supported on rubyforge.".freeze
   s.email = ["brianm@apache.org".freeze, "marius@stones.com".freeze, "morellon@gmail.com".freeze, "allard.guy.m@gmail.com".freeze]
   s.executables = ["catstomp".freeze, "stompcat".freeze]

data/test/test_anonymous.rb

@@ -20,6 +20,7 @@ class TestAnonymous < Test::Unit::TestCase
     # Data for multi_thread tests
     @max_threads = 20
     @max_msgs = 100
+    @tandbg = ENV['TANDBG'] ? true : false
   end
 
   def teardown
@@ -28,21 +29,29 @@ class TestAnonymous < Test::Unit::TestCase
 
   # Test basic connection creation.
   def test_connection_exists
+    mn = "test_connection_exists" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     assert_not_nil @conn
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test asynchronous polling.
   def test_poll_async
-	sq = ENV['STOMP_ARTEMIS'] ? "jms.queue.queue.do.not.put.messages.on.this.queue" :
-		"/queue/do.not.put.messages.on.this.queue"
+    mn = "test_poll_async" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
+  	sq = ENV['STOMP_ARTEMIS'] ? "jms.queue.queue.do.not.put.messages.on.this.queue" :
+		  "/queue/do.not.put.messages.on.this.queue"
     @conn.subscribe(sq, :id => "a.no.messages.queue")
     # If the test 'hangs' here, Connection#poll is broken.
     m = @conn.poll
     assert m.nil?
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test suppression of content length header.
   def test_no_length
+    mn = "test_no_length" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     conn_subscribe make_destination
     #
     @conn.publish make_destination, "test_stomp#test_no_length",
@@ -55,34 +64,46 @@ class TestAnonymous < Test::Unit::TestCase
     msg2 = @conn.receive
     assert_equal "test_stomp#test_", msg2.body
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end unless ENV['STOMP_RABBIT']
 
   # Test direct / explicit receive.
   def test_explicit_receive
+    mn = "test_explicit_receive" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     conn_subscribe make_destination
     @conn.publish make_destination, "test_stomp#test_explicit_receive"
     msg = @conn.receive
     assert_equal "test_stomp#test_explicit_receive", msg.body
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test asking for a receipt.
   def test_receipt
+    mn = "test_receipt" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     conn_subscribe make_destination, :receipt => "abc"
     msg = @conn.receive
     assert_equal "abc", msg.headers['receipt-id']
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test asking for a receipt on disconnect.
   def test_disconnect_receipt
+    mn = "test_disconnect_receipt" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     @conn.disconnect :receipt => "abc123"
     assert_not_nil(@conn.disconnect_receipt, "should have a receipt")
     assert_equal(@conn.disconnect_receipt.headers['receipt-id'],
                   "abc123", "receipt sent and received should match")
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test ACKs for Stomp 1.0
   def test_client_ack_with_symbol_10
+    mn = "test_client_ack_with_symbol_10" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     if @conn.protocol != Stomp::SPL_10
       assert true
       return
@@ -95,10 +116,13 @@ class TestAnonymous < Test::Unit::TestCase
     # matching the message-id for the MESSAGE being acknowledged.
     @conn.ack msg.headers['message-id']
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test ACKs for Stomp 1.1
   def test_client_ack_with_symbol_11
+    mn = "test_client_ack_with_symbol_11" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     if @conn.protocol != Stomp::SPL_11
       assert true
       return
@@ -114,10 +138,13 @@ class TestAnonymous < Test::Unit::TestCase
     # id header.
     @conn.ack msg.headers['message-id'], :subscription => msg.headers['subscription']
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test ACKs for Stomp 1.2
   def test_client_ack_with_symbol_12
+    mn = "test_client_ack_with_symbol_12" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     if @conn.protocol != Stomp::SPL_12
       assert true
       return
@@ -131,33 +158,45 @@ class TestAnonymous < Test::Unit::TestCase
     # of the MESSAGE being acknowledged.
     @conn.ack msg.headers['ack']
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test a message with 0x00 embedded in the body.
   def test_embedded_null
+    mn = "test_embedded_null" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     conn_subscribe make_destination
     @conn.publish make_destination, "a\0"
     msg = @conn.receive
     assert_equal "a\0" , msg.body
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test connection open checking.
   def test_connection_open?
+    mn = "test_connection_open?" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     assert_equal true , @conn.open?
     @conn.disconnect
     assert_equal false, @conn.open?
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test connection closed checking.
   def test_connection_closed?
+    mn = "test_connection_closed?" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     assert_equal false, @conn.closed?
     @conn.disconnect
     assert_equal true, @conn.closed?
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test that methods detect a closed connection.
   def test_closed_checks_conn
+    mn = "test_closed_checks_conn" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     @conn.disconnect
     #
     assert_raise Stomp::Error::NoCurrentConnection do
@@ -203,33 +242,45 @@ class TestAnonymous < Test::Unit::TestCase
     assert_raise Stomp::Error::NoCurrentConnection do
       _ = @conn.poll
     end
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test that we receive a Stomp::Message.
   def test_response_is_instance_of_message_class
+    mn = "test_response_is_instance_of_message_class" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     conn_subscribe make_destination
     @conn.publish make_destination, "a\0"
     msg = @conn.receive
     assert_instance_of Stomp::Message , msg
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test converting a Message to a string.
   def test_message_to_s
+    mn = "test_message_to_s" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     conn_subscribe make_destination
     @conn.publish make_destination, "a\0"
     msg = @conn.receive
     assert_match(/^<Stomp::Message headers=/ , msg.to_s)
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test that a connection frame is present.
   def test_connection_frame
+    mn = "test_connection_frame" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     assert_not_nil @conn.connection_frame
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test messages with multiple line ends.
   def test_messages_with_multipleLine_ends
+    mn = "test_messages_with_multipleLine_ends" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     conn_subscribe make_destination
     @conn.publish make_destination, "a\n\n"
     @conn.publish make_destination, "b\n\na\n\n"
@@ -240,10 +291,13 @@ class TestAnonymous < Test::Unit::TestCase
     assert_equal "a\n\n", msg_a.body
     assert_equal "b\n\na\n\n", msg_b.body
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test publishing multiple messages.
   def test_publish_two_messages
+    mn = "test_publish_two_messages" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     conn_subscribe make_destination
     @conn.publish make_destination, "a\0"
     @conn.publish make_destination, "b\0"
@@ -253,14 +307,18 @@ class TestAnonymous < Test::Unit::TestCase
     assert_equal "a\0", msg_a.body
     assert_equal "b\0", msg_b.body
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   def test_thread_hang_one
+    mn = "test_thread_hang_one" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     received = nil
     Thread.new(@conn) do |amq|
       no_rep_error()
       while true
         received = amq.receive
+        Thread::exit if received
       end
     end
     #
@@ -271,10 +329,13 @@ class TestAnonymous < Test::Unit::TestCase
     assert_not_nil received
     assert_equal message, received.body
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test polling with a single thread.
   def test_thread_poll_one
+    mn = "test_thread_poll_one" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     received = nil
     max_sleep = (RUBY_VERSION =~ /1\.8/) ? 10 : 1
     Thread.new(@conn) do |amq|
@@ -294,10 +355,13 @@ class TestAnonymous < Test::Unit::TestCase
     assert_not_nil received
     assert_equal message, received.body
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test receiving with multiple threads.
   def test_multi_thread_receive
+    mn = "test_multi_thread_receive" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     lock = Mutex.new
     msg_ctr = 0
     dest = make_destination
@@ -334,10 +398,13 @@ class TestAnonymous < Test::Unit::TestCase
     end
     assert_equal @max_msgs, msg_ctr
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end unless RUBY_ENGINE =~ /jruby/
 
   # Test polling with multiple threads.
   def test_multi_thread_poll
+    mn = "test_multi_thread_poll" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     #
     lock = Mutex.new
     msg_ctr = 0
@@ -380,20 +447,26 @@ class TestAnonymous < Test::Unit::TestCase
     end
     assert_equal @max_msgs, msg_ctr
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end unless RUBY_ENGINE =~ /jruby/
 
   # Test using a nil body.
   def test_nil_body
+    mn = "test_nil_body" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     dest = make_destination
     @conn.publish dest, nil
     conn_subscribe dest
     msg = @conn.receive
     assert_equal "", msg.body
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test transaction message sequencing.
   def test_transaction
+    mn = "test_transaction" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     conn_subscribe make_destination
 
     @conn.begin "txA"
@@ -408,10 +481,13 @@ class TestAnonymous < Test::Unit::TestCase
     msg = @conn.receive
     assert_equal "txn message", msg.body
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end unless ENV['STOMP_ARTEMIS'] # See Artemis docs for 1.3, page 222
 
   # Test duplicate subscriptions.
   def test_duplicate_subscription
+    mn = "test_duplicate_subscription" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     @conn.disconnect # not reliable
     @conn = Stomp::Connection.open(nil, nil, host, port, true, nil, nil) # reliable
     dest = make_destination
@@ -421,18 +497,24 @@ class TestAnonymous < Test::Unit::TestCase
       conn_subscribe dest
     end
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Test nil 1.1 connection parameters.
   def test_nil_connparms
+    mn = "test_nil_connparms" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     @conn.disconnect
     #
     @conn = Stomp::Connection.open(nil, nil, host, port, false, 5, nil)
     checkEmsg(@conn)
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # Basic NAK test.
   def test_nack11p_0010
+    mn = "test_nack11p_0010" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     if @conn.protocol == Stomp::SPL_10
       assert_raise Stomp::Error::UnsupportedProtocolError do
         @conn.nack "dummy msg-id"
@@ -465,6 +547,7 @@ class TestAnonymous < Test::Unit::TestCase
       msg2 = @conn.receive
       assert_equal smsg, msg2.body
       checkEmsg(@conn)
+      p [ "99", mn, "ends" ] if @tandbg
     end
   end unless (ENV['STOMP_AMQ11'] || ENV['STOMP_ARTEMIS'])
 
@@ -472,6 +555,8 @@ class TestAnonymous < Test::Unit::TestCase
   # fail only when connecting to a pure STOMP 1.0 server that does not 
   # return a 'version' header at all.
   def test_conn10_simple
+    mn = "test_conn10_simple" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     @conn.disconnect
     #
     vhost = ENV['STOMP_RABBIT'] ? "/" : host
@@ -494,15 +579,19 @@ class TestAnonymous < Test::Unit::TestCase
     c = nil
     c = Stomp::Connection.new(hash)
     c.disconnect if c
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
   # test JRuby detection
   def test_jruby_presence
+    mn = "test_jruby_presence" if @tandbg
+    p [ "01", mn, "starts" ] if @tandbg
     if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
       assert @conn.jruby
     else
       assert !@conn.jruby
     end
+    p [ "99", mn, "ends" ] if @tandbg
   end
 
 end