ionian 0.6.6 → 0.6.7

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Apr 12 13:24:31 2014 by
+  Generated on Sun Apr 13 09:26:35 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.4 (ruby-2.1.1).
 </div>

data/lib/ionian/extension/io.rb

@@ -1,3 +1,5 @@
+Thread.abort_on_exception = true
+
 module Ionian
   module Extension
     # A mixin for IO objects that allows regular expression matching
@@ -31,7 +33,7 @@ module Ionian
       # Args:
       #   Timeout: Number of seconds to wait for data until
       #     giving up. Set to nil for blocking.
-      def has_data?(timeout: 0)
+      def has_data? timeout: 0
         ::IO.select([self], nil, nil, timeout) ? true : false
       end
       
@@ -53,8 +55,11 @@ module Ionian
       
       # Read all data in the buffer.
       # An alternative to using #readpartial with a large length.
-      # Blocks until data is available.
-      def read_all
+      # Blocks until data is available unless nonblocking: true.
+      # If nonblocking, returns nil if no data available.
+      def read_all nonblocking: false
+        return nil if nonblocking and not has_data?
+        
         # Block until data has arrived.
         data =  readpartial 0xFFFF
         # If there is more data in the buffer, retrieve it nonblocking.

data/lib/ionian/extension/socket.rb

@@ -54,10 +54,16 @@ module Ionian
       # For connection-oriented protocols, prevent #close from returning
       # immediately and try to deliver any data in the send buffer if value
       # is true.
+      # 
+      # Args:
+      #   Time: Time in seconds to remain open before discarding data and
+      #         sending a RST packet.
       # ( SO_LINGER )
-      def linger= value
-        param = value ? 1 : 0
-        self.setsockopt ::Socket::SOL_SOCKET, ::Socket::SO_LINGER, [param].pack('i')
+      def linger= enable, time: 60
+        # TODO: Passing a kwarg doesn't work here because of the
+        #       assignment operator. Causes parser error.
+        param = enable ? 1 : 0
+        self.setsockopt ::Socket::SOL_SOCKET, ::Socket::SO_LINGER, [param, time.to_i].pack('ii')
       end
       
       alias_method :linger?, :linger

data/lib/ionian/server.rb

@@ -1,6 +1,9 @@
 require 'socket'
 require 'ionian/socket'
 
+Thread.abort_on_exception = true
+
+
 module Ionian
   
   # A convenient wrapper for TCP, UDP, and Unix server sockets.
@@ -59,7 +62,6 @@ module Ionian
         @interface = host_port_ary[0]
         @port ||= host_port_ary[1]
         
-        # TODO: Parse port from interface if TCP.
         raise ArgumentError, "Port not specified." unless @port
         @port = @port.to_i
         
@@ -85,19 +87,18 @@ module Ionian
       register_accept_listener &block if block_given?
       
       @accept_thread ||= Thread.new do
-        # Package in an Ionian::Socket
-        begin
-          client = Ionian::Socket.new @server.accept
-          
-          @accept_listeners.each do |listener|
-            listener.call client
+        loop do
+          # Package in an Ionian::Socket
+          begin
+            client = Ionian::Socket.new @server.accept
+            @accept_listeners.each { |listener| listener.call client }
+          rescue Errno::EBADF
+            # This ignores the connection if the client closed it before it
+            # could be accepted.
+          rescue IOError
+            # This ignores the connection if the client closed it before it
+            # could be accepted.
           end
-        rescue Errno::EBADF
-          # This ignores the connection if the client closed it before it
-          # could be accepted.
-        rescue IOError
-          # This ignores the connection if the client closed it before it
-          # could be accepted.
         end
       end
     end
@@ -105,7 +106,7 @@ module Ionian
     # Shutdown the server socket and stop listening for connections.
     def close
       @server.close if @server
-      @accept_thread.join if @accept_thread
+      @accept_thread.kill if @accept_thread
       @accept_thread = nil
     end
     

data/lib/ionian/socket.rb

@@ -36,6 +36,8 @@ module Ionian
     #   no_delay:   Set true to enable the TCP_NODELAY flag. Disables Nagle algorithm.
     #   cork:       Set true to enable the TCP_CORK flag. Buffers multiple writes
     #               into one segment.
+    #   linger:     Set true to enable the SO_LINGER flag. When #close is called,
+    #               waits for the send buffer to empty before closing the socket.
     #   expression: Overrides the #read_match regular expression for received data.
     def initialize existing_socket = nil, **kwargs
       @socket = existing_socket
@@ -91,8 +93,14 @@ module Ionian
         @persistent     = true if @protocol == :udp
         
         @reuse_addr     = kwargs.fetch :reuse_addr, false
-        @no_delay       = kwargs.fetch :no_delay,   false
         @cork           = kwargs.fetch :cork,       false
+        @no_delay       = kwargs.fetch :no_delay,   @persistent ? false : true
+        
+        # Default to false for persistent sockets, true for
+        # nonpersistent sockets. When nonpersistent, the socket
+        # should remain open to send data in the buffer after
+        # close is called (typically right after write).
+        @linger         = kwargs.fetch :linger,     @persistent ? false : true
       
         
         create_socket if @persistent
@@ -122,12 +130,7 @@ module Ionian
     def cmd string, **kwargs, &block
       create_socket unless @persistent
       
-      if @protocol == :udp
-        @socket.send string, 0
-      else
-        @socket.write string
-      end
-      
+      write string
       @socket.flush
       
       matches = @socket.read_match(kwargs) { |match| yield match if block_given? }
@@ -198,10 +201,16 @@ module Ionian
       end
       
       unless @persistent
+        @socket.flush
+        
         # Read in data to prevent RST packets.
-        has_data = ::IO.select [@socket], nil, nil, 0
-        @socket.readpartial 0xFFFF if has_data
+        # TODO: Shutdown read stream instead?
+        @socket.read_all nonblocking: true
         
+        # TODO: Sleep added so that data can be read on the receiving
+        # end. Can this be changed to shutdown write?
+        # Why isn't so_linger taking care of this?
+        sleep 0.01
         @socket.close
       end
       
@@ -221,9 +230,9 @@ module Ionian
       when :tcp
         @socket = ::TCPSocket.new @host, @port
         @socket.extend Ionian::Extension::Socket
-        @socket.expression = @expression if @expression
-        @socket.no_delay = true if @no_delay
-        @socket.cork = true if @cork
+        
+        @socket.no_delay = @no_delay
+        @socket.cork = @cork
         
       when :udp
         @socket = ::UDPSocket.new
@@ -240,10 +249,10 @@ module Ionian
       when :unix
         @socket = ::UNIXSocket.new @host
         @socket.extend Ionian::Extension::Socket
+        
       end
       
-      # TODO: Implement SO_LINGER flag for non-persistent sockets;
-      #       especially send-and-forget.
+      @socket.linger = @linger
       
       @socket.expression = @expression if @expression
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ionian
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Alex McLain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake