stomper 2.0.0 → 2.0.1

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 *.gem
 .bundle
 .yardoc
+nbproject

data/examples/events.rb

@@ -31,6 +31,10 @@ client.on_connection_closed do |con|
   $stdout.puts "Connection has been closed"
 end
 
+client.on_connection_terminated do |con|
+  $stdout.puts "Connection closed unexpectedly"
+end
+
 client.send("/queue/stomper/test", "hello world")
 client.disconnect
 

data/features/acking_messages.feature

@@ -10,6 +10,7 @@ Feature: Acking messages
     | message-id   | m-1234         |
     | subscription | s-5678         |
     | destination  | /queue/testing |
+    #When the client waits for 1 "MESSAGE" frame
     When the client acks the last MESSAGE
     And the frame exchange is completed
     Then the broker should have received an "ACK" frame with headers

data/features/receipts.feature

@@ -6,12 +6,14 @@ Feature: Receipts
   Scenario: RECEIPT on SEND
     Given a 1.1 connection between client and broker
     When the client sends a receipted message "test message" to "/queue/test"
+    And the client waits for 1 "RECEIPT" frame
     And the frame exchange is completed
     Then the client should have received a receipt for the last "SEND"
 
   Scenario: RECEIPT on SUBSCRIBE
     Given a 1.1 connection between client and broker
     When the client subscribes to "/queue/test" with a receipt
+    And the client waits for 1 "RECEIPT" frame
     And the frame exchange is completed
     Then the client should have received a receipt for the last "SUBSCRIBE"
 
@@ -21,42 +23,49 @@ Feature: Receipts
     | header-name | header-value |
     | id          | s-1234       |
     When the client unsubscribes from "s-1234" with a receipt
+    And the client waits for 1 "RECEIPT" frame
     And the frame exchange is completed
     Then the client should have received a receipt for the last "UNSUBSCRIBE"
 
   Scenario: RECEIPT on BEGIN
     Given a 1.1 connection between client and broker
     When the client begins transaction "t-1234" with a receipt
+    And the client waits for 1 "RECEIPT" frame
     And the frame exchange is completed
     Then the client should have received a receipt for the last "BEGIN"
 
   Scenario: RECEIPT on COMMIT
     Given a 1.1 connection between client and broker
     When the client commits transaction "t-1234" with a receipt
+    And the client waits for 1 "RECEIPT" frame
     And the frame exchange is completed
     Then the client should have received a receipt for the last "COMMIT"
   
   Scenario: RECEIPT on ABORT
     Given a 1.1 connection between client and broker
     When the client aborts transaction "t-1234" with a receipt
+    And the client waits for 1 "RECEIPT" frame
     And the frame exchange is completed
     Then the client should have received a receipt for the last "ABORT"
 
   Scenario: RECEIPT on ACK
     Given a 1.1 connection between client and broker
     When the client acks message "m-1234" from "s-5678" with a receipt
+    And the client waits for 1 "RECEIPT" frame
     And the frame exchange is completed
     Then the client should have received a receipt for the last "ACK"
 
   Scenario: RECEIPT on NACK
     Given a 1.1 connection between client and broker
     When the client nacks message "m-1234" from "s-5678" with a receipt
+    And the client waits for 1 "RECEIPT" frame
     And the frame exchange is completed
     Then the client should have received a receipt for the last "NACK"
     
   Scenario: RECEIPT on DISCONNECT
     Given a 1.1 connection between client and broker
     When the client disconnects with a receipt
+    And the client waits for 1 "RECEIPT" frame
     And the frame exchange is completed without client disconnect
     Then the client should have received a receipt for the last "DISCONNECT"
     

data/features/scopes.feature

@@ -15,6 +15,7 @@ Feature: Scopes
     | header-name | header-value      |
     | id          | s-9012            |
     | ack         | client-individual |
+    And the frame exchange is completed
     Then the broker should have received an "ACK" frame with headers
     | header-name   | header-value |
     | x-my-header   | some value   |

data/features/send_and_message.feature

@@ -7,6 +7,7 @@ Feature: Send and message
     Given a 1.1 connection between client and broker
     And the client subscribes to <destination>
     When the client sends a <content-type> <body> to <destination>
+    And the client waits for 1 "MESSAGE" frame
     And the frame exchange is completed
     Then the client should have received a <content-type> message of <body>
     
@@ -19,6 +20,7 @@ Feature: Send and message
     Given a 1.1 connection between client and broker
     And the client subscribes to <destination>
     When the client sends a <body> encoded as <encoding> to <destination>
+    And the client waits for 1 "MESSAGE" frame
     And the frame exchange is completed
     Then the client should have received a <content-type> message of <body> encoded as <final encoding>
 

data/features/steps/acking_messages_steps.rb

@@ -3,6 +3,7 @@ When /^the client acks a message by ID "([^"]*)"$/ do |message_id|
 end
 
 When /^the client acks the last MESSAGE$/ do
+  When("the client waits for 1 \"MESSAGE\" frame")
   @connection.ack @received_frames.select { |f| f.command == "MESSAGE" }.last
 end
 
