stomper 2.0.3 → 2.0.4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 2.0.4 - 2011-03-08
+
+* minor issue where extraneous on\_connection\_died events were triggered.
+
 ## 2.0.3 - 2011-03-08
 
 * checks that some event callbacks exist before trying to invoke, fixes #6

data/features/steps/client_steps.rb

@@ -1,6 +1,9 @@
 After do |s|
   begin
     @connection && @connection.stop
+  rescue Exception => ex
+  end
+  begin
     @broker && @broker.force_stop
   rescue Exception => ex
   end

data/features/support/test_stomp_server.rb

@@ -9,6 +9,7 @@ class TestStompServer
     begin
       @socket = TCPServer.new(@port)
     rescue Exception => ex
+      retry
     end
     @session = nil
     @version = version
@@ -59,7 +60,7 @@ class TestStompServer
       connect_to_client(headers)
       @serializer.extend_for_protocol('1.1') if version == '1.1'
       @receive_thread = Thread.new do
-        while true
+        loop do
           begin
             read_frame
           rescue Exception => ex
@@ -88,30 +89,32 @@ class TestStompServer
     
     def read_frame
       @serializer.read_frame.tap do |f|
-        @received_frames << f
-        unless f[:receipt].nil? || f[:receipt].empty?
-          send_frame 'RECEIPT', { :'receipt-id' => f[:receipt] }
-        end
-        case f.command
-        when 'DISCONNECT'
-          @running = false
-          @client_socket.close
-        when 'SEND'
-          if @subscribed[f[:destination]]
-            @subscribed[f[:destination]].each_with_index do |sub_id, idx|
-              msg = f.dup
-              msg[:subscription] = sub_id
-              msg[:'message-id'] = "m-#{(Time.now.to_f * 1000).to_i}-#{idx}"
-              msg.command = 'MESSAGE'
-              send_frame msg
-            end
+        if f
+          @received_frames << f
+          unless f[:receipt].nil? || f[:receipt].empty?
+            send_frame 'RECEIPT', { :'receipt-id' => f[:receipt] }
           end
-        when 'SUBSCRIBE'
-          @subscribed[f[:destination]] ||= []
-          @subscribed[f[:destination]] << f[:id]
-        when 'UNSUBSCRIBE'
-          if @subscribed[f[:destination]]
-            @subscribed[f[:destination]].delete f[:id]
+          case f.command
+          when 'DISCONNECT'
+            @running = false
+            @client_socket.close
+          when 'SEND'
+            if @subscribed[f[:destination]]
+              @subscribed[f[:destination]].each_with_index do |sub_id, idx|
+                msg = f.dup
+                msg[:subscription] = sub_id
+                msg[:'message-id'] = "m-#{(Time.now.to_f * 1000).to_i}-#{idx}"
+                msg.command = 'MESSAGE'
+                send_frame msg
+              end
+            end
+          when 'SUBSCRIBE'
+            @subscribed[f[:destination]] ||= []
+            @subscribed[f[:destination]] << f[:id]
+          when 'UNSUBSCRIBE'
+            if @subscribed[f[:destination]]
+              @subscribed[f[:destination]].delete f[:id]
+            end
           end
         end
       end
@@ -130,6 +133,7 @@ class TestStompServer
   
   class StompErrorOnConnectSession < StompSession
     def connect_to_client(headers)
+      rf = read_frame
       send_frame 'ERROR'
     end
   end

data/lib/stomper/connection.rb

@@ -174,7 +174,7 @@ class Stomper::Connection
     @close_mutex = ::Mutex.new
     
     on_connected do |cf, con|
-      unless connected?
+      unless @connected
         @version = (cf[:version].nil?||cf[:version].empty?) ? '1.0' : cf[:version]
         unless @versions.include?(@version)
           close
@@ -312,10 +312,11 @@ class Stomper::Connection
     alias :open :connect
   end
   
-  # True if a connection with the broker has been established, false otherwise.
+  # True if a connection with the broker has been established or is in the
+  # process of being established, false otherwise.
   # @return [true,false]
   def connected?
-    @connected && !@socket.closed?
+    (@connecting || @connected) && !@socket.closed?
   end
   
   # Creates an instance of the class given by {#receiver_class} and starts it.
@@ -371,7 +372,7 @@ class Stomper::Connection
   #   {Stomper::Extensions::Events#on_connection_terminated}
   def close
     @close_mutex.synchronize do
-      if @connected
+      if connected?
         begin
           trigger_event(:on_connection_terminated, self) unless @disconnected
         ensure
@@ -379,7 +380,7 @@ class Stomper::Connection
             @socket.shutdown(2) rescue nil
             @socket.close rescue nil
           end
-          @connected = false
+          @connecting = @connected = false
         end
         trigger_event(:on_connection_closed, self)
         subscription_manager.clear
@@ -410,8 +411,7 @@ class Stomper::Connection
   # Receives a frame from the broker.
   # @return [Stomper::Frame]
   def receive
-    trigger_event(:on_connection_died, self) if dead?
-    if alive? || @connecting
+    if alive?
       trigger_event(:before_receiving, nil, self)
       begin
         @serializer.read_frame.tap do |f|
@@ -427,6 +427,8 @@ class Stomper::Connection
         close
         raise
       end
+    else
+      trigger_event(:on_connection_died, self)
     end
   end
   

data/lib/stomper/extensions/heartbeat.rb

@@ -17,7 +17,7 @@ module Stomper::Extensions::Heartbeat
   # {Stomper::Protocols::V1_1::Heartbeating#beat}.
   def beat; end
 
-  # By default, a connection is alive if it is connected.
+  # By default, a connection is alive if it is {Stomper::Connection#connected?}.
   # If the established connection utilizes the Stomp 1.1 protocol, this
   # method will be overridden by {Stomper::Protocols::V1_1::Heartbeating#alive?}.
   # @return [true,false]
@@ -41,7 +41,7 @@ module Stomper::Extensions::Heartbeat
     end
 
     # Stomp 1.1 {Stomper::Connection connections} are alive if they are
-    # +connected?+ and are meeting their negotiated heart-beating obligations.
+    # {Stomper::Connection#connected?} and are meeting their negotiated heart-beating obligations.
     # @return [true, false]
     # @see #dead?
     def alive?

data/lib/stomper/version.rb

@@ -3,5 +3,5 @@
 # Primary namespace of the stomper gem.
 module Stomper
   # The current version of the stomper gem.
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

data/spec/stomper/connection_spec.rb

@@ -343,7 +343,7 @@ module Stomper
           triggered.should be_true
         end
         
-        it "should trigger on_connection_died before receiving non-blocking (even if not ready) if the connection is dead" do
+        it "should not trigger on_connection_died before receiving non-blocking if socket is not ready" do
           triggered = false
           @connection.on_connection_died { triggered = true }
           @connection.connect
@@ -351,6 +351,17 @@ module Stomper
           @serializer.stub!(:read_frame).and_return(::Stomper::Frame.new('MESSAGE'))
           @socket.stub!(:ready?).and_return(false)
           @connection.receive_nonblock
+          triggered.should be_false
+        end
+        
+        it "should trigger on_connection_died before receiving non-blocking if socket is ready" do
+          triggered = false
+          @connection.on_connection_died { triggered = true }
+          @connection.connect
+          @connection.stub!(:alive?).and_return(false)
+          @serializer.stub!(:read_frame).and_return(::Stomper::Frame.new('MESSAGE'))
+          @socket.stub!(:ready?).and_return(true)
+          @connection.receive_nonblock
           triggered.should be_true
         end
         

metadata

@@ -2,7 +2,7 @@
 name: stomper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Ian D. Eccles