Extract message_queue accessor, documentation, cleanup

Author: mtodd

lib/net/ldap/connection.rb

@@ -118,23 +118,38 @@ def close
   #
   # Returns a Net::LDAP::PDU object or nil.
   def queued_read(message_id)
-    if pdu = (@queue[message_id] || []).shift
+    if pdu = message_queue[message_id].shift
       return pdu
     end
 
+    # read messages until we have a match for the given message_id
     while pdu = read
       if pdu.message_id == message_id
         return pdu
       else
-        @queue[pdu.message_id].push pdu
-
+        message_queue[pdu.message_id].push pdu
         next
       end
     end
 
     pdu
   end
 
+  # Internal: The internal queue of messages, read from the socket, grouped by
+  # message ID.
+  #
+  # Used by `queued_read` to return messages sent by the server with the given
+  # ID. If no messages are queued for that ID, `queued_read` will `read` from
+  # the socket and queue messages that don't match the given ID for other
+  # readers.
+  #
+  # Returns the message queue Hash.
+  def message_queue
+    @message_queue ||= Hash.new do |hash, key|
+      hash[key] = []
+    end
+  end
+
   # Internal: Reads and parses data from the configured connection.
   #
   # - syntax: the BER syntax to use to parse the read data with
@@ -380,9 +395,7 @@ def search(args = {})
     result_pdu = nil
     n_results = 0
 
-    @queue ||= {}
     message_id = next_msgid
-    @queue[message_id] ||= []
 
     instrument "search.net_ldap_connection",
                :message_id => message_id,