@@ -15,6 +16,7 @@ When /^the client acks a message by ID "([^"]*)" and subscription "([^"]*)"$/ do
 end
 
 When /^the client nacks the last MESSAGE$/ do
+  When("the client waits for 1 \"MESSAGE\" frame")
   @connection.nack @received_frames.select { |f| f.command == "MESSAGE" }.last
 end
 

data/features/steps/establish_connection_steps.rb

@@ -1,6 +1,9 @@
 After do |s|
-  @connection && @connection.stop rescue nil
-  @broker && @broker.force_stop
+  begin
+    @connection && @connection.stop
+    @broker && @broker.force_stop
+  rescue Exception => ex
+  end
 end
 
 Given /^a (\d+\.\d+)?\s*connection between client and broker$/ do |version|
@@ -12,10 +15,10 @@ Given /^a (\d+\.\d+)?\s*connection between client and broker$/ do |version|
   @connection = Stomper::Connection.new(@broker_uri)
   @received_frames = []
   @sent_frames = []
-  @connection.before_transmitting do |c, f|
+  @connection.before_transmitting do |f, c|
     @sent_frames << f
   end
-  @connection.after_receiving do |c, f|
+  @connection.after_receiving do |f, c|
     @received_frames << f
   end
   @connection.start

data/features/steps/frame_transmission_steps.rb

@@ -32,4 +32,9 @@ end
 When /^the frame exchange is completed without client disconnect$/ do
   @connection.stop
   @broker.stop
-end
+end
+
+When /^the client waits for (\d+) "([^"]*)" frames?$/ do |count, command|
+  count = count.to_i
+  Thread.pass while @received_frames.select { |f| f.command == command }.size < count
+end

data/features/steps/receipts_steps.rb

@@ -1,75 +1,56 @@
 When /^the client sends a receipted message "([^"]*)" to "([^"]*)"$/ do |body, destination|
-  @receipts_received ||= {}
   @connection.send(destination, body) do |r|
-    @receipts_received[r[:'receipt-id']] = r
   end
 end
 
 Then /^the client should have received a receipt for the last "([^"]*)"$/ do |command|
   fr = @sent_frames.select { |f| f.command == command }.last
-  (@receipts_received && @receipts_received[fr[:'receipt']]).should_not be_nil
+  r = @received_frames.select { |f| f.command == 'RECEIPT' && f[:'receipt-id'] == fr[:receipt] }.last
+  r.should_not be_nil
 end
 
 When /^the client subscribes to "([^"]*)" with a receipt$/ do |destination|
-  @receipts_received ||= {}
   @connection.with_receipt do |r|
-    @receipts_received[r[:'receipt-id']] = r
   end.subscribe(destination)
 end
 
 When /^the client unsubscribes from "([^"]*)" with a receipt$/ do |subscription|
-  @receipts_received ||= {}
   @connection.with_receipt do |r|
-    @receipts_received[r[:'receipt-id']] = r
   end.unsubscribe(subscription)
 end
 
 When /^the client begins transaction "([^"]*)" with a receipt$/ do |tx|
-  @receipts_received ||= {}
   @connection.with_receipt do |r|
-    @receipts_received[r[:'receipt-id']] = r
   end.begin(tx)
 end
 
 When /^the client aborts transaction "([^"]*)" with a receipt$/ do |tx|
-  @receipts_received ||= {}
   @connection.with_receipt do |r|
-    @receipts_received[r[:'receipt-id']] = r
   end.abort(tx)
 end
 
 When /^the client commits transaction "([^"]*)" with a receipt$/ do |tx|
-  @receipts_received ||= {}
   @connection.with_receipt do |r|
