stomp 1.2.3 → 1.2.4

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+== 1.2.4 20120625
+
+* Add ability for client to request flush on write to the connection (Issue #45)
+* Add ability for client to retrieve heartbeat intervals and counters
+* Fix I/O errors with heartbeats and multithreaded clients (Issue #46)
+* Enhance tests for heartbeats
+* Correct typos and clarify comments in many examples
+
 == 1.2.3 20120616
 
 * Fix UnsupportedProtocol on connect to a 1.0 broker

data/README.rdoc

@@ -10,6 +10,7 @@ An implementation of the Stomp protocol for Ruby. See:
 
 ===New
 
+* Gem version 1.2.2.  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.
 * Full support of SSL certificates is announced as of gem version 1.2.1.
@@ -106,4 +107,5 @@ The following people have contributed to Stomp:
 * James Pearson
 * Craig
 * Tommy Bishop
+* Jeremy Gailor
 

data/examples/client11_ex1.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # The current require dance for different Ruby versions.
 # Change this to suit your requirements.
@@ -13,11 +15,11 @@ include Stomp11Common
 # Stomp 1.1 Client Example 1
 # ==============================
 #
-# Purpose: to demonstrate a clientect and disclientect sequence using Stomp 1.1
-# with the Stomp#client intreface.
+# Purpose: to demonstrate a connect and disconnect sequence using Stomp 1.1
+# with the Stomp#Client interface.
 #
-# Note: Stomp#client does not provide a positional set of parameters that
-# contain a 'clientect_headers' parameter.  To use the Stomp#client interface
+# Note: Stomp#Client does not provide a positional set of parameters that
+# contain a 'connect_headers' parameter.  To use the Stomp#Client interface
 # you _must_ use a 'hashed' set of parameters.
 #
 # Create connection headers
@@ -26,8 +28,8 @@ include Stomp11Common
 # The two headers used here are _required_ by the specification.
 #
 client_hdrs = {"accept-version" => "1.1",    # Demand a 1.1 connection (use a CSV list if you will consider multiple versions)
-      "host" => virt_host,                 # The 1.1 vhost (could be different than connection host)
-    }                                      # No heartbeats here:  there will be none for this connection
+      "host" => virt_host,                   # The 1.1 vhost (could be different than connection host)
+    }                                        # No heartbeats here:  there will be none for this connection
 #
 # Create the connect hash.
 # ========================
@@ -42,7 +44,7 @@ client_hash = { :hosts => [
 # ================
 #
 client = Stomp::Client.new(client_hash)
-puts "Connection complete"
+puts "Client Connect complete"
 #
 # Let's just do some sanity checks, and look around.
 #
@@ -72,7 +74,7 @@ puts "Server requested heartbeats - \t#{client.connection_frame().headers['heart
 # =============
 #
 client.close   # Business as usual, just like 1.0
-puts "Disclientect complete"
+puts "Client close complete"
 
 
 

data/examples/client11_putget1.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # The current require dance for different Ruby versions.
 # Change this to suit your requirements.
@@ -26,7 +28,7 @@ client_hash = { :hosts => [
     }
 #
 client = Stomp::Client.new(client_hash)
-puts "Connection complete"
+puts "Client Connect complete"
 #
 raise "Unexpected protocol level" if client.protocol() != Stomp::SPL_11
 #
@@ -51,7 +53,7 @@ raise "Unexpected data" if data != message.body
 raise "Bad subscription header" if uuid != message.headers['subscription']
 #
 client.close   # Business as usual, just like 1.0
-puts "Disclientect complete"
+puts "Client close complete"
 
 
 

data/examples/conn11_ex1.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # The current require dance for different Ruby versions.
 # Change this to suit your requirements.
@@ -15,7 +17,7 @@ include Stomp11Common
 #
 # Purpose: to demonstrate a connect and disconnect sequence using Stomp 1.1.
 #
-# Note: this example assumes that you have at least the 1.1.11 gem release 
+# Note: this example assumes that you have at least the 1.2.0 gem release 
 # installed.
 #
 # When you:
@@ -45,8 +47,9 @@ include Stomp11Common
 #
 # * heartbeat request
 #
-# Using the stomp gem, you specify this data in the "connect_headers" Hash
-# parameter.
+# Using the stomp gem, you can specify this data in the "connect_headers" Hash
+# parameter or a paramaterized connection request.  This example uses a 
+# parameterized request.
 #
 # So .........
 #
@@ -63,10 +66,10 @@ conn_hdrs = {"accept-version" => "1.1",    # Demand a 1.1 connection (use a CSV
 # ================
 #
 conn = Stomp::Connection.new(login, passcode, host, port,   # Normal connect parms
-  false,      # Not reliable, the default
+  false,      # Not reliable, the default for a parameter connection
   5,          # Connect redelay, the default
   conn_hdrs)  # The 1.1 connection parameters
-puts "Connection complete"
+puts "Connection connect complete"
 #
 # Let's just do some sanity checks, and look around.
 #
@@ -95,7 +98,7 @@ puts "Server requested heartbeats - \t#{conn.connection_frame.headers['heart-bea
 # ==================
 #
 conn.disconnect   # Business as usual, just like 1.0
-puts "Disconnect complete"
+puts "Connection disconnect complete"
 
 
 

data/examples/conn11_ex2.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # The current require dance for different Ruby versions.
 # Change this to suit your requirements.
@@ -33,6 +35,7 @@ conn_hdrs = {"accept-version" => "1.1",    # Demand a 1.1 connection (use a CSV
 conn_hash = { :hosts => [ 
       {:login => login, :passcode => passcode, :host => host, :port => port},
       ],
+      :reliable => false, # Override default
       :connect_headers => conn_hdrs,
     }
 #

data/examples/conn11_hb1.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # The current require dance for different Ruby versions.
 # Change this to suit your requirements.
@@ -26,12 +28,12 @@ conn_hdrs = {"accept-version" => "1.1",    # 1.1
     }
 # Create a logger for demonstration purposes
 logger = Slogger.new
-# Connect
+# Connect - a paramaterized request.
 conn = Stomp::Connection.new(login, passcode, host, port,   # Normal connect parms
-  false,      # Not reliable, the default
-  5,          # Connect redelay, the default
-  conn_hdrs)  # The 1.1 connection parameters
-puts "Connection complete"
+  false,      # Not reliable, the default for a paramaterized connection
+  5,          # Connect redelay, the default for a paramaterized connection
+  conn_hdrs)  # The 1.1 connection parameters / headers
+puts "Connection connect complete"
 #
 raise "Unexpected protocol level" if conn.protocol != Stomp::SPL_11
 #
@@ -40,7 +42,7 @@ sleep 65
 conn.set_logger(nil)    # No logging
 #
 conn.disconnect   # Get out
-puts "Disconnect complete"
+puts "Connection disconnect complete"
 
 
 

data/examples/get11conn_ex1.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # The current require dance for different Ruby versions.
 # Change this to suit your requirements.
@@ -26,7 +28,7 @@ raise "Unexpected protocol level" if conn.protocol != Stomp::SPL_11
 # * for subscribe, the 'id' header is now _required_
 # * for unsubscribe, the 'id' header is now _required_
 #
-# The 'id' header specifies a 'subscription id' that must be unique for
+# The 'id' header specifies a 'subscription id' that _must_ be unique for
 # the current session.
 #
 qname = "/queue/nodea.nodeb.nodec"

data/examples/get11conn_ex2.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # The current require dance for different Ruby versions.
 # Change this to suit your requirements.

data/examples/logexamp.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'rubygems'
 require 'stomp'
 require 'logger'  # for the 'local' logger
@@ -6,7 +8,7 @@ $:.unshift(File.dirname(__FILE__))
 #
 require 'slogger'
 #
-# A STOMP client program which uses the callback logging facility.
+# A STOMP::Connection program which uses the callback logging facility.
 #
 llog =        Logger::new(STDOUT)
 llog.level =  Logger::DEBUG
@@ -14,7 +16,6 @@ llog.debug "LE Starting"
 
 # //////////////////////////////////////////////////////////////////////////////
 mylog = Slogger::new  # The client provided STOMP callback logger
-# -*- encoding: utf-8 -*-
 
 # //////////////////////////////////////////////////////////////////////////////
 user =      ENV['STOMP_USER'] ? ENV['STOMP_USER'] : 'guest'

data/examples/logexamp_ssl.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'rubygems'
 require 'stomp'
 require 'logger'  # for the 'local' logger
@@ -6,7 +8,7 @@ $:.unshift(File.dirname(__FILE__))
 #
 require 'slogger'
 #
-# A STOMP client program which uses the callback logging facility.
+# A STOMP::Connection program which uses the callback logging facility.
 #
 llog =        Logger::new(STDOUT)
 llog.level =  Logger::DEBUG
@@ -14,7 +16,6 @@ llog.debug "LESSL Starting"
 
 # //////////////////////////////////////////////////////////////////////////////
 mylog = Slogger::new  # The client provided STOMP callback logger
-# -*- encoding: utf-8 -*-
 
 # //////////////////////////////////////////////////////////////////////////////
 user =      ENV['STOMP_USER'] ? ENV['STOMP_USER'] : 'guest'

data/examples/put11conn_ex1.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # The current require dance for different Ruby versions.
 # Change this to suit your requirements.

data/examples/putget11_rh1.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # The current require dance for different Ruby versions.
 # Change this to suit your requirements.

data/examples/ssl_uc1.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #

data/examples/ssl_uc1_ciphers.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #

data/examples/ssl_uc2.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #

data/examples/ssl_uc2_ciphers.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #

data/examples/ssl_uc3.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #

data/examples/ssl_uc3_ciphers.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #

data/examples/ssl_uc4.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #

data/examples/ssl_uc4_ciphers.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #

data/examples/ssl_ucx_default_ciphers.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # Reference: https://github.com/stompgem/stomp/wiki/extended-ssl-overview
 #

data/examples/stomp11_common.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 #
 # Common Stomp 1.1 code.
 #

data/lib/stomp/client.rb

@@ -35,7 +35,7 @@ module Stomp
     #   stomp://login:passcode@host:port
     #   stomp://login:passcode@host.domain.tld:port
     #
-    def initialize(login = '', passcode = '', host = 'localhost', port = 61613, reliable = false)
+    def initialize(login = '', passcode = '', host = 'localhost', port = 61613, reliable = false, autoflush = false)
 
       # Parse stomp:// URL's or set params
       if login.is_a?(Hash)
@@ -49,7 +49,6 @@ module Stomp
         @port = first_host[:port] || Connection::default_port(first_host[:ssl])
         
         @reliable = true
-        
       elsif login =~ /^stomp:\/\/#{url_regex}/ # e.g. stomp://login:passcode@host:port or stomp://host:port
         @login = $2 || ""
         @passcode = $3 || ""
@@ -94,6 +93,7 @@ module Stomp
         @connection = Connection.new(@parameters)
       else
         @connection = Connection.new(@login, @passcode, @host, @port, @reliable)
+        @connection.autoflush = autoflush
       end
       
       start_listeners
@@ -265,12 +265,40 @@ module Stomp
       @connection.uuid()
     end
 
+    # Retrieve heartbeat send interval
+    def hbsend_interval
+      @connection.hbsend_interval
+    end
+
+    # Retrieve heartbeat receive interval
+    def hbrecv_interval
+      @connection.hbrecv_interval
+    end
+
+    # Retrieve heartbeat send count
+    def hbsend_count
+      @connection.hbsend_count
+    end
+
+    # Retrieve heartbeat receive count
+    def hbrecv_count
+      @connection.hbrecv_count
+    end
+
     # Poll for asynchronous messages issued by broker.
     # Return nil of no message available, else the message
     def poll
       @connection.poll
     end
 
+    def autoflush=(af)
+      @connection.autoflush = af
+    end
+
+    def autoflush
+      @connection.autoflush
+    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

@@ -10,12 +10,13 @@ module Stomp
   # Low level connection which maps commands and supports
   # synchronous receives
   class Connection
-    attr_reader :connection_frame
-    attr_reader :disconnect_receipt
-    attr_reader :protocol
-    attr_reader :session
-    attr_reader :hb_received # Heartbeat received on time
-    attr_reader :hb_sent # Heartbeat sent successfully
+    attr_reader   :connection_frame
+    attr_reader   :disconnect_receipt
+    attr_reader   :protocol
+    attr_reader   :session
+    attr_reader   :hb_received # Heartbeat received on time
+    attr_reader   :hb_sent # Heartbeat sent successfully
+    attr_accessor :autoflush
     #alias :obj_send :send
 
     def self.default_port(ssl)
@@ -87,6 +88,7 @@ module Stomp
         @parse_timeout = 5		# To override, use hashed parameters
         @connect_timeout = 0	# To override, use hashed parameters
         @logger = nil     		# To override, use hashed parameters
+        @autoflush = false    # To override, use hashed parameters or setter
         warn "login looks like a URL, do you have the correct parameters?" if @login =~ /:\/\//
       end
 
@@ -112,6 +114,7 @@ module Stomp
       @parse_timeout =  @parameters[:parse_timeout]
       @connect_timeout =  @parameters[:connect_timeout]
       @logger =  @parameters[:logger]
+      @autoflush = @parameters[:autoflush]
       #sets the first host to connect
       change_host
     end
@@ -488,6 +491,30 @@ module Stomp
       rs
     end
 
+    # Retrieve heartbeat send interval
+    def hbsend_interval
+      return 0 unless @hbsend_interval
+      @hbsend_interval / 1000.0 # ms
+    end
+
+    # Retrieve heartbeat receive interval
+    def hbrecv_interval
+      return 0 unless @hbrecv_interval
+      @hbrecv_interval / 1000.0 # ms
+    end
+
+    # Retrieve heartbeat send count
+    def hbsend_count
+      return 0 unless @hbsend_count
+      @hbsend_count
+    end
+
+    # Retrieve heartbeat receive count
+    def hbrecv_count
+      return 0 unless @hbrecv_count
+      @hbrecv_count
+    end
+
     private
 
       def _expand_hosts(hash)
@@ -516,7 +543,17 @@ module Stomp
 
       def _receive( read_socket )
         @read_semaphore.synchronize do
-          line = read_socket.gets
+          line = ''
+          if @protocol == Stomp::SPL_10 || (@protocol >= Stomp::SPL_11 && !@hbr)
+            line = read_socket.gets # The old way
+          else # We are >= 1.1 and receiving heartbeats.
+            while true
+              line = read_socket.gets # Data from wire
+              break unless line == "\n"
+              line = ''
+              @lr = Time.now.to_f
+            end
+          end
           return nil if line.nil?
           # If the reading hangs for more than X seconds, abort the parsing process.
           # X defaults to 5.  Override allowed in connection hash parameters.
@@ -638,6 +675,7 @@ module Stomp
           used_socket.puts
           used_socket.write body
           used_socket.write "\0"
+          used_socket.flush if autoflush
 
           if @protocol >= Stomp::SPL_11
             @ls = Time.now.to_f if @hbs
@@ -870,7 +908,9 @@ module Stomp
         #
         @cx = @cy = @sx = @sy = 0, # Variable names as in spec
         #
-        @sti = @rti = 0.0 # Send/Receive ticker interval.
+        @hbsend_interval = @hbrecv_interval = 0.0 # Send/Receive ticker interval.
+        #
+        @hbsend_count = @hbrecv_count = 0 # Send/Receive ticker counts.
         #
         @ls = @lr = -1.0 # Last send/receive time (from Time.now.to_f)
         #
@@ -899,7 +939,7 @@ module Stomp
         # If sending
         if @hbs
           sm = @cx >= @sy ? @cx : @sy # ticker interval, ms
-          @sti = 1000.0 * sm # ticker interval, μs
+          @hbsend_interval = 1000.0 * sm # ticker interval, μs
           @ls = Time.now.to_f # best guess at start
           _start_send_ticker
         end
@@ -907,7 +947,7 @@ module Stomp
         # If receiving
         if @hbr
           rm = @sx >= @cy ? @sx : @cy # ticker interval, ms
-          @rti = 1000.0 * rm # ticker interval, μs
+          @hbrecv_interval = 1000.0 * rm # ticker interval, μs
           @lr = Time.now.to_f # best guess at start
           _start_receive_ticker
         end
@@ -915,7 +955,7 @@ module Stomp
       end
 
       def _start_send_ticker
-        sleeptime = @sti / 1000000.0 # Sleep time secs
+        sleeptime = @hbsend_interval / 1000000.0 # Sleep time secs
         @st = Thread.new {
           while true do
             sleep sleeptime
@@ -924,7 +964,7 @@ module Stomp
               @logger.on_hbfire(log_params, "send_fire", curt)
             end
             delta = curt - @ls
-            if delta > (@sti - (@sti/5.0)) / 1000000.0 # Be tolerant (minus)
+            if delta > (@hbsend_interval - (@hbsend_interval/5.0)) / 1000000.0 # Be tolerant (minus)
               if @logger && @logger.respond_to?(:on_hbfire)
                 @logger.on_hbfire(log_params, "send_heartbeat", curt)
               end
@@ -934,10 +974,11 @@ module Stomp
                   @socket.puts
                   @ls = curt # Update last send
                   @hb_sent = true # Reset if necessary
+                  @hbsend_count += 1
                 rescue Exception => sendex
                   @hb_sent = false # Set the warning flag
                   if @logger && @logger.respond_to?(:on_hbwrite_fail)
-                    @logger.on_hbwrite_fail(log_params, {"ticker_interval" => @sti,
+                    @logger.on_hbwrite_fail(log_params, {"ticker_interval" => @hbsend_interval,
                       "exception" => sendex})
                   end
                   raise # Re-raise.  What else could be done here?
@@ -950,7 +991,7 @@ module Stomp
       end
 
       def _start_receive_ticker
-        sleeptime = @rti / 1000000.0 # Sleep time secs
+        sleeptime = @hbrecv_interval / 1000000.0 # Sleep time secs
         @rt = Thread.new {
           while true do
             sleep sleeptime
@@ -959,7 +1000,7 @@ module Stomp
               @logger.on_hbfire(log_params, "receive_fire", curt)
             end
             delta = curt - @lr
-            if delta > ((@rti + (@rti/5.0)) / 1000000.0) # Be tolerant (plus)
+            if delta > ((@hbrecv_interval + (@hbrecv_interval/5.0)) / 1000000.0) # Be tolerant (plus)
               if @logger && @logger.respond_to?(:on_hbfire)
                 @logger.on_hbfire(log_params, "receive_heartbeat", curt)
               end
@@ -975,11 +1016,12 @@ module Stomp
                   @socket.ungetc(last_char)
                 end
                 @read_semaphore.unlock
+                @hbrecv_count += 1
               else
                 # Shrug.  Have not received one.  Just set warning flag.
                 @hb_received = false
                 if @logger && @logger.respond_to?(:on_hbread_fail)
-                  @logger.on_hbread_fail(log_params, {"ticker_interval" => @rti})
+                  @logger.on_hbread_fail(log_params, {"ticker_interval" => @hbrecv_interval})
                 end
               end
             else

data/lib/stomp/version.rb

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

data/spec/client_spec.rb

@@ -7,7 +7,7 @@ require 'client_shared_examples'
 describe Stomp::Client do
 
   before(:each) do
-    @mock_connection = mock('connection')
+    @mock_connection = mock('connection', :autoflush= => true)
     Stomp::Connection.stub!(:new).and_return(@mock_connection)
   end
 
@@ -33,6 +33,23 @@ describe Stomp::Client do
 
   end
 
+  describe "(autoflush)" do
+    it "should delegate to the connection for accessing the autoflush property" do
+      @mock_connection.should_receive(:autoflush)
+      Stomp::Client.new.autoflush
+    end
+
+    it "should delegate to the connection for setting the autoflush property" do
+      @mock_connection.should_receive(:autoflush=).with(true)
+      Stomp::Client.new.autoflush = true
+    end
+
+    it "should set the autoflush property on the connection when passing in autoflush as a parameter to the Stomp::Client" do
+      @mock_connection.should_receive(:autoflush=).with(true)
+      Stomp::Client.new("login", "password", 'localhost', 61613, false, true)
+    end
+  end
+
   describe "(created with invalid params)" do
 
     it "should return ArgumentError if host is nil" do

data/spec/connection_spec.rb

@@ -21,7 +21,7 @@ describe Stomp::Connection do
       :connect_timeout => 0,
       :parse_timeout => 5,
       :connect_headers => {},
-      :dmh => false,
+      :dmh => false
     }
         
     #POG:
@@ -33,10 +33,43 @@ describe Stomp::Connection do
     # clone() does a shallow copy, we want a deep one so we can garantee the hosts order
     normal_parameters = Marshal::load(Marshal::dump(@parameters))
 
-    @tcp_socket = mock(:tcp_socket, :close => nil, :puts => nil, :write => nil, :setsockopt => nil)
+    @tcp_socket = mock(:tcp_socket, :close => nil, :puts => nil, :write => nil, :setsockopt => nil, :flush => true)
     TCPSocket.stub!(:open).and_return @tcp_socket
     @connection = Stomp::Connection.new(normal_parameters)
   end
+
+  describe "autoflush" do
+    let(:parameter_hash) {
+      {
+        "hosts" => [
+          {:login => "login2", :passcode => "passcode2", :host => "remotehost", :port => 61617, :ssl => false},
+          {:login => "login1", :passcode => "passcode1", :host => "localhost", :port => 61616, :ssl => false}
+        ],
+        "reliable" => true,
+        "initialReconnectDelay" => 0.01,
+        "maxReconnectDelay" => 30.0,
+        "useExponentialBackOff" => true,
+        "backOffMultiplier" => 2,
+        "maxReconnectAttempts" => 0,
+        "randomize" => false,
+        "backup" => false,
+        "connect_timeout" => 0,
+        "parse_timeout" => 5,
+      }
+    }
+
+    it "should call flush on the socket when autoflush is true" do
+      @tcp_socket.should_receive(:flush)
+      @connection = Stomp::Connection.new(parameter_hash.merge("autoflush" => true))
+      @connection.publish "/queue", "message", :suppress_content_length => false
+    end
+
+    it "should not call flush on the socket when autoflush is false" do
+      @tcp_socket.should_not_receive(:flush)
+      @connection = Stomp::Connection.new(parameter_hash)
+      @connection.publish "/queue", "message", :suppress_content_length => false
+    end    
+  end
   
   describe "(created using a hash)" do
     it "should uncamelize and symbolize the main hash keys" do
@@ -54,7 +87,7 @@ describe Stomp::Connection do
         "randomize" => false,
         "backup" => false,
         "connect_timeout" => 0,
-        "parse_timeout" => 5,
+        "parse_timeout" => 5
       }
       
       @connection = Stomp::Connection.new(used_hash)
@@ -233,7 +266,7 @@ describe Stomp::Connection do
       
       before(:each) do
         ssl_parameters = {:hosts => [{:login => "login2", :passcode => "passcode2", :host => "remotehost", :ssl => true}]}
-        @ssl_socket = mock(:ssl_socket, :puts => nil, :write => nil, :setsockopt => nil)
+        @ssl_socket = mock(:ssl_socket, :puts => nil, :write => nil, :setsockopt => nil, :flush => true)
         
         TCPSocket.should_receive(:open).and_return @tcp_socket
         OpenSSL::SSL::SSLSocket.should_receive(:new).and_return(@ssl_socket)

data/stomp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stomp}
-  s.version = "1.2.3"
+  s.version = "1.2.4"
 
   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-06-16}
+  s.date = %q{2012-06-25}
   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"]

data/test/test_client.rb

@@ -69,7 +69,7 @@ class TestClient < Test::Unit::TestCase
     assert_equal message_text, received2.body
     assert_equal received.body, received2.body
     assert_equal received.headers['message-id'], received2.headers['message-id'] unless ENV['STOMP_RABBIT']
-  end
+  end unless RUBY_ENGINE =~ /jruby/
 
   def test_receipts
     receipt = false
@@ -104,7 +104,7 @@ class TestClient < Test::Unit::TestCase
     assert_raise(RuntimeError) do
       @client.subscribe make_destination
     end
-  end
+  end unless RUBY_ENGINE =~ /jruby/
 
   def test_transactional_publish
     @client.begin 'tx1'
@@ -131,7 +131,7 @@ class TestClient < Test::Unit::TestCase
     @client.subscribe(make_destination) {|m| message = m}
     sleep 0.01 until message
     assert_equal "second_message", message.body
-  end
+  end unless RUBY_ENGINE =~ /jruby/
 
   def test_transaction_ack_rollback_with_new_client
     @client.publish make_destination, message_text
@@ -312,7 +312,7 @@ class TestClient < Test::Unit::TestCase
 
   def test_connection_frame
   	assert_not_nil @client.connection_frame
-  end
+  end unless RUBY_ENGINE =~ /jruby/
 
   def test_unsubscribe
     message = nil
@@ -372,7 +372,7 @@ class TestClient < Test::Unit::TestCase
     @client.publish(dest, message_text)
     sleep 1
     assert_not_nil msg
-  end
+  end unless RUBY_ENGINE =~ /jruby/
 
   def test_thread_multi_subscribe
     #

data/test/test_connection.rb

@@ -382,7 +382,7 @@ class TestConnection < Test::Unit::TestCase
       msg2 = @conn.receive
       assert_equal smsg, msg2.body
     end
-  end
+  end unless ENV['STOMP_AMQ11'] # AMQ sends NACK'd messages to a DLQ
 
   # 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 

data/test/test_connection1p.rb

@@ -102,6 +102,8 @@ class TestConnection1P < Test::Unit::TestCase
       conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
       conn.disconnect
     end
+    assert conn.hbsend_interval > 0
+    assert conn.hbrecv_interval > 0
   end
 
   #
@@ -109,7 +111,7 @@ class TestConnection1P < Test::Unit::TestCase
     #
     cha = {:host => "localhost", "accept-version" => "1.1"}
     cha[:host] = "/" if ENV['STOMP_RABBIT']
-    cha["heart-beat"] = "5000,0" # Valid heart beat headers, send only
+    cha["heart-beat"] = "10000,0" # Valid heart beat headers, send only
     conn = nil
     logger = Tlogger.new
     assert_nothing_raised do
@@ -119,6 +121,7 @@ class TestConnection1P < Test::Unit::TestCase
       conn.set_logger(nil)
       conn.disconnect
     end
+    hb_asserts_send(conn)
   end if ENV['STOMP_HB11LONG']
 
   #
@@ -126,7 +129,7 @@ class TestConnection1P < Test::Unit::TestCase
     #
     cha = {:host => "localhost", "accept-version" => "1.1"}
     cha[:host] = "/" if ENV['STOMP_RABBIT']
-    cha["heart-beat"] = "0,10000" # Valid heart beat headers, receive only
+    cha["heart-beat"] = "0,6000" # Valid heart beat headers, receive only
     conn = nil
     logger = Tlogger.new
     assert_nothing_raised do
@@ -137,6 +140,7 @@ class TestConnection1P < Test::Unit::TestCase
       conn.set_logger(nil)
       conn.disconnect
     end
+    hb_asserts_recv(conn)
   end if ENV['STOMP_HB11LONG']
 
   #
@@ -155,7 +159,9 @@ class TestConnection1P < Test::Unit::TestCase
       conn.set_logger(nil)
       conn.disconnect
     end
+    hb_asserts_both(conn)
   end if ENV['STOMP_HB11LONG']
+
   #
   def test_conn_1p_0110
     #
@@ -255,5 +261,86 @@ class TestConnection1P < Test::Unit::TestCase
       @conn.subscribe dest, :id => sid
     }
   end
+
+  #
+  def test_conn_1p_0130
+    #
+    cha = {:host => "localhost", "accept-version" => "1.1"}
+    cha[:host] = "/" if ENV['STOMP_RABBIT']
+    cha["heart-beat"] = "10000,6000" # Valid heart beat headers, send and receive
+    conn = nil
+    logger = Tlogger.new
+    assert_nothing_raised do
+      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+#      m = conn.receive # This will hang forever .....
+      conn.set_logger(logger)
+      sleep 65
+      conn.set_logger(nil)
+      conn.disconnect
+    end
+    hb_asserts_both(conn)
+  end if ENV['STOMP_HB11LONG']
+
+  #
+  def test_conn_1p_0130
+    #
+    cha = {:host => "localhost", "accept-version" => "1.1"}
+    cha[:host] = "/" if ENV['STOMP_RABBIT']
+    cha["heart-beat"] = "10000,1000" # Valid heart beat headers, send and receive
+    conn = nil
+    logger = Tlogger.new
+    assert_nothing_raised do
+      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+#      m = conn.receive # This will hang forever .....
+      conn.set_logger(logger)
+      sleep 65
+      conn.set_logger(nil)
+      conn.disconnect
+    end
+    hb_asserts_both(conn)
+  end if ENV['STOMP_HB11LONG']
+
+  #
+  def test_conn_1p_0140
+    #
+    cha = {:host => "localhost", "accept-version" => "1.1"}
+    cha[:host] = "/" if ENV['STOMP_RABBIT']
+    cha["heart-beat"] = "1000,10000" # Valid heart beat headers, send and receive
+    conn = nil
+    logger = Tlogger.new
+    assert_nothing_raised do
+      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+#      m = conn.receive # This will hang forever .....
+      conn.set_logger(logger)
+      sleep 65
+      conn.set_logger(nil)
+      conn.disconnect
+    end
+    hb_asserts_both(conn)
+  end if ENV['STOMP_HB11LONG']
+
+private
+
+  def hb_asserts_both(conn)
+    assert conn.hbsend_interval > 0
+    assert conn.hbrecv_interval > 0
+    assert conn.hbsend_count > 0
+    assert conn.hbrecv_count > 0
+  end
+
+  def hb_asserts_send(conn)
+    assert conn.hbsend_interval > 0
+    assert conn.hbrecv_interval == 0
+    assert conn.hbsend_count > 0
+    assert conn.hbrecv_count == 0
+  end
+
+  def hb_asserts_recv(conn)
+    assert conn.hbsend_interval == 0
+    assert conn.hbrecv_interval > 0
+    assert conn.hbsend_count == 0
+    assert conn.hbrecv_count > 0
+  end
+
 end if ENV['STOMP_TEST11']
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stomp
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Brian McCallister
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-16 00:00:00 -04:00
+date: 2012-06-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency