stomp 1.3.5 → 1.4.0

data/test/test_ssl.rb

@@ -39,13 +39,13 @@ class TestSSL < Test::Unit::TestCase
   # Test using correct parameters.
   def test_ssl_0020_noraise
     assert_nothing_raised {
-      ssl_parms = Stomp::SSLParams.new(:cert_file => "dummy1", :key_file => "dummy2")
+      _ = Stomp::SSLParams.new(:cert_file => "dummy1", :key_file => "dummy2")
     }
     assert_nothing_raised {
-      ssl_parms = Stomp::SSLParams.new(:ts_files => "dummyts1")
+      _ = Stomp::SSLParams.new(:ts_files => "dummyts1")
     }
     assert_nothing_raised {
-      ssl_parms = Stomp::SSLParams.new(:ts_files => "dummyts1", 
+      _ = Stomp::SSLParams.new(:ts_files => "dummyts1", 
         :cert_file => "dummy1", :key_file => "dummy2")
     }
   end
@@ -53,25 +53,25 @@ class TestSSL < Test::Unit::TestCase
   # Test using incorrect / incomplete parameters.
   def test_ssl_0030_raise
     assert_raise(Stomp::Error::SSLClientParamsError) {
-      ssl_parms = Stomp::SSLParams.new(:cert_file => "dummy1")
+      _ = Stomp::SSLParams.new(:cert_file => "dummy1")
     }
     assert_raise(Stomp::Error::SSLClientParamsError) {
-      ssl_parms = Stomp::SSLParams.new(:key_file => "dummy2")
+      _ = Stomp::SSLParams.new(:key_file => "dummy2")
     }
   end
 
   # Test that :fsck works.
   def test_ssl_0040_fsck
     assert_raise(Stomp::Error::SSLNoCertFileError) {
-      ssl_parms = Stomp::SSLParams.new(:cert_file => "dummy1", 
+      _ = Stomp::SSLParams.new(:cert_file => "dummy1", 
         :key_file => "dummy2", :fsck => true)
     }
     assert_raise(Stomp::Error::SSLNoKeyFileError) {
-      ssl_parms = Stomp::SSLParams.new(:cert_file => __FILE__,
+      _ = Stomp::SSLParams.new(:cert_file => __FILE__,
         :key_file => "dummy2", :fsck => true)
     }
     assert_raise(Stomp::Error::SSLNoTruststoreFileError) {
-      ssl_parms = Stomp::SSLParams.new(:ts_files => "/tmp/not-likely-here.txt", 
+      _ = Stomp::SSLParams.new(:ts_files => "/tmp/not-likely-here.txt", 
         :fsck => true)
     }
   end

data/test/test_urlogin.rb

@@ -14,12 +14,12 @@ end
 =end
 class TestURLLogins < Test::Unit::TestCase
   include TestBase
-  
+
   def setup
     hostname = host()
     portnum = port()
     sslpn = ssl_port()
-    @tdstomp = [ 
+    @tdstomp = [
           "stomp://guestl:guestp@#{hostname}:#{portnum}",
           "stomp://#{hostname}:#{portnum}",
           "stomp://@#{hostname}:#{portnum}",
@@ -32,10 +32,10 @@ class TestURLLogins < Test::Unit::TestCase
       "failover://(stomp://#{hostname}:#{portnum})?whatup=doc&coyote=kaboom",
       "failover://(stomp://#{hostname}:#{portnum})?whatup=doc",
       "failover://(stomp://#{hostname}:#{portnum})?whatup=doc&coyote=kaboom&randomize=true",
-      'failover://(stomp://f@#$$%^&*()_+=o.o::b~!@#$%^&*()+-_=?:<>,.@@' + "localhost" + ":#{portnum}" + ")",
-      'failover://(stomp://f@#$$%^&*()_+=o.o::b~!@#$%^&*()+-_=:<>,.@@' + "localhost" + ":#{portnum}" + ")",
-      'failover://(stomp://f@#$$%^&*()_+=o.o::b~!@#$%^&*()+-_=?:<>,.@@' + "localhost" + ":#{portnum}" + ")?a=b",
-      'failover://(stomp://f@#$$%^&*()_+=o.o::b~!@#$%^&*()+-_=:<>,.@@' + "localhost" + ":#{portnum}" + ")?c=d&e=f",
+      'failover://(stomp://f@#$$%^&*()_+=o.o::b~!@#$%^&*()+-_=?:<>,.@@' + "#{hostname}" + ":#{portnum}" + ")",
+      'failover://(stomp://f@#$$%^&*()_+=o.o::b~!@#$%^&*()+-_=:<>,.@@' + "#{hostname}" + ":#{portnum}" + ")",
+      'failover://(stomp://f@#$$%^&*()_+=o.o::b~!@#$%^&*()+-_=?:<>,.@@' + "#{hostname}" + ":#{portnum}" + ")?a=b",
+      'failover://(stomp://f@#$$%^&*()_+=o.o::b~!@#$%^&*()+-_=:<>,.@@' + "#{hostname}" + ":#{portnum}" + ")?c=d&e=f",
       "failover://(stomp://usera:passa@#{hostname}:#{portnum})",
       "failover://(stomp://usera:@#{hostname}:#{portnum})",
       "failover://(stomp://#{hostname}:#{portnum},stomp://#{hostname}:#{portnum})",
@@ -43,12 +43,17 @@ class TestURLLogins < Test::Unit::TestCase
       "failover://(stomp://usera:@#{hostname}:#{portnum},stomp://#{hostname}:#{portnum})",
       "failover://(stomp://#{hostname}:#{portnum},stomp://#{hostname}:#{portnum})?a=b&c=d",
       "failover://(stomp://#{hostname}:#{portnum},stomp://#{hostname}:#{portnum})?a=b&c=d&connect_timeout=2020",
+    ]
+
+    @sslfailover = [
       "failover://(stomp+ssl://#{hostname}:#{sslpn})",
       "failover://(stomp+ssl://usera:passa@#{hostname}:#{sslpn})",
       "failover://(stomp://usera:@#{hostname}:#{portnum},stomp+ssl://#{hostname}:#{sslpn})",
     ]
 
     @badparms = "failover://(stomp://#{hostname}:#{portnum})?a=b&noequal"
+
+    @client = nil
   end
 
   def teardown
@@ -65,9 +70,21 @@ class TestURLLogins < Test::Unit::TestCase
     end
   end
 
-  # test failover:// urls
-  def test_0020_failover_urls()
+  # test failover:// urls - tcp
+  def test_0020_failover_urls_tcp()
     @tdfailover.each_with_index do |url, ndx|
+      # p [ "xurl", url, "xndx", ndx ]
+      c = Stomp::Client.new(url)
+      assert !c.nil?, url
+      assert c.open?, url
+      c.close
+    end
+  end
+
+  # test failover:// urls - ssl
+  def test_0020_failover_urls_ssl()
+    @sslfailover.each_with_index do |url, ndx|
+      # p [ "sslxurl", url, "sslxndx", ndx ]
       c = Stomp::Client.new(url)
       assert !c.nil?, url
       assert c.open?, url
@@ -78,9 +95,8 @@ class TestURLLogins < Test::Unit::TestCase
   # test failover:// with bad parameters
   def test_0020_failover_badparms()
     assert_raise(Stomp::Error::MalformedFailoverOptionsError) {
-      c = Stomp::Client.new(@badparms)
+      _ = Stomp::Client.new(@badparms)
     }
   end
 
 end unless ENV['STOMP_RABBIT']
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stomp
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 5
-  version: 1.3.5
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Brian McCallister
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-03-02 00:00:00 -05:00
+date: 2016-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,75 +44,27 @@ email:
 - morellon@gmail.com
 - allard.guy.m@gmail.com
 executables: 
-- catstomp
 - stompcat
+- catstomp
 extensions: []
 
 extra_rdoc_files: 
-- CHANGELOG.rdoc
 - LICENSE
-- README.rdoc
-- examples/amqdurasub.rb
-- examples/client11_ex1.rb
-- examples/client11_putget1.rb
-- examples/conn11_ex1.rb
-- examples/conn11_ex2.rb
-- examples/conn11_hb1.rb
-- examples/consumer.rb
-- examples/examplogger.rb
-- examples/get11conn_ex1.rb
-- examples/get11conn_ex2.rb
-- examples/logexamp.rb
-- examples/logexamp_ssl.rb
-- examples/publisher.rb
-- examples/put11conn_ex1.rb
-- examples/putget11_rh1.rb
-- examples/ssl_ctxoptions.rb
-- examples/ssl_newparm.rb
-- examples/ssl_uc1.rb
-- examples/ssl_uc1_ciphers.rb
-- examples/ssl_uc2.rb
-- examples/ssl_uc2_ciphers.rb
-- examples/ssl_uc3.rb
-- examples/ssl_uc3_ciphers.rb
-- examples/ssl_uc4.rb
-- examples/ssl_uc4_ciphers.rb
-- examples/ssl_ucx_default_ciphers.rb
-- examples/stomp11_common.rb
-- examples/topic_consumer.rb
-- examples/topic_publisher.rb
-- lib/client/utils.rb
-- lib/connection/heartbeats.rb
-- lib/connection/netio.rb
-- lib/connection/utf8.rb
-- lib/connection/utils.rb
-- lib/stomp.rb
-- lib/stomp/client.rb
-- lib/stomp/codec.rb
-- lib/stomp/connection.rb
-- lib/stomp/constants.rb
-- lib/stomp/errors.rb
-- lib/stomp/ext/hash.rb
-- lib/stomp/message.rb
-- lib/stomp/null_logger.rb
-- lib/stomp/slogger.rb
-- lib/stomp/sslparams.rb
-- lib/stomp/version.rb
-- test/test_anonymous.rb
-- test/test_client.rb
-- test/test_codec.rb
-- test/test_connection.rb
-- test/test_connection1p.rb
-- test/test_helper.rb
-- test/test_message.rb
-- test/test_ssl.rb
-- test/test_urlogin.rb
-- test/tlogger.rb
+- README.md
 files: 
-- CHANGELOG.rdoc
+- CHANGELOG.md
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
+- adhoc/.gitignore
+- adhoc/README.md
+- adhoc/issue121_01.rb
+- adhoc/issue121_01_conn.rb
+- adhoc/issue121_02.rb
+- adhoc/issue121_03.rb
+- adhoc/payload_generator.rb
+- adhoc/payload_generator_adhoctest.rb
+- adhoc/stomp_adhoc_common.rb
 - bin/catstomp
 - bin/stompcat
 - examples/amqdurasub.rb
@@ -121,12 +73,18 @@ files:
 - examples/conn11_ex1.rb
 - examples/conn11_ex2.rb
 - examples/conn11_hb1.rb
+- examples/consume_file.rb
 - examples/consumer.rb
+- examples/contrib.sh
+- examples/contributors.rb
 - examples/examplogger.rb
 - examples/get11conn_ex1.rb
 - examples/get11conn_ex2.rb
+- examples/lflogger.rb
 - examples/logexamp.rb
 - examples/logexamp_ssl.rb
+- examples/publish_file.rb
+- examples/publish_file_conn.rb
 - examples/publisher.rb
 - examples/put11conn_ex1.rb
 - examples/putget11_rh1.rb
@@ -168,6 +126,7 @@ files:
 - spec/message_spec.rb
 - spec/spec_helper.rb
 - stomp.gemspec
+- test/.gitignore
 - test/test_anonymous.rb
 - test/test_client.rb
 - test/test_codec.rb
@@ -181,7 +140,7 @@ files:
 has_rdoc: true
 homepage: https://github.com/stompgem/stomp
 licenses: 
-- Apache 2.0
+- Apache-2.0
 post_install_message: 
 rdoc_options: []
 

data/README.rdoc

@@ -1,163 +0,0 @@
-==README
-
-* (https://github.com/stompgem/stomp/)
-
-===Overview
-
-An implementation of the Stomp protocol for Ruby. See:
-
-* [STOMP 1.0, 1.1, and 1.2] (http://stomp.github.com/index.html)
-
-===Hash Login Example Usage (this is the recommended login technique)
-
-  hash = {
-      :hosts => [
-        # First connect is to remotehost1
-        {:login => "login1", :passcode => "passcode1", :host => "remotehost1", :port => 61612, :ssl => true},
-        # First failover connect is to remotehost2
-        {:login => "login2", :passcode => "passcode2", :host => "remotehost2", :port => 61613, :ssl => false},
-
-      ],
-      # These are the default parameters and do not need to be set
-      :reliable => true,                  # reliable (use failover)
-      :initial_reconnect_delay => 0.01,   # initial delay before reconnect (secs)
-      :max_reconnect_delay => 30.0,       # max delay before reconnect
-      :use_exponential_back_off => true,  # increase delay between reconnect attpempts
-      :back_off_multiplier => 2,          # next delay multiplier
-      :max_reconnect_attempts => 0,       # retry forever, use # for maximum attempts
-      :randomize => false,                # do not radomize hosts hash before reconnect
-      :connect_timeout => 0,              # Timeout for TCP/TLS connects, use # for max seconds
-      :connect_headers => {},             # user supplied CONNECT headers (req'd for Stomp 1.1+)
-      :parse_timeout => 5,                # receive / read timeout, secs
-      :logger => nil,                     # user suplied callback logger instance
-      :dmh => false,                      # do not support multihomed IPV4 / IPV6 hosts during failover
-      :closed_check => true,              # check first if closed in each protocol method
-      :hbser => false,                    # raise on heartbeat send exception
-      :stompconn => false,                # Use STOMP instead of CONNECT
-      :usecrlf => false,                  # Use CRLF command and header line ends (1.2+)
-      :max_hbread_fails => 0,             # Max HB read fails before retry.  0 => never retry
-      :max_hbrlck_fails => 0,             # Max HB read lock obtain fails before retry.  0 => never retry
-      :fast_hbs_adjust => 0.0,            # Fast heartbeat senders sleep adjustment, seconds, needed ...
-                                          # For fast heartbeat senders.  'fast' == YMMV.  If not
-                                          # correct for your environment, expect unnecessary fail overs
-      :connread_timeout => 0,             # Timeout during CONNECT for read of CONNECTED/ERROR, secs
-      :tcp_nodelay => true,               # Turns on the TCP_NODELAY socket option; disables Nagle's algorithm
-      :start_timeout => 0,                # Timeout around Stomp::Client initialization
-      :sslctx_newparm => nil,             # Param for SSLContext.new
-    }
-
-    # for client
-    client = Stomp::Client.new(hash)
-
-    # for connection
-    connection = Stomp::Connection.new(hash)
-
-===Positional Parameter Usage
-
-    client = Stomp::Client.new("user", "pass", "localhost", 61613)
-    client.publish("/queue/mine", "hello world!")
-    client.subscribe("/queue/mine") do |msg|
-      p msg
-    end
-
-===Stomp URL Usage
-
-    # Stomp URL :
-    A Stomp URL must begin with 'stomp://' and can be in one of the following forms:
-
-    stomp://host:port
-    stomp://host.domain.tld:port
-    stomp://login:passcode@host:port
-    stomp://login:passcode@host.domain.tld:port
-
-    e.g. c = Stomp::Client.new(urlstring)
-
-===Failover + SSL Example URL Usage
-
-    options = "initialReconnectDelay=5000&randomize=false&useExponentialBackOff=false"
-
-    # remotehost1 uses SSL, remotehost2 doesn't
-    client = Stomp::Client.new("failover:(stomp+ssl://login1:passcode1@remotehost1:61612,stomp://login2:passcode2@remotehost2:61613)?#{options}")
-
-    client.publish("/queue/mine", "hello world!")
-    client.subscribe("/queue/mine") do |msg|
-      p msg
-    end
-
-===New
-
-See _CHANGELOG.rdoc_ for details.
-
-* Gem version 1.3.5. Miscellaneous fixes, see CHANGELOG.rdoc for details.
-* Gem version 1.3.4. Miscellaneous fixes, see CHANGELOG.rdoc for details.
-* Gem version 1.3.3. Miscellaneous fixes, see CHANGELOG.rdoc for details.
-* Gem version 1.3.2. Miscellaneous fixes, see changelog for details.
-* Gem version 1.3.1. Bugfix for logging.
-* Gem version 1.3.0. Added ERROR frame raising as exception, added anonymous connections, miscellaneous other fixes.
-* Gem version 1.2.16. Fixed Stomp::Client to expose its connection's host parameters.
-* Gem version 1.2.15. Timeout cleanup, added license info to gemspec.
-* Gem version 1.2.14. Cleanup.
-* Gem version 1.2.13. Stomp::Client#unreceive max_redeliveries fix.
-* Gem version 1.2.12. Miscellaneous issue fixes and cleanup.
-* Gem version 1.2.11. JRuby and AMQ support fixes.
-* Gem version 1.2.10. Support failover from heartbeat threads.
-* Gem version 1.2.9. Miscellaneous fixes and changes.
-* Gem version 1.2.8. Stomp 1.1+ header codec inversion fix, test refactoring.
-* Gem version 1.2.7. Stomp 1.2 support and miscellaneous fixes.
-* Gem version 1.2.6. Miscellaneous fixes and changes.
-* Gem version 1.2.5. Restructure. Forks with modifcations will be affected.
-* Gem version 1.2.4. Stomp 1.1 heartbeat fix, autoflush capability, miscellaneous fixes.
-* Gem version 1.2.3. Miscellaneous fixes, see changelog for details.
-* Gem version 1.2.2. Performance and more SSL enhancements.
-* Gem version 1.2.1. Full support of SSL certificates.
-* Gem version 1.2.0. Support of Stomp protocol level 1.1.
-
-===Historical Information
-
-Up until March 2009 the project was maintained and primarily developed by Brian McCallister.
-
-===Source Code and Project URLs
-
-  https://github.com/stompgem/stomp/
-
-===Stomp Protocol Information :
-
-  http://stomp.github.com/index.html
-
-= Contributors
-
-The following people have contributed to Stomp:
-
-* Brian McCallister
-* Glenn Rempe <glenn@rempe.us>
-* jstrachan
-* Marius Mathiesen <marius.mathiesen@gmail.com>
-* Johan S√∏rensen <johan@johansorensen.com>
-* Thiago Morello
-* Guy M. Allard <stompgem@gmail.com>
-* kookster
-* Tony Garnock-Jones <tonyg@lshift.net>
-* chirino
-* Stefan Saasen
-* Neil Wilson
-* Dinesh Majrekar
-* Kiall Mac Innes
-* Rob Skaggs
-* Tom May
-* Lucas Hills
-* Chris Needham
-* R.I. Pienaar
-* tworker
-* James Pearson
-* Craig
-* Tommy Bishop
-* Jeremy Gailor
-* JP Hastings-Spital
-* Glenn Roberts
-* Ian Smith
-* Orazio Cotroneo
-* m4rCsi
-* Michael Klishin
-* Patrick Sharp
-* Wayne Robinson
-