stomp 1.2.2 → 1.2.3

data/CHANGELOG.rdoc

@@ -1,4 +1,16 @@
-== 1.2.2 2012-24-03
+== 1.2.3 20120616
+
+* Fix UnsupportedProtocol on connect to a 1.0 broker
+* Add Client#poll method
+* Add help to stompcat and catstomp
+* Allow password to be set for private SSL key
+* Update comments to reflect new repository URL
+* Reformat changelog dates to ISO8601
+* Fix SSL connection failures using JRuby
+* Use symbols, not strings for all header keys
+* Add IPV6 to IPV4 failover for dual homed systems when requested
+
+== 1.2.2 20120324
 
 * Major performance improvement for read of messages without content-length header
 * Correct Stomp 1.1 failing test
@@ -8,16 +20,16 @@
 * Allow SSL file checks before connect using SSLParams.new(:fsck => true, ...)
 * Correct a test for Windows compatibility
 
-== 1.2.1 2012-13-03
+== 1.2.1 20120313
 
-* Robust SSL certificate support.  See examples and: https://github.com/morellon/stomp/wiki/extended-ssl-overview
+* Robust SSL certificate support.  See examples and: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 * Really remove the deprecated #send methods
 * Fix exception in Stomp 1.1 code when headers are frozen
 * Revert 245e734a0. See ce8335fb2f for details. Fixes broken Connection#poll.
 * Add reconnection attempts to callback logging.
 * Add SSL specific connection information to callback logging.
 
-== 1.2.0 2011-14-12
+== 1.2.0 20111214
 
 * Stomp 1.1 protocol support.  A significant change.  Please test existing 1.0 code well.  See the examples directory for 1.1 examples.
 * Accept :reliable in a Stomp::Client connection hash
@@ -27,14 +39,14 @@
 * Fix subscription id in find_listener
 * Start to bootstrap STOMP 1.1 support
 
-== 1.1.10 2011-07-11
+== 1.1.10 20111107
 
 * Fixes for JRuby support
 * Fix EOF error on disconnect
 * Refactoring and additional test
 * Set up tests for use of RabbitMQ
 
-== 1.1.9 2011-15-06
+== 1.1.9 20110615
 
 * Support wildcard destinations
 * Handle subscribe with string or symbol ID
@@ -45,7 +57,7 @@
 * Add optional callback logging.  See the examples install directory, files logexamp.rb and slogger.rb
 * Correct date stamps in this file
 
-== 1.1.8 2011-16-03
+== 1.1.8 20110316
 
 * Set KEEPALIVE on connection socket options
 * Attempt to support JRuby more robustly (poll remains broken)
@@ -56,23 +68,23 @@
 * Allow connection to hosts with a - (dash) in the host name
 * Add limit parameter to thread joins
 
-== 1.1.7 2011-09-01
+== 1.1.7 20110109
 
 * Binary parse of raw STOMP frame
 * Fix broken tests on Ruby 1.9.2
 
-== 1.1.6 2010-10-06
+== 1.1.6 20100610
 
 * Fixed multi-thread app hanging
 
-== 1.1.5 2010-17-03
+== 1.1.5 20100317
 
 * Added publish method (send is now deprecated)
 * Changes on Rake File
 * Added original_destination header to unreceive
 * suppress content length header is send on the message for future handling (like unreceive)
 
-== 1.1.4 2010-21-01
+== 1.1.4 20100121
 
 * Added unreceive message method that sends the message back to its queue or to the 
   dead letter queue, depending on the :max_redeliveries option, similar to a13m one.
@@ -87,13 +99,13 @@
 * Added connection_frame accessor
 * Added disconnect receipt
 
-== 1.1.3 2009-24-11
+== 1.1.3 20091124
 
 * Failover support
 * SSL support
 * Stomp::Connection and Stomp::Client accept a hash on their constructor
 
-== 1.1 2009-27-02
+== 1.1 20090227
 
 * Ruby 1.9 Support
 * Add support for connect_headers, to control the CONNECT command.
@@ -101,7 +113,7 @@
 * Better test coverage
 * General code cleanup. 
 
-== 1.0.6 2008-05-08
+== 1.0.6 20080805
 
 * Whitespace cleanup
 * Refactored Rakefile and added stomp.gemspec for GitHub friendliness.
@@ -113,8 +125,33 @@
 * Created initial RSpec specs which stub/mock objects and should not require a running
   Stomp server instance.
 
-== v1.0.5
+== v1.0.5 20070201
+
+* better url parsing
+* git-svn-id: http://svn.codehaus.org/stomp/ruby/trunk@48 fd4e7336-3dff-0310-b68a-b6615a75f13b
+
+== v1.0.4 20070115
+
+* Allow URL style connections descriptors
+* git-svn-id: http://svn.codehaus.org/stomp/ruby/trunk@44 fd4e7336-3dff-0310-b68a-b6615a75f13b
+
+== v1.0.3 20070114
+
+* Additional fixes for reliable by Andrew Kuklewicz
+* git-svn-id: http://svn.codehaus.org/stomp/ruby/trunk@42 fd4e7336-3dff-0310-b68a-b6615a75f13b
+
+== v1.0.2 20060922
+
+* Moving ruby so we can tag it ;-)
+* git-svn-id: http://svn.codehaus.org/stomp/ruby/trunk@37 fd4e7336-3dff-0310-b68a-b6615a75f13b
+
+== v1.0.1 20051217
+
+* Increment version
+* git-svn-id: http://svn.codehaus.org/stomp/trunk/ruby@24 fd4e7336-3dff-0310-b68a-b6615a75f13b
+
+== v1.0.0 20051015
 
-SVN rev 86 clone from http://svn.codehaus.org/stomp/ruby/trunk
+* works in repl, getting messages in weird order or dupes in test, but unable to isolate so far =(
+* git-svn-id: http://svn.codehaus.org/stomp/trunk/ruby@20 fd4e7336-3dff-0310-b68a-b6615a75f13b
 
-git-svn-id: http://svn.codehaus.org/stomp/ruby/trunk@86 fd4e7336-3dff-0310-b68a-b6615a75f13b

data/README.rdoc

@@ -1,7 +1,6 @@
 ==README
 
-* (https://github.com/morellon/stomp/)
-* (http://gitorious.org/projects/stomp/)
+* (https://github.com/stompgem/stomp/)
 
 ===Overview
 
@@ -11,6 +10,7 @@ An implementation of the Stomp protocol for Ruby. See:
 
 ===New
 
+* Gem version 1.2.3.  Miscellaneous fixes, see changelog for details.
 * Gem version 1.2.2.  Performance and more SSL enhancements.
 * Full support of SSL certificates is announced as of gem version 1.2.1.
 * Support of Stomp protocol level 1.1 is announced as of gem version 1.2.0.
@@ -46,6 +46,7 @@ See the change log for details.
         
       ],
       # These are the default parameters, don't need to be set
+      :reliable => true, # true for hash login
       :initial_reconnect_delay => 0.01,
       :max_reconnect_delay => 30.0,
       :use_exponential_back_off => true,
@@ -72,8 +73,7 @@ Up until March 2009 the project was maintained and primarily developed by Brian
 
 ===Source Code and Project URLs
 
-  https://github.com/morellon/stomp/
-  http://gitorious.org/projects/stomp/
+  https://github.com/stompgem/stomp/
 
 ===Stomp Protocol Information :
 
@@ -83,12 +83,12 @@ Up until March 2009 the project was maintained and primarily developed by Brian
 
 The following people have contributed to Stomp:
 
-* Brian McCaliister
+* Brian McCallister
 * Glenn Rempe <glenn@rempe.us>
 * jstrachan 
 * Marius Mathiesen <marius.mathiesen@gmail.com>
 * Johan S√∏rensen <johan@johansorensen.com>
-* Thiago Morello <morellon@gmail.com>
+* Thiago Morello <stompgem@gmail.com>
 * Guy M. Allard
 * kookster
 * Tony Garnock-Jones <tonyg@lshift.net>
@@ -104,15 +104,6 @@ The following people have contributed to Stomp:
 * R.I. Pienaar
 * tworker
 * James Pearson
-
-= Announcements
-
-In the next version of the gem, the dates in CHANGELOG.rdoc will be changed from:
-
-* yyyy-dd-mm
-
-to:
-
-* ISO8601 format (yyyymmdd)
-
+* Craig
+* Tommy Bishop
 

data/Rakefile

@@ -33,7 +33,7 @@ begin
     gem.description = %Q{Ruby client for the Stomp messaging protocol.  Note that this gem is no longer supported on rubyforge.}
     gem.email = ["brianm@apache.org", 'marius@stones.com', 'morellon@gmail.com',
        'allard.guy.m@gmail.com' ]
-    gem.homepage = "https://github.com/morellon/stomp"
+    gem.homepage = "https://github.com/stompgem/stomp"
     gem.authors = ["Brian McCallister", 'Marius Mathiesen', 'Thiago Morello',
         'Guy M. Allard']
     gem.add_development_dependency "rspec", '>= 2.3'

data/bin/catstomp

@@ -28,6 +28,25 @@ require 'stomp'
 #
 begin
 
+    if ARGV[0] == '-h' || ARGV[0] == '--help'
+      $stdout.puts
+      $stdout.puts 'Usage: catstomp DESTINATION'
+      $stdout.puts
+      $stdout.puts 'Publishes STDIN to the desired stomp destination'
+      $stdout.puts
+      $stdout.puts 'Example: ls | catstomp /topic/foo'
+      $stdout.puts
+      $stdout.puts 'Defaults:'
+      $stdout.puts "DESTINATION\t/topic/default"
+      $stdout.puts "STOMP_HOST\tlocalhost"
+      $stdout.puts "STOMP_PORT\t61613"
+      $stdout.puts "STOMP_USER"
+      $stdout.puts "STOMP_PASSWORD"
+      $stdout.puts
+      $stdout.puts 'You can override the stomp host, port, user, or password through environment variables'
+      exit 0
+    end
+
     @port = 61613
     @host = "localhost"
     @user = ENV["STOMP_USER"];

data/bin/stompcat

@@ -28,6 +28,25 @@ require 'stomp'
 #
 begin
 
+   if ARGV[0] == '-h' || ARGV[0] == '--help'
+      $stdout.puts
+      $stdout.puts 'Usage: stompcat DESTINATION'
+      $stdout.puts
+      $stdout.puts 'Receives data from a stomp destination and outputs it to STDOUT'
+      $stdout.puts
+      $stdout.puts 'Example: stompcat /topic/foo'
+      $stdout.puts
+      $stdout.puts 'Defaults:'
+      $stdout.puts "DESTINATION\t/topic/default"
+      $stdout.puts "STOMP_HOST\tlocalhost"
+      $stdout.puts "STOMP_PORT\t61613"
+      $stdout.puts "STOMP_USER\t"
+      $stdout.puts "STOMP_PASSWORD\t"
+      $stdout.puts
+      $stdout.puts 'You can override the host, port, user, or password through environment variables'
+      exit 0
+    end
+
     @port = 61613
     @host = "localhost"
     @user = ENV["STOMP_USER"];

data/examples/slogger.rb

@@ -175,7 +175,7 @@ class Slogger
   def on_ssl_connectfail(parms)
     begin
       @log.debug "SSL Connect Fail Parms #{info(parms)}"
-      @log.debug "SSL Connect Fail Excception #{parms[:ssl_exception]}, #{parms[:ssl_exception].message}"
+      @log.debug "SSL Connect Fail Exception #{parms[:ssl_exception]}, #{parms[:ssl_exception].message}"
     rescue
       @log.debug "SSL Connect Fail oops"
     end

data/examples/ssl_uc1.rb

@@ -1,19 +1,33 @@
 #
-# Reference: https://github.com/morellon/stomp/wiki/extended-ssl-overview
+# Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #
 require "rubygems"
 require "stomp"
 #
-# SSL Use Case 1
+# SSL Use Case 1 - server does *not* authenticate client, client does *not* authenticate server
 #
+# Subcase 1.A - Message broker configuration does *not* require client authentication
+#
+# - Expect connection success
+# - Expect a verify result of 20 becuase the client did not authenticate the
+#   server's certificate.
+#
+# Subcase 1.B - Message broker configuration *does* require client authentication
+#
+# - Expect connection failure (broker must be sent a valid client certificate)
+#
+ssl_opts = Stomp::SSLParams.new
 hash = { :hosts => [ 
-      {:login => 'guest', :passcode => 'guest', :host => 'localhost', :port => 61612, :ssl => true},
-      ]
+      {:login => 'guest', :passcode => 'guest', :host => 'localhost', :port => 61612, :ssl => ssl_opts},
+      ],
+    :reliable => false, # YMMV, to test this in a sane manner
     }
 #
 puts "Connect starts, SSL Use Case 1"
 c = Stomp::Connection.new(hash)
 puts "Connect completed"
+puts "SSL Verify Result: #{ssl_opts.verify_result}"
+# puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
 #
 c.disconnect
 

data/examples/ssl_uc1_ciphers.rb

@@ -1,12 +1,12 @@
 #
-# Reference: https://github.com/morellon/stomp/wiki/extended-ssl-overview
+# Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #
 require "rubygems"
 require "stomp"
 #
 # If you need your own ciphers list, this is how.
 # Stomp's default list will work in many cases.  If you need to use this, you
-# will know it because SSL connect's will fail.  In that case, determining
+# will know it because SSL connect will fail.  In that case, determining
 # _what_ should be in the list is your responsibility.
 #
 ciphers_list = [["DHE-RSA-AES256-SHA", "TLSv1/SSLv3", 256, 256], ["DHE-DSS-AES256-SHA", "TLSv1/SSLv3", 256, 256], ["AES256-SHA", "TLSv1/SSLv3", 256, 256], ["EDH-RSA-DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["EDH-DSS-DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["DHE-RSA-AES128-SHA", "TLSv1/SSLv3", 128, 128], ["DHE-DSS-AES128-SHA", "TLSv1/SSLv3", 128, 128], ["AES128-SHA", "TLSv1/SSLv3", 128, 128], ["RC4-SHA", "TLSv1/SSLv3", 128, 128], ["RC4-MD5", "TLSv1/SSLv3", 128, 128], ["EDH-RSA-DES-CBC-SHA", "TLSv1/SSLv3", 56, 56], ["EDH-DSS-DES-CBC-SHA", "TLSv1/SSLv3", 56, 56], 
@@ -25,6 +25,7 @@ hash = { :hosts => [
 puts "Connect starts, SSL Use Case 1"
 c = Stomp::Connection.new(hash)
 puts "Connect completed"
+puts "SSL Verify Result: #{ssl_opts.verify_result}"
 #
 c.disconnect
 

data/examples/ssl_uc2.rb

@@ -1,30 +1,36 @@
 #
-# Reference: https://github.com/morellon/stomp/wiki/extended-ssl-overview
+# Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #
 require "rubygems"
 require "stomp"
 #
-# SSL Use Case 2
+# SSL Use Case 2 - server does *not* authenticate client, client *does* authenticate server
 #
-ssl_opts = Stomp::SSLParams.new(:key_file => "/home/gmallard/sslwork/twocas_tj/clientCA/ClientTJ.key",
-  :cert_file => "/home/gmallard/sslwork/twocas_tj/clientCA/ClientTJ.crt")
-
+# Subcase 2.A - Message broker configuration does *not* require client authentication
+#
+# - Expect connection success
+# - Expect a verify result of 0 becuase the client did authenticate the
+#   server's certificate.
+#
+# Subcase 2.B - Message broker configuration *does* require client authentication
+#
+# - Expect connection failure (broker must be sent a valid client certificate)
+#
+ts_flist = []
+ts_flist << "/home/gmallard/sslwork/twocas_tj/serverCA/ServerTJCA.crt"
+ssl_opts = Stomp::SSLParams.new(:ts_files => ts_flist.join(","))
 #
 hash = { :hosts => [ 
       {:login => 'guest', :passcode => 'guest', :host => 'localhost', :port => 61612, :ssl => ssl_opts},
-      ]
+      ],
+    :reliable => false, # YMMV, to test this in a sane manner
     }
 #
 puts "Connect starts, SSL Use Case 2"
 c = Stomp::Connection.new(hash)
 puts "Connect completed"
-#
-# Expect a verify_result == 20
-#
-# This means: the client did not verify the peer's certificate, but the 
-# handshake succeeds, and the connection is allowed.
-#
 puts "SSL Verify Result: #{ssl_opts.verify_result}"
-puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
+# puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
 c.disconnect
 
+

data/examples/ssl_uc2_ciphers.rb

@@ -1,12 +1,12 @@
 #
-# Reference: https://github.com/morellon/stomp/wiki/extended-ssl-overview
+# Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #
 require "rubygems"
 require "stomp"
 #
 # If you need your own ciphers list, this is how.
 # Stomp's default list will work in many cases.  If you need to use this, you
-# will know it because SSL connect's will fail.  In that case, determining
+# will know it because SSL connect will fail.  In that case, determining
 # _what_ should be in the list is your responsibility.
 #
 ciphers_list = [["DHE-RSA-AES256-SHA", "TLSv1/SSLv3", 256, 256], ["DHE-DSS-AES256-SHA", "TLSv1/SSLv3", 256, 256], ["AES256-SHA", "TLSv1/SSLv3", 256, 256], ["EDH-RSA-DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["EDH-DSS-DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["DHE-RSA-AES128-SHA", "TLSv1/SSLv3", 128, 128], ["DHE-DSS-AES128-SHA", "TLSv1/SSLv3", 128, 128], ["AES128-SHA", "TLSv1/SSLv3", 128, 128], ["RC4-SHA", "TLSv1/SSLv3", 128, 128], ["RC4-MD5", "TLSv1/SSLv3", 128, 128], ["EDH-RSA-DES-CBC-SHA", "TLSv1/SSLv3", 56, 56], ["EDH-DSS-DES-CBC-SHA", "TLSv1/SSLv3", 56, 56], 
@@ -26,13 +26,7 @@ hash = { :hosts => [
 puts "Connect starts, SSL Use Case 2"
 c = Stomp::Connection.new(hash)
 puts "Connect completed"
-#
-# Expect a verify_result == 20
-#
-# This means: the client did not verify the peer's certificate, but the 
-# handshake succeeds, and the connection is allowed.
-#
 puts "SSL Verify Result: #{ssl_opts.verify_result}"
-puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
+# puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
 c.disconnect
 

data/examples/ssl_uc3.rb

@@ -1,29 +1,37 @@
 #
-# Reference: https://github.com/morellon/stomp/wiki/extended-ssl-overview
+# Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #
 require "rubygems"
 require "stomp"
 #
-# SSL Use Case 3
+# SSL Use Case 3 - server *does* authenticate client, client does *not* authenticate server
 #
-ts_flist = []
-ts_flist << "/home/gmallard/sslwork/twocas_tj/serverCA/ServerTJCA.crt"
-ssl_opts = Stomp::SSLParams.new(:ts_files => ts_flist.join(","))
+# Subcase 3.A - Message broker configuration does *not* require client authentication
+#
+# - Expect connection success
+# - Expect a verify result of 20 becuase the client did not authenticate the
+#   server's certificate.
+#
+# Subcase 3.B - Message broker configuration *does* require client authentication
+#
+# - Expect connection success if the server can authenticate the client certificate
+# - Expect a verify result of 20 because the client did not authenticate the
+#   server's certificate.
+#
+ssl_opts = Stomp::SSLParams.new(:key_file => "/home/gmallard/sslwork/twocas_tj/clientCA/ClientTJ.key",
+  :cert_file => "/home/gmallard/sslwork/twocas_tj/clientCA/ClientTJ.crt")
+
 #
 hash = { :hosts => [ 
       {:login => 'guest', :passcode => 'guest', :host => 'localhost', :port => 61612, :ssl => ssl_opts},
-      ]
+      ],
+    :reliable => false, # YMMV, to test this in a sane manner
     }
 #
 puts "Connect starts, SSL Use Case 3"
 c = Stomp::Connection.new(hash)
 puts "Connect completed"
-#
-# Expect a verify_result == 0
-#
-# This means: the client successfully verified the peer's certificate.
-#
 puts "SSL Verify Result: #{ssl_opts.verify_result}"
-puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
+# puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
 c.disconnect
 

data/examples/ssl_uc3_ciphers.rb

@@ -1,12 +1,12 @@
 #
-# Reference: https://github.com/morellon/stomp/wiki/extended-ssl-overview
+# Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #
 require "rubygems"
 require "stomp"
 #
 # If you need your own ciphers list, this is how.
 # Stomp's default list will work in many cases.  If you need to use this, you
-# will know it because SSL connect's will fail.  In that case, determining
+# will know it because SSL connect will fail.  In that case, determining
 # _what_ should be in the list is your responsibility.
 #
 ciphers_list = [["DHE-RSA-AES256-SHA", "TLSv1/SSLv3", 256, 256], ["DHE-DSS-AES256-SHA", "TLSv1/SSLv3", 256, 256], ["AES256-SHA", "TLSv1/SSLv3", 256, 256], ["EDH-RSA-DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["EDH-DSS-DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["DHE-RSA-AES128-SHA", "TLSv1/SSLv3", 128, 128], ["DHE-DSS-AES128-SHA", "TLSv1/SSLv3", 128, 128], ["AES128-SHA", "TLSv1/SSLv3", 128, 128], ["RC4-SHA", "TLSv1/SSLv3", 128, 128], ["RC4-MD5", "TLSv1/SSLv3", 128, 128], ["EDH-RSA-DES-CBC-SHA", "TLSv1/SSLv3", 56, 56], ["EDH-DSS-DES-CBC-SHA", "TLSv1/SSLv3", 56, 56], 
@@ -26,12 +26,7 @@ hash = { :hosts => [
 puts "Connect starts, SSL Use Case 3"
 c = Stomp::Connection.new(hash)
 puts "Connect completed"
-#
-# Expect a verify_result == 0
-#
-# This means: the client successfully verified the peer's certificate.
-#
 puts "SSL Verify Result: #{ssl_opts.verify_result}"
-puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
+# puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
 c.disconnect
 

data/examples/ssl_uc4.rb

@@ -1,10 +1,22 @@
 #
-# Reference: https://github.com/morellon/stomp/wiki/extended-ssl-overview
+# Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #
 require "rubygems"
 require "stomp"
 #
-# SSL Use Case 4
+# SSL Use Case 4 - server *does* authenticate client, client *does* authenticate server
+#
+# Subcase 4.A - Message broker configuration does *not* require client authentication
+#
+# - Expect connection success
+# - Expect a verify result of 0 becuase the client did authenticate the
+#   server's certificate.
+#
+# Subcase 4.B - Message broker configuration *does* require client authentication
+#
+# - Expect connection success if the server can authenticate the client certificate
+# - Expect a verify result of 0 because the client did authenticate the
+#   server's certificate.
 #
 ssl_opts = Stomp::SSLParams.new(:key_file => "/home/gmallard/sslwork/twocas_tj/clientCA/ClientTJ.key",
   :cert_file => "/home/gmallard/sslwork/twocas_tj/clientCA/ClientTJ.crt",
@@ -12,18 +24,14 @@ ssl_opts = Stomp::SSLParams.new(:key_file => "/home/gmallard/sslwork/twocas_tj/c
 #
 hash = { :hosts => [ 
       {:login => 'guest', :passcode => 'guest', :host => 'localhost', :port => 61612, :ssl => ssl_opts},
-      ]
+      ],
+    :reliable => false, # YMMV, to test this in a sane manner
     }
 #
 puts "Connect starts, SSL Use Case 4"
 c = Stomp::Connection.new(hash)
 puts "Connect completed"
-#
-# Expect a verify_result == 0
-#
-# This means: the client successfully verified the peer's certificate.
-#
 puts "SSL Verify Result: #{ssl_opts.verify_result}"
-puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
+# puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
 c.disconnect
 

data/examples/ssl_uc4_ciphers.rb

@@ -1,12 +1,12 @@
 #
-# Reference: https://github.com/morellon/stomp/wiki/extended-ssl-overview
+# Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #
 require "rubygems"
 require "stomp"
 #
 # If you need your own ciphers list, this is how.
 # Stomp's default list will work in many cases.  If you need to use this, you
-# will know it because SSL connect's will fail.  In that case, determining
+# will know it because SSL connect will fail.  In that case, determining
 # _what_ should be in the list is your responsibility.
 #
 ciphers_list = [["DHE-RSA-AES256-SHA", "TLSv1/SSLv3", 256, 256], ["DHE-DSS-AES256-SHA", "TLSv1/SSLv3", 256, 256], ["AES256-SHA", "TLSv1/SSLv3", 256, 256], ["EDH-RSA-DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["EDH-DSS-DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["DES-CBC3-SHA", "TLSv1/SSLv3", 168, 168], ["DHE-RSA-AES128-SHA", "TLSv1/SSLv3", 128, 128], ["DHE-DSS-AES128-SHA", "TLSv1/SSLv3", 128, 128], ["AES128-SHA", "TLSv1/SSLv3", 128, 128], ["RC4-SHA", "TLSv1/SSLv3", 128, 128], ["RC4-MD5", "TLSv1/SSLv3", 128, 128], ["EDH-RSA-DES-CBC-SHA", "TLSv1/SSLv3", 56, 56], ["EDH-DSS-DES-CBC-SHA", "TLSv1/SSLv3", 56, 56], 
@@ -27,12 +27,7 @@ hash = { :hosts => [
 puts "Connect starts, SSL Use Case 4"
 c = Stomp::Connection.new(hash)
 puts "Connect completed"
-#
-# Expect a verify_result == 0
-#
-# This means: the client successfully verified the peer's certificate.
-#
 puts "SSL Verify Result: #{ssl_opts.verify_result}"
-puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
+# puts "SSL Peer Certificate:\n#{ssl_opts.peer_cert}"
 c.disconnect
 

data/examples/ssl_ucx_default_ciphers.rb

@@ -1,13 +1,14 @@
 #
-# Reference: https://github.com/morellon/stomp/wiki/extended-ssl-overview
+# Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #
 require "rubygems"
 require "stomp"
-
 #
-# If you use SSLParams, and need the _default_ Ruby ciphers, this is how. 
+# If you use SSLParams, and need the _default_ Ruby ciphers, this is how.
+#
+# NOTE: JRuby users may find that this is a *required* action. YMMV.
 #
-ssl_opts = Stomp::SSLParams.new(:use_ruby_ciphers => true)
+ssl_opts = Stomp::SSLParams.new(:use_ruby_ciphers => true) # Plus other parameters as needed
 #
 # SSL Use Case: Using default Stomp ciphers
 #
@@ -17,7 +18,7 @@ hash = { :hosts => [
       ]
     }
 #
-puts "Connect starts, SSL Use Case X"
+puts "Connect starts, SSL , Use Default Ruby Ciphers"
 c = Stomp::Connection.new(hash)
 puts "Connect completed"
 #

data/lib/stomp/client.rb

@@ -265,6 +265,12 @@ module Stomp
       @connection.uuid()
     end
 
+    # Poll for asynchronous messages issued by broker.
+    # Return nil of no message available, else the message
+    def poll
+      @connection.poll
+    end
+
     private
       # Set a subscription id in the headers hash if one does not already exist.
       # For simplicities sake, all subscriptions have a subscription ID.

data/lib/stomp/connection.rb

@@ -170,7 +170,6 @@ module Stomp
 
     def refine_params(params)
       params = params.uncamelize_and_symbolize_keys
-
       default_params = {
         :connect_headers => {},
         :reliable => true,
@@ -184,11 +183,15 @@ module Stomp
         :backup => false,
         :connect_timeout => 0,
         # Parse Timeout
-        :parse_timeout => 5
+        :parse_timeout => 5,
+        :dmh => false,
       }
 
-      default_params.merge(params)
-
+      res_params = default_params.merge(params)
+      if res_params[:dmh]
+        res_params = _expand_hosts(res_params)
+      end
+      return res_params
     end
 
     def change_host
@@ -487,6 +490,30 @@ module Stomp
 
     private
 
+      def _expand_hosts(hash)
+        new_hash = hash.clone
+        new_hash[:hosts_cloned] = hash[:hosts].clone
+        new_hash[:hosts] = []
+        #
+        hash[:hosts].each do |host_parms|
+          ai = Socket.getaddrinfo(host_parms[:host], nil, nil, Socket::SOCK_STREAM)
+          next if ai.nil? || ai.size == 0
+          info6 = ai.detect {|info| info[4] == Socket::AF_INET6}
+          info4 = ai.detect {|info| info[4] == Socket::AF_INET}
+          if info6
+            new_hostp = host_parms.clone
+            new_hostp[:host] = info6[3]
+            new_hash[:hosts] << new_hostp
+          end
+          if info4
+            new_hostp = host_parms.clone
+            new_hostp[:host] = info4[3]
+            new_hash[:hosts] << new_hostp
+          end
+        end
+        return new_hash
+      end
+
       def _receive( read_socket )
         @read_semaphore.synchronize do
           line = read_socket.gets
@@ -596,8 +623,8 @@ module Stomp
           # and ActiveMQ will interpret the message as a TextMessage.
           # For more information refer to http://juretta.com/log/2009/05/24/activemq-jms-stomp/
           # Lets send this header in the message, so it can maintain state when using unreceive
-          headers['content-length'] = "#{body_length_bytes}" unless headers[:suppress_content_length]
-          headers['content-type'] = "text/plain; charset=UTF-8" unless headers['content-type']
+          headers[:'content-length'] = "#{body_length_bytes}" unless headers[:suppress_content_length]
+          headers[:'content-type'] = "text/plain; charset=UTF-8" unless headers[:'content-type']
           used_socket.puts command
           headers.each do |k,v|
             if v.is_a?(Array)
@@ -684,10 +711,10 @@ module Stomp
             if @ssl.cert_file # Any check will do here
               raise Stomp::Error::SSLNoCertFileError if !File::exists?(@ssl.cert_file)
               raise Stomp::Error::SSLUnreadableCertFileError if !File::readable?(@ssl.cert_file)
-              ctx.cert = OpenSSL::X509::Certificate.new(File.open(@ssl.cert_file))
+              ctx.cert = OpenSSL::X509::Certificate.new(File.read(@ssl.cert_file))
               raise Stomp::Error::SSLNoKeyFileError if !File::exists?(@ssl.key_file)
               raise Stomp::Error::SSLUnreadableKeyFileError if !File::readable?(@ssl.key_file)
-              ctx.key  = OpenSSL::PKey::RSA.new(File.open(@ssl.key_file))
+              ctx.key  = OpenSSL::PKey::RSA.new(File.read(@ssl.key_file), @ssl.key_password)
             end
 
             # Cipher list
@@ -815,10 +842,16 @@ module Stomp
       def _post_connect
         return unless (@connect_headers[:"accept-version"] && @connect_headers[:host])
         return if @connection_frame.command == Stomp::CMD_ERROR
+        # We are CONNECTed
         cfh = @connection_frame.headers.symbolize_keys
         @protocol = cfh[:version]
-        # Should not happen, but check anyway
-        raise Stomp::Error::UnsupportedProtocolError unless Stomp::SUPPORTED.index(@protocol)
+        if @protocol
+          # Should not happen, but check anyway
+          raise Stomp::Error::UnsupportedProtocolError unless Stomp::SUPPORTED.index(@protocol)
+        else # CONNECTed to a 1.0 server that does not return *any* 1.1 type headers
+          @protocol = Stomp::SPL_10 # reset
+          return
+        end 
         # Heartbeats
         return unless @connect_headers[:"heart-beat"]
         _init_heartbeats()

data/lib/stomp/message.rb

@@ -41,7 +41,7 @@ module Stomp
       end
       self.command = work_command
       work_headers.split("\n").map do |value|
-        parsed_value = value.match /^([\w|-]*):(.*)$/
+        parsed_value = value.match /^([\r|\w|-]*):(.*)$/
 				raise Stomp::Error::InvalidFormat, 'parsed header value' unless parsed_value
         #
         pk = parsed_value[1]

data/lib/stomp/sslparams.rb

@@ -14,6 +14,8 @@ module  Stomp
         attr_accessor  :cert_file
         #  The  client  private  key  file.
         attr_accessor  :key_file
+        #  The  client  private  key  password.
+        attr_accessor  :key_password
         #  SSL  Connect  Verify  Result.    The  result  of  the  handshake.
         attr_accessor  :verify_result
         #  The  certificate  of  the  connection  peer  (the  server),  received  during
@@ -38,6 +40,7 @@ module  Stomp
           #  Client  authentication  parameters
           @cert_file  =  opts[:cert_file]                  #  Client  cert
           @key_file  =  opts[:key_file]                      #  Client  key
+          @key_password  =  opts[:key_password]                      #  Client  key password
           #
           raise  Stomp::Error::SSLClientParamsError if @cert_file.nil?  &&  !@key_file.nil?
           raise  Stomp::Error::SSLClientParamsError if !@cert_file.nil?  &&  @key_file.nil?

data/lib/stomp/version.rb

@@ -4,7 +4,7 @@ module Stomp
   module Version  #:nodoc: all
     MAJOR = 1
     MINOR = 2
-    PATCH = 2
+    PATCH = 3
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/connection_spec.rb

@@ -20,7 +20,8 @@ describe Stomp::Connection do
       :backup => false,
       :connect_timeout => 0,
       :parse_timeout => 5,
-      :connect_headers => {}
+      :connect_headers => {},
+      :dmh => false,
     }
         
     #POG:
@@ -298,7 +299,8 @@ describe Stomp::Connection do
           :backup => false,
           :connect_timeout => 0,
           :parse_timeout => 5,
-          :connect_headers => {}
+          :connect_headers => {},
+          :dmh => false,
         }
         
         used_hash =  {
@@ -330,7 +332,8 @@ describe Stomp::Connection do
           :parse_timeout => 20,
           :connect_headers => {:lerolero => "ronaldo"},
           :dead_letter_queue => "queue/Error",
-          :max_redeliveries => 10
+          :max_redeliveries => 10,
+          :dmh => false,
         }
         
         @connection = Stomp::Connection.new(used_hash)

data/stomp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stomp}
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian McCallister", "Marius Mathiesen", "Thiago Morello", "Guy M. Allard"]
-  s.date = %q{2012-03-24}
+  s.date = %q{2012-06-16}
   s.description = %q{Ruby client for the Stomp messaging protocol.  Note that this gem is no longer supported on rubyforge.}
   s.email = ["brianm@apache.org", "marius@stones.com", "morellon@gmail.com", "allard.guy.m@gmail.com"]
   s.executables = ["catstomp", "stompcat"]
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
     "test/test_ssl.rb",
     "test/tlogger.rb"
   ]
-  s.homepage = %q{https://github.com/morellon/stomp}
+  s.homepage = %q{https://github.com/stompgem/stomp}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby client for the Stomp messaging protocol}

data/test/test_client.rb

@@ -18,6 +18,12 @@ class TestClient < Test::Unit::TestCase
     @client.close if @client.open? # allow tests to close
   end
 
+  def test_poll_async
+    # If the test 'hangs' here, Connection#poll is broken.
+    m = @client.poll
+    assert m.nil?
+  end
+
   def test_ack_api_works
     @client.publish make_destination, message_text, {:suppress_content_length => true}
 

data/test/test_connection.rb

@@ -384,5 +384,35 @@ class TestConnection < Test::Unit::TestCase
     end
   end
 
+  # Test to illustrate Issue #44.  Prior to a fix for #44, these tests would
+  # fail only when connecting to a pure STOMP 1.0 server that does not 
+  # return a 'version' header at all.
+  def test_conn10_simple
+    @conn.disconnect
+    #
+    hash = { :hosts => [ 
+      {:login => user, :passcode => passcode, :host => host, :port => port, :ssl => false},
+      ],
+      :connect_headers => {"accept-version" => "1.0", "host" => host},
+      :reliable => false,
+    }
+    c = nil
+    assert_nothing_raised {
+      c = Stomp::Connection.new(hash)
+    }
+    c.disconnect if c
+    #
+    hash = { :hosts => [ 
+      {:login => user, :passcode => passcode, :host => host, :port => port, :ssl => false},
+      ],
+      :connect_headers => {"accept-version" => "3.14159,1.0,12.0", "host" => host},
+      :reliable => false,
+    }
+    c = nil
+    assert_nothing_raised {
+      c = Stomp::Connection.new(hash)
+    }
+    c.disconnect if c
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stomp
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Brian McCallister
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-24 00:00:00 -04:00
+date: 2012-06-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,7 +108,7 @@ files:
 - test/test_ssl.rb
 - test/tlogger.rb
 has_rdoc: true
-homepage: https://github.com/morellon/stomp
+homepage: https://github.com/stompgem/stomp
 licenses: []
 
 post_install_message: