connection.rb in m2r-2.0.0

- old
+ new
@@ -1,66 +1,77 @@
 require 'm2r'
 
 module M2R
   # Connection for exchanging data with mongrel2
   class Connection
+    class Error < StandardError; end
 
     # @param [ZMQ::Socket] request_socket socket for receiving requests
     #   from Mongrel2
     # @param [ZMQ::Socket] response_socket socket for sending responses
     #   to Mongrel2
-    # @param [#parse] request_parser Object responsible for parsing Mongrel2
-    #   requests
     # @api public
-    def initialize(request_socket, response_socket, request_parser = Request)
+    def initialize(request_socket, response_socket)
       @request_socket  = request_socket
       @response_socket = response_socket
-      @request_parser  = request_parser
     end
 
     # For compatibility with {M2R::ConnectionFactory}
     #
     # @return [Connection] self
     # @api public
     def connection
       self
     end
 
-    # Returns parsed Mongrel2 request
+    # Returns Mongrel2 request
     #
     # @note This is blocking call
-    # @return [Request] Request parsed by {#request_parser}
+    # @return [String] M2 request message
     # @api public
     def receive
-      @request_socket.recv_string(msg = "")
-      @request_parser.parse(msg)
+      ret = @request_socket.recv_string(msg = "")
+      raise Error, "Unable to receive message: #{ZMQ::Util.error_string}" if ret < 0
+      return msg
     end
 
     # Sends response to Mongrel2 for given request
     #
     # @param [Response, #to_s] response_or_string Response
     #   for the request. Anything convertable to [String]
+    # @return [String] M2 response message
     # @api public
     def reply(request, response_or_string)
       deliver(request.sender, request.conn_id, response_or_string.to_s)
+      deliver(request.sender, request.conn_id, "") if close?(request, response_or_string)
     end
 
     # Delivers data to multiple mongrel2 connections.
     # Useful for streaming.
     #
     # @param [String] uuid Mongrel2 instance uuid
     # @param [Array<String>, String] connection_ids Mongrel2 connections ids
     # @param [String] data Data that should be delivered to the connections
+    # @return [String] M2 response message
     #
     # @api public
     def deliver(uuid, connection_ids, data)
       msg = "#{uuid} #{TNetstring.dump([*connection_ids].join(' '))} #{data}"
-      @response_socket.send_string(msg)
+      ret = @response_socket.send_string(msg, ZMQ::NOBLOCK)
+      raise Error, "Unable to deliver message: #{ZMQ::Util.error_string}" if ret < 0
+      return msg
     end
 
     private
 
+    def close?(request, response_or_string)
+      if response_or_string.respond_to?(:close?)
+        response_or_string.close?
+      else
+        request.close?
+      end
+    end
+
     attr_reader :request_socket
     attr_reader :response_socket
-    attr_reader :request_parser
   end
 end