-    @receipts_received[r[:'receipt-id']] = r
   end.commit(tx)
 end
 
 When /^the client acks message "([^"]*)" from "([^"]*)" with a receipt$/ do |m_id, sub_id|
-  @receipts_received ||= {}
   @connection.with_receipt do |r|
-    @receipts_received[r[:'receipt-id']] = r
   end.ack(m_id, sub_id)
 end
 
 When /^the client nacks message "([^"]*)" from "([^"]*)" with a receipt$/ do |m_id, sub_id|
-  @receipts_received ||= {}
   @connection.with_receipt do |r|
-    @receipts_received[r[:'receipt-id']] = r
   end.nack(m_id, sub_id)
 end
 
 When /^the client disconnects with a receipt$/ do
-  @receipts_received ||= {}
   @connection.with_receipt do |r|
-    @receipts_received[r[:'receipt-id']] = r
   end.disconnect
 end
 
 When /^the client connects with a receipt$/ do
-  @receipts_received ||= {}
   @connection.with_receipt do |r|
-    @receipts_received[r[:'receipt-id']] = r
   end.transmit(Stomper::Frame.new('CONNECT'))
 end
 

data/features/steps/secure_connections_steps.rb

@@ -25,6 +25,8 @@ end
 
 Then /^connecting should raise an openssl error$/ do
   lambda { @connection.connect }.should raise_error(OpenSSL::SSL::SSLError)
+  # It is problematic that this is needed...
+  @broker.stop
 end
 
 When /^an SSL post connection check is not performed$/ do

data/features/subscribing.feature

@@ -19,6 +19,7 @@ Feature: Subscribing
     | message-id   | m-1235         |
     | subscription | s-5678         |
     | destination  | /queue/testing |
+    And the client waits for 2 "MESSAGE" frames
     And the frame exchange is completed
     Then the client should have received a "MESSAGE" frame with headers
     | header-name  | header-value   |
@@ -50,6 +51,7 @@ Feature: Subscribing
     | header-name | header-value   |
     | message-id  | m-1236         |
     | destination | /queue/testing |
+    And the client waits for 3 "MESSAGE" frame
     And the frame exchange is completed
     Then the client should have received a "MESSAGE" frame with headers
     | header-name | header-value |
@@ -73,6 +75,7 @@ Feature: Subscribing
     | message-id   | m-1234         |
     | destination  | /queue/testing |
     | subscription | s-9999         |
+    And the client waits for 1 "MESSAGE" frame
     And the frame exchange is completed
     Then the client should have received a "MESSAGE" frame with headers
     | header-name  | header-value |
@@ -91,13 +94,15 @@ Feature: Subscribing
     | message-id   | m-1234         |
     | destination  | /queue/testing |
     | subscription | s-5678         |
+    And the client waits for 1 "MESSAGE" frame
     And the client unsubscribes by ID
     And the broker sends a "MESSAGE" frame with headers
     | header-name  | header-value   |
     | message-id   | m-1235         |
     | destination  | /queue/testing |
     | subscription | s-5678         |
-    And the client disconnects
+    And the client waits for 1 "MESSAGE" frame
+    And the frame exchange is completed
     Then the default subscription callback should have been triggered 1 time
 
   Scenario: No callbacks after unsubscribing by frame
@@ -110,12 +115,14 @@ Feature: Subscribing
     | message-id   | m-1234         |
     | destination  | /queue/testing |
     | subscription | s-5678         |
+    And the client waits for 1 "MESSAGE" frame
     And the client unsubscribes by frame
     And the broker sends a "MESSAGE" frame with headers
     | header-name  | header-value   |
     | message-id   | m-1235         |
     | destination  | /queue/testing |
     | subscription | s-5678         |
+    And the client waits for 1 "MESSAGE" frame
     And the frame exchange is completed
     Then the default subscription callback should have been triggered 1 time
 
@@ -136,11 +143,13 @@ Feature: Subscribing
     | header-name  | header-value   |
     | message-id   | m-1235         |
     | destination  | /queue/testing |
+    And the client waits for 2 "MESSAGE" frames
     And the client unsubscribes from destination "/queue/testing"
     And the broker sends a "MESSAGE" frame with headers
     | header-name | header-value   |
     | message-id  | m-1235         |
     | destination | /queue/testing |
+    And the client waits for 1 "MESSAGE" frame
     And the frame exchange is completed
     Then the default subscription callback should have been triggered 3 times
     And the broker should have received an "UNSUBSCRIBE" frame with headers

data/features/support/test_stomp_server.rb

@@ -1,10 +1,15 @@
 class TestStompServer
+  class StopThread < StandardError; end
+
   attr_accessor :session_class
   attr_reader :session
   
   def initialize(version=nil)
     @port = 61613
-    @socket = TCPServer.new(@port)
+    begin
+      @socket = TCPServer.new(@port)
+    rescue Exception => ex
+    end
     @session = nil
     @version = version
     @session_class = StompSession
@@ -23,14 +28,14 @@ class TestStompServer
   def stop
     @session.stop if @session
     @socket.close rescue nil
-    @listener.kill rescue nil
+    @listener.raise(StopThread.new)
     @listener.join rescue nil
   end
   
   def force_stop
     @session.force_stop if @session
     @socket.close rescue nil
-    @listener.kill rescue nil
+    @listener.raise(StopThread.new)
     @listener.join rescue nil
   end
   
@@ -54,10 +59,11 @@ class TestStompServer
       connect_to_client(headers)
       @serializer.extend_for_protocol('1.1') if version == '1.1'
       @receive_thread = Thread.new do
-        while @running
+        while true
           begin
             read_frame
           rescue Exception => ex
+            break
           end
         end
       end
@@ -70,6 +76,7 @@ class TestStompServer
     
     def force_stop
       @running = false
+      @receive_thread.raise(StopThread.new)
       @client_socket.close rescue nil
       @receive_thread.join rescue nil
     end
@@ -112,8 +119,11 @@ class TestStompServer
     
     def send_frame cmd, headers={}, body=nil
       frame = cmd.is_a?(Stomper::Frame) ? cmd : Stomper::Frame.new(cmd, headers, body)
-      @serializer.write_frame(frame).tap do |f|
-        @sent_frames << f
+      begin
+        @serializer.write_frame(frame).tap do |f|
+          @sent_frames << f
+        end
+      rescue Exception => ex
       end
     end
   end
@@ -135,7 +145,11 @@ class TestSSLStompServer < TestStompServer
   
   def initialize(version=nil, certs=:default)
     @port = 61612
-    @tcp_socket = TCPServer.new(@port)
+    begin
+      @tcp_socket = TCPServer.new(@port)
+    rescue Exception => ex
+      retry
+    end
     @ssl_context = OpenSSL::SSL::SSLContext.new
     @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
     cert_files = SSL_CERT_FILES[certs]

data/features/transactions.feature

@@ -10,6 +10,7 @@ Feature: Transactions
     And the client acks a message by ID "m-1234" and subscription "s-5678" within the scope
     And the client nacks a message by ID "m-9012" and subscription "s-5678" within the scope
     And the client aborts the transaction scope
+    And the frame exchange is completed
     Then the broker should have received a "BEGIN" frame with headers
     | header-name | header-value |
     | transaction | t-0001       |
@@ -30,6 +31,7 @@ Feature: Transactions
   Scenario: Applying a transaction to a successful block
     Given a 1.1 connection between client and broker
     When the client executes a successful transaction block named "t-0002"
+    And the frame exchange is completed
     Then the broker should have received a "BEGIN" frame with headers
     | header-name | header-value |
     | transaction | t-0002       |
@@ -49,6 +51,7 @@ Feature: Transactions
   Scenario: Applying a transaction to an unsuccessful block
     Given a 1.1 connection between client and broker
     When the client executes an unsuccessful transaction block named "t-0002"
+    And the frame exchange is completed
     Then the broker should have received a "BEGIN" frame with headers
     | header-name | header-value |
     | transaction | t-0002       |

data/lib/stomper/connection.rb

@@ -170,11 +170,11 @@ class Stomper::Connection
     @receipt_manager = ::Stomper::ReceiptManager.new(self)
     @connecting = false
     @disconnecting = false
+    @disconnected = false
+    @socket_mutex = ::Mutex.new
     
     on_connected do |cf, con|
       unless connected?
-        @connecting = false
-        @disconnecting = false
         @version = (cf[:version].nil?||cf[:version].empty?) ? '1.0' : cf[:version]
         unless @versions.include?(@version)
           close
@@ -192,9 +192,12 @@ class Stomper::Connection
         extend_for_protocol
       end
     end
-    
-    on_disconnect do |df, con|
+
+    before_disconnect do |df, con|
       @disconnecting = true
+    end
+    on_disconnect do |df, con|
+      @disconnected = true
       close unless df[:receipt]
     end
   end
@@ -269,28 +272,34 @@ class Stomper::Connection
   # connection has been established and you're ready to go, otherwise the
   # socket will be closed and an error will be raised.
   def connect(headers={})
-    @socket = @uri.create_socket(@ssl)
-    @serializer = ::Stomper::FrameSerializer.new(@socket)
-    m_headers = {
-      :'accept-version' => @versions.join(','),
-      :host => @host,
-      :'heart-beat' => @heartbeats.join(','),
-      :login => @login,
-      :passcode => @passcode
-    }
-    @connecting = true
-    transmit create_frame('CONNECT', headers, m_headers)
-    receive.tap do |f|
-      if f.command == 'CONNECTED'
-        @connected_frame = f
-      else
-        close
-        raise ::Stomper::Errors::ConnectFailedError, 'broker did not send CONNECTED frame'
+    #@socket_mutex.synchronize do
+      unless @connected
+        @socket = @uri.create_socket(@ssl)
+        @serializer = ::Stomper::FrameSerializer.new(@socket)
+        m_headers = {
+          :'accept-version' => @versions.join(','),
+          :host => @host,
+          :'heart-beat' => @heartbeats.join(','),
+          :login => @login,
+          :passcode => @passcode
+        }
+        @disconnecting = false
+        @disconnected = false
+        @connecting = true
+        transmit create_frame('CONNECT', headers, m_headers)
+        receive.tap do |f|
+          if f.command == 'CONNECTED'
+            @connected_frame = f
+            @connected = true
+            @connecting = false
+            trigger_event(:on_connection_established, self)
+          else
+            close
+            raise ::Stomper::Errors::ConnectFailedError, 'broker did not send CONNECTED frame'
+          end
+        end
       end
-    end
-    @connected = true
-    trigger_event(:on_connection_established, self) if @connected
-    @connected_frame
+    #end
   end
   alias :open :connect
   
@@ -362,17 +371,21 @@ class Stomper::Connection
   # @see Stomper::Extensions::Events#on_connection_terminated
   # @param [true,false] fire_terminated (false) If true, trigger
   #   {Stomper::Extensions::Events#on_connection_terminated}
-  def close(fire_terminated=false)
-    begin
-      trigger_event(:on_connection_terminated, self) if fire_terminated
-    ensure
-      unless @socket.closed?
-        @socket.shutdown(2) rescue nil
-        @socket.close rescue nil
+  def close
+    #@socket_mutex.synchronize do
+      if @connected
+        begin
+          trigger_event(:on_connection_terminated, self) unless @disconnected
+        ensure
+          unless @socket.closed?
+            @socket.shutdown(2) rescue nil
+            @socket.close rescue nil
+          end
+          @connected = false
+        end
+        trigger_event(:on_connection_closed, self)
       end
-      @connected = false
-    end
-    trigger_event(:on_connection_closed, self)
+    #end
   end
   
   # Transmits a frame to the broker. This is a low-level method used internally
@@ -389,7 +402,7 @@ class Stomper::Connection
         trigger_transmitted_frame(frame, self)
       end
     rescue ::IOError, ::SystemCallError
-      close(true)
+      close
       raise
     end
   end
@@ -403,7 +416,7 @@ class Stomper::Connection
       begin
         @serializer.read_frame.tap do |f|
           if f.nil?
-            close(true) if @connected
+            close
           else
             @last_received_at = Time.now
             trigger_event(:after_receiving, f, self)
@@ -411,7 +424,7 @@ class Stomper::Connection
           end
         end
       rescue ::IOError, ::SystemCallError
-        close(true)
+        close
         raise
       end
     end
@@ -424,14 +437,7 @@ class Stomper::Connection
   #   if any data is available it will block until a complete frame has been read.
   # @return [Stomper::Frame, nil]
   def receive_nonblock
-    trigger_event(:on_connection_died, self) if dead?
-    trigger_event(:before_receiving, self)
-    if @socket.ready?
-      @serializer.read_frame.tap do |f|
-        trigger_event(:after_receiving, self, f)
-        trigger_received_frame(f, self)
-      end
-    end
+    receive if @socket.ready?
   end
   
   # Duration in milliseconds since a frame has been transmitted to the broker.
@@ -457,4 +463,3 @@ end
 
 # Alias Stomper::Client to Stomper::Connection
 ::Stomper::Client = ::Stomper::Connection
-

data/lib/stomper/extensions/common.rb

@@ -60,13 +60,9 @@ module Stomper::Extensions::Common
   def unsubscribe(frame_or_id, headers={})
     sub_id = frame_or_id.is_a?(::Stomper::Frame) ? frame_or_id[:id] : frame_or_id
     raise ArgumentError, 'subscription ID could not be determined' if sub_id.nil? || sub_id.empty?
-    if subscription_manager.subscribed_id? sub_id
-      transmit create_frame('UNSUBSCRIBE', headers, { :id => sub_id })
-    elsif subscription_manager.subscribed_destination? sub_id
-      subscription_manager.ids_for_destination(sub_id).map do |id|
-        transmit create_frame('UNSUBSCRIBE', headers, { :id => id })
-      end
-    end
+    subscription_manager.remove(sub_id).map do |id|
+      transmit create_frame('UNSUBSCRIBE', headers, { :id => id })
+    end.last
   end
   
   # Transmits a BEGIN frame to the broker to start a transaction named by +tx_id+.

data/lib/stomper/headers.rb

@@ -12,4 +12,11 @@
 # @see Stomper::Support::Ruby1_9::Headers Implementation for Ruby 1.9
 class Stomper::Headers
   include ::Enumerable
+  
+  # Returns a new +Hash+ object associating symbolized header names and their
+  # principle values.
+  # @return [Hash]
+  def to_hash
+    to_a.inject({}) { |h, (k,v)| h[k.to_sym] ||= v; h }
+  end
 end

data/lib/stomper/receivers/threaded.rb

@@ -2,6 +2,9 @@
 
 # Basic threaded receiver
 class Stomper::Receivers::Threaded
+  # Stop Receiver
+  class StopReceiver < StandardError; end
+
   # Returns true if the receiver is currently running, false otherwise.
   # If the polling thread is terminated due to a raised exception, this
   # attribute will be false.
@@ -20,7 +23,6 @@ class Stomper::Receivers::Threaded
     @running = false
     @run_mutex = ::Mutex.new
     @run_thread = nil
-    @raised_while_running = nil
   end
   
   # Starts the receiver by creating a new thread to continually poll the
@@ -32,14 +34,15 @@ class Stomper::Receivers::Threaded
     is_starting = @run_mutex.synchronize { @running = true unless @running }
     if is_starting
       @run_thread = Thread.new do
-        while @running
-          begin
-            @running = false if @connection.receive.nil?
-          rescue Exception => ex
-            @running = false
-            raise ex
+        begin
+          until @connection.receive.nil?
           end
+        rescue ::Stomper::Receivers::Threaded::StopReceiver
+        rescue Exception => ex
+          @running = false
+          raise ex
         end
+        @running = false
       end
     end
     self
@@ -58,11 +61,12 @@ class Stomper::Receivers::Threaded
   def stop
     stopped = @run_mutex.synchronize { @run_thread.nil? }
     unless stopped
-      @running = false
+      @run_thread.raise(::Stomper::Receivers::Threaded::StopReceiver.new)
       begin
         @run_thread.join
-      rescue IOError
+      rescue ::IOError, ::SystemCallError
         raise if @connection.connected?
+      rescue ::Stomper::Receivers::Threaded::StopReceiver => ex
       end
       @run_thread = nil
     end

data/lib/stomper/subscription_manager.rb

@@ -6,10 +6,10 @@ class Stomper::SubscriptionManager
   # @param [Stomper::Connection] connection
   def initialize(connection)
     @mon = ::Monitor.new
-    @callbacks = {}
-    @dests_to_ids = {}
+    @subscriptions = {}
     connection.on_message { |m, con| dispatch(m) }
-    connection.on_unsubscribe { |u, con| remove(u) }
+    connection.on_unsubscribe { |u, con| remove(u[:id]) }
+    connection.on_connection_closed { |con| @subscriptions.clear }
   end
   
   # Adds a callback handler for a MESSAGE frame that is sent via the subscription
@@ -22,58 +22,60 @@ class Stomper::SubscriptionManager
     s_id = subscribe[:id]
     dest = subscribe[:destination]
     @mon.synchronize do
-      @callbacks[s_id] = callback
-      @dests_to_ids[dest] ||= []
-      @dests_to_ids[dest] << s_id
+      @subscriptions[s_id] = Subscription.new(subscribe, callback)
     end
   end
   
-  # Returns true if the subscription ID is registered
-  # @param [String] id
-  # @return [true,false]
-  def subscribed_id?(id)
-    @mon.synchronize { @callbacks.key? id }
-  end
-  
-  # Returns true if the subscription destination is registered
-  # @param [String] destination
-  # @return [true,false]
-  def subscribed_destination?(destination)
-    @mon.synchronize { @dests_to_ids.key? destination }
-  end
-  
-  # Returns an array of subscription IDs that correspond to
-  # the given subscription destination. If the destination is unknown,
-  # returns +nil+.
-  # @param [String] destination
-  # @return [Array<String>, nil]
-  def ids_for_destination(destination)
-    @mon.synchronize { @dests_to_ids[destination] && @dests_to_ids[destination].dup }
-  end
-  
-  private
-  def remove(unsub)
-    s_id = unsub[:id]
+  # Removes a subscription by ID or destination.
+  # @param [String] sub_id ID or destination of the subscription
+  # @return [Array<String>] array of subscription IDs matching +sub_id+
+  def remove(sub_id)
     @mon.synchronize do
-      @dests_to_ids.each do |dest, ids|
-        ids.delete s_id
-        @dests_to_ids.delete dest if ids.empty?
+      if @subscriptions.key? sub_id
+        @subscriptions.delete sub_id
+        [sub_id]
+      else
+        @subscriptions.values.inject([]) do |ids, sub|
+          if sub.destination == sub_id
+            @subscriptions.delete sub.id
+            ids << sub.id
+          end
+          ids
+        end
       end
-      @callbacks.delete(s_id)
     end
   end
   
+  # Returns all current subscriptions in the form of their SUBSCRIBE frames.
+  # @return [Array<Stomper::Frame>]
+  def subscriptions
+    @mon.synchronize { @subscriptions.values }
+  end
+  
+  private
   def dispatch(message)
     s_id = message[:subscription]
     dest = message[:destination]
     if s_id.nil? || s_id.empty?
-      cbs = @mon.synchronize do
-        @dests_to_ids[dest] && @dests_to_ids[dest].map { |id| @callbacks[id] }
-      end
-      cbs && cbs.each { |cb| cb.call(message) }
+      @mon.synchronize do
+        @subscriptions.values.map do |sub|
+          (sub.destination == dest) && sub
+        end
+      end.each { |cb| cb && cb.call(message) }
     else
-      cb = @mon.synchronize { @callbacks[s_id] }
+      cb = @mon.synchronize { @subscriptions[s_id] }
       cb && cb.call(message)
     end
   end
+  
+  class Subscription
+    attr_reader :frame, :callback
+    def initialize(fr, cb)
+      @frame = fr
+      @callback = cb
+    end
+    def id; @frame[:id]; end
+    def destination; @frame[:destination]; end
+    def call(m); @callback.call(m); end
+  end
 end

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.0'
+  VERSION = '2.0.1'
 end

data/spec/stomper/connection_spec.rb

@@ -271,9 +271,17 @@ module Stomper
         it "should close the socket if reading a frame returns nil" do
           @connection.connect
           @serializer.should_receive(:read_frame).and_return(nil)
-          @connection.should_receive(:close).with(true)
+          @connection.should_receive(:close)
           @connection.receive.should be_nil
         end
+
+        it "should close the socket if reading a frame returns nil" do
+          @connection.connect
+          @socket.should_receive(:ready?).and_return(true)
+          @serializer.should_receive(:read_frame).and_return(nil)
+          @connection.should_receive(:close)
+          @connection.receive_nonblock.should be_nil
+        end
       end
       
       describe "connection state events" do
@@ -356,12 +364,33 @@ module Stomper
           lambda { @connection.receive }.should raise_error(IOError)
           triggered.should be_true
         end
+
+        it "should not trigger on_connection_terminated if the socket raises an error after disconnecting" do
+          triggered = false
+          @connection.on_connection_terminated { triggered = true }
+          @connection.connect
+          @serializer.should_receive(:write_frame).with(stomper_frame_with_headers({}, 'DISCONNECT'))
+          @connection.disconnect
+          @connection.should_receive(:alive?).at_least(:once).and_return(true)
+          @serializer.should_receive(:read_frame).and_raise(IOError.new('Error while reading frame'))
+          lambda { @connection.receive }.should raise_error(IOError)
+          triggered.should be_false
+        end
+        
+        it "should trigger on_connection_terminated if the socket raises an error before DISCONNECT is written" do
+          triggered = false
+          @connection.on_connection_terminated { triggered = true }
+          @connection.connect
+          @serializer.should_receive(:write_frame).with(stomper_frame_with_headers({}, 'DISCONNECT')).and_raise(IOError.new('Error before DISCONNECT'))
+          lambda { @connection.disconnect }.should raise_error(IOError)
+          triggered.should be_true
+        end
         
         it "should trigger on_connection_terminated if the socket raises a SystemCallError while receiving" do
           triggered = false
           @connection.on_connection_terminated { triggered = true }
           @connection.connect
-          @serializer.stub!(:read_frame).and_raise(SystemCallError.new('syscall error'))
+          @serializer.should_receive(:read_frame).and_raise(SystemCallError.new('syscall error'))
           lambda { @connection.receive }.should raise_error(SystemCallError)
           triggered.should be_true
         end

data/spec/stomper/extensions/common_spec.rb

@@ -45,13 +45,13 @@ module Stomper::Extensions
       end
     
       it "should transmit an UNSUBSCRIBE frame for a given subscription ID" do
-        @subscription_manager.should_receive(:subscribed_id?).with('subscription-1234').and_return(true)
+        @subscription_manager.should_receive(:remove).with('subscription-1234').and_return(['subscription-1234'])
         @common.should_receive(:transmit).with(stomper_frame_with_headers({'id' => 'subscription-1234'}, 'UNSUBSCRIBE'))
         @common.unsubscribe('subscription-1234')
       end
     
       it "should transmit an UNSUBSCRIBE frame for a given SUBSCRIBE frame" do
-        @subscription_manager.should_receive(:subscribed_id?).with('id-in-frame-4321').and_return(true)
+        @subscription_manager.should_receive(:remove).with('id-in-frame-4321').and_return(['id-in-frame-4321'])
         subscribe = ::Stomper::Frame.new('SUBSCRIBE', { :id => 'id-in-frame-4321' })
         @common.should_receive(:transmit).with(stomper_frame_with_headers({'id' => 'id-in-frame-4321'}, 'UNSUBSCRIBE'))
         @common.unsubscribe(subscribe)
@@ -94,9 +94,7 @@ module Stomper::Extensions
         # as well.
         @common.should_receive(:transmit).with(stomper_frame_with_headers({:id => '1234'}, 'UNSUBSCRIBE'))
         @common.should_receive(:transmit).with(stomper_frame_with_headers({:id => '4567'}, 'UNSUBSCRIBE'))
-        @subscription_manager.should_receive(:subscribed_id?).with('/queue/test').and_return(false)
-        @subscription_manager.should_receive(:subscribed_destination?).with('/queue/test').and_return(true)
-        @subscription_manager.should_receive(:ids_for_destination).with('/queue/test').and_return(['1234', '4567'])
+        @subscription_manager.should_receive(:remove).with('/queue/test').and_return(['1234', '4567'])
         @common.unsubscribe("/queue/test")
       end
     end

data/spec/stomper/headers_spec.rb

@@ -28,13 +28,6 @@ module Stomper
       @headers['test header'].should == ''
     end
     
-    it "should return an array of header key/value pairs" do
-      @headers['header 1'] = 'testing'
-      @headers['other header'] = 19
-      @headers[:tom] = 'servo'
-      @headers.to_a.should == [ ['header 1', 'testing'], ['other header', '19'], ['tom', 'servo'] ]
-    end
-    
     it "should preserve the order of keys" do
       expected_keys = []
       20.times do |n|
@@ -110,6 +103,20 @@ module Stomper
         ['header 3', 'h3 value 2'] ]
     end
     
+    it "should be convertable to a hash of principle values" do
+      @headers.append('header 1', 'h1 value 1')
+      @headers.append('header 1', 'h1 value 2')
+      @headers.append('header 1', 'h1 value 3')
+      @headers['header 2'] = 'h2 value 1'
+      @headers['header 3'] = 'h3 value 1'
+      @headers.append('header 3', 'h3 value 2')
+      @headers.to_hash.should == {
+        :'header 1' => 'h1 value 1',
+        :'header 2' => 'h2 value 1',
+        :'header 3' => 'h3 value 1'
+      }
+    end
+    
     it "should set a header value to the first encountered in a chain of appends" do
       @headers.append('header 1', 'first value')
       @headers.append('header 1', 'second value')

data/spec/stomper/scopes/header_scope_spec.rb

@@ -7,7 +7,7 @@ module Stomper::Scopes
       @connection = mock("connection", :is_a? => true, :version => '1.1')
       @headers = { :global_1 => 'turbo', 'global_2' => 'is me', :persistent => true }
       @connection.stub!(:subscription_manager).and_return(mock('subscription manager', {
-        :subscribed_id? => true
+        :remove => ['no-real-destination']
       }))
       @scope = HeaderScope.new(@connection, @headers)
     end

data/spec/stomper/scopes/receipt_scope_spec.rb

@@ -8,7 +8,7 @@ module Stomper::Scopes
       @connection = mock("connection", :is_a? => true, :version => '1.1')
       @connection.stub!(:receipt_manager => @receipt_manager)
       @connection.stub!(:subscription_manager).and_return(mock('subscription manager', {
-        :subscribed_id? => true
+        :remove => ['/queue/test']
       }))
       @scope = ReceiptScope.new(@connection, {})
     end

data/spec/stomper/scopes/transaction_scope_spec.rb

@@ -7,7 +7,7 @@ module Stomper::Scopes
       @connection = mock("connection", :is_a? => true, :version => '1.1')
       @headers = { :transaction => 'tx-1234' }
       @connection.stub!(:subscription_manager).and_return(mock('subscription manager', {
-        :subscribed_id? => true
+        :remove => ['no-real-destination']
       }))
       @scope = TransactionScope.new(@connection, @headers)
       @connection.should_receive(:transmit).at_most(:once).with(stomper_frame_with_headers(@headers, 'BEGIN'))

data/spec/stomper/subscription_manager_spec.rb

@@ -11,6 +11,7 @@ module Stomper
       receipt = mock('receipt')
       @connection.should_receive(:on_message)
       @connection.should_receive(:on_unsubscribe)
+      @connection.should_receive(:on_connection_closed)
       @subscription_manager = SubscriptionManager.new(@connection)
     end
     
@@ -19,36 +20,53 @@ module Stomper
         @connection.extend ::Stomper::Extensions::Events
         @subscription_manager = SubscriptionManager.new(@connection)
         @subscribe_frame = ::Stomper::Frame.new('SUBSCRIBE', {:id => '1234', :destination => '/queue/testing'})
-        @unsubscribe_frame = ::Stomper::Frame.new('UNSUBSCRIBE', {:id => '1234'})
       end
       
-      it "should correctly report subscribed IDs" do
+      it "should correctly report subscriptoins" do
         @subscription_manager.add(@subscribe_frame, lambda { |m| true })
-        @subscription_manager.subscribed_id?('1234').should be_true
-        @subscription_manager.subscribed_id?('4321').should be_false
-        @subscription_manager.__send__(:remove, @unsubscribe_frame)
-        @subscription_manager.subscribed_id?('1234').should be_false
+        @subscription_manager.subscriptions.any? { |s| s.id == '1234' }.should be_true
+        @subscription_manager.subscriptions.any? { |s| s.id == '4321' }.should be_false
+        @subscription_manager.remove('1234')
+        @subscription_manager.subscriptions.any? { |s| s.id == '1234' }.should be_false
       end
-      
+ 
       it "should correctly report subscribed destinations" do
         @subscription_manager.add(@subscribe_frame, lambda { |m| true })
-        @subscription_manager.subscribed_destination?('/queue/testing').should be_true
-        @subscription_manager.subscribed_destination?('/queue/test').should be_false
-        @subscription_manager.__send__(:remove, @unsubscribe_frame)
-        @subscription_manager.subscribed_destination?('/queue/testing').should be_false
+        @subscription_manager.subscriptions.any? { |s| s.destination == '/queue/testing' }.should be_true
+        @subscription_manager.subscriptions.any? { |s| s.destination == '/queue/test' }.should be_false
+        @subscription_manager.remove('/queue/testing')
+        @subscription_manager.subscriptions.any? { |s| s.destination == '/queue/testing' }.should be_false
       end
       
       it "should correctly map subscribed destinations to their IDs" do
-        alt_subscribe_frame = ::Stomper::Frame.new('SUBSCRIBE', {:id => '4567', :destination => '/queue/testing'})
-        alt_unsubscribe_frame = ::Stomper::Frame.new('UNSUBSCRIBE', {:id => '4567'})
+        alt_subscribe_frame = ::Stomper::Frame.new('SUBSCRIBE', {:id => '4567', :destination => '/queue/test_further'})
+        @subscription_manager.add(@subscribe_frame, lambda { |m| true })
+        @subscription_manager.add(alt_subscribe_frame, lambda { |m| true })
+        @subscription_manager.subscriptions.map { |s| s.id }.should == ['1234', '4567']
+        @subscription_manager.remove('/queue/testing')
+        @subscription_manager.subscriptions.map { |s| s.id }.should == ['4567']
+        @subscription_manager.remove('/queue/test_further')
+        @subscription_manager.subscriptions.should be_empty
+      end
+      
+      it "should clear out all remaining subscriptions when the connection is closed" do
+        alt_subscribe_frame = ::Stomper::Frame.new('SUBSCRIBE', {:id => '4567', :destination => '/queue/test_further'})
         @subscription_manager.add(@subscribe_frame, lambda { |m| true })
         @subscription_manager.add(alt_subscribe_frame, lambda { |m| true })
-        @subscription_manager.ids_for_destination('/queue/testing').should == ['1234', '4567']
-        @subscription_manager.ids_for_destination('/queue/test').should be_nil
-        @subscription_manager.__send__(:remove, @unsubscribe_frame)
-        @subscription_manager.ids_for_destination('/queue/testing').should == ['4567']
-        @subscription_manager.__send__(:remove, alt_unsubscribe_frame)
-        @subscription_manager.ids_for_destination('/queue/testing').should be_nil
+        @subscription_manager.remove('4567')
+        @subscription_manager.subscriptions.map { |s| s.id }.should == ['1234']
+        @connection.__send__(:trigger_event, :on_connection_closed, @connection)
+        @subscription_manager.subscriptions.should be_empty
+      end
+      
+      it "should trigger subscriptions for MESSAGE frames with only a destination" do
+        triggered = [0, 0]
+        alt_subscribe_frame = ::Stomper::Frame.new('SUBSCRIBE', {:id => '4567', :destination => '/queue/testing'})
+        @subscription_manager.add(@subscribe_frame, lambda { |m| triggered[0] += 1 })
+        @subscription_manager.add(alt_subscribe_frame, lambda { |m| triggered[1] += 1 })
+        @connection.__send__(:trigger_received_frame, ::Stomper::Frame.new('MESSAGE', { :destination => '/queue/testing' }))
+        @connection.__send__(:trigger_received_frame, ::Stomper::Frame.new('MESSAGE', { :subscription => '4567' }))
+        triggered.should == [1, 2]
       end
       
       it "should allow a subscription handler to be registered within a callback" do
@@ -76,7 +94,7 @@ module Stomper
         triggered.should == 1
       end
       
-      it "should allow a receipt handler to be registered within a callback in separate threads" do
+      it "should allow a subscription handler to be registered within a callback in separate threads" do
         alt_subscribe_frame = ::Stomper::Frame.new('SUBSCRIBE', {:id => '4567', :destination => '/queue/testing'})
         triggered = [false, false]
         started_r1 = false

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Ian D. Eccles
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -05:00
+date: 2011-02-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency