net-protocol 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16f82437abceaa211dc99712afe1f8c42c0daef151b915f1366a420bf8a3322
-  data.tar.gz: 86d38fb6a43a0b62c6b3438b4e1b286806bb56caabd383cd5e3d7c82a8bcb88f
+  metadata.gz: f819b1703cd2631eb0c7d41fff4ca6a74dff9e88d740c5bfd93980ba2e8b3873
+  data.tar.gz: c4ac03ea98b451e2ddc9f38b0ff6b73d4341a6b09d01c923683ae354d9adcbb2
 SHA512:
-  metadata.gz: 876168c8096052d6230fc67c2383b8ce8e879c50eb338ad3f3a4b98c9a4ed1ba409c25c7a3644cb6e7e8893b2788bb33460a1613ea7cd1fb9952f64bb34bdcf8
-  data.tar.gz: a2be90f1ade432da76a949cc2112a2205ae5a732e0b2c00acd3c614abdf0a8e311954ad9f0c567876bfd66b09485511034a7590f97cfa2d2044b49e62c09d1e2
+  metadata.gz: f9f88f0b96250c90ced8c159a4941efb190bb1de64b9bbed3cb393b295aaf9a60dc607038fcfcf7a2d39d983aa27a2ca9b61f07e04c8d7f8750c700dcb76ceda
+  data.tar.gz: 395718803914996cc958d50d30a56d1cb3856be7c940961059e19316476f5ae476366b42e38cd348508bc1850e13f51965e5a4631524683c63e252ff1088d571

data/lib/net/protocol.rb

@@ -21,12 +21,12 @@
 
 require 'socket'
 require 'timeout'
-require 'io/wait'
+require 'io/wait' if RUBY_VERSION < '3.2'
 
 module Net # :nodoc:
 
   class Protocol   #:nodoc: internal use only
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
 
     private
     def Protocol.protocol_param(name, val)
@@ -189,6 +189,7 @@ module Net # :nodoc:
     public
 
     def read(len, dest = ''.b, ignore_eof = false)
+      raise ArgumentError, "negative length #{len} given" if len < 0
       LOG "reading #{len} bytes..."
       read_bytes = 0
       begin
@@ -356,9 +357,9 @@ module Net # :nodoc:
       @debug_output << '<- ' if @debug_output
       yield
       @debug_output << "\n" if @debug_output
-      bytes = @written_bytes
+      @written_bytes
+    ensure
       @written_bytes = nil
-      bytes
     end
 
     def write0(*strs)
@@ -384,6 +385,9 @@ module Net # :nodoc:
             # next string
           end
           # continue looping
+        when :wait_readable
+          (io = @io.to_io).wait_readable(@write_timeout) or raise Net::WriteTimeout.new(io)
+          # continue looping
         when :wait_writable
           (io = @io.to_io).wait_writable(@write_timeout) or raise Net::WriteTimeout.new(io)
           # continue looping
@@ -426,12 +430,15 @@ module Net # :nodoc:
     def each_message_chunk
       LOG 'reading message...'
       LOG_off()
-      read_bytes = 0
-      while (line = readuntil("\r\n")) != ".\r\n"
-        read_bytes += line.size
-        yield line.delete_prefix('.')
+      begin
+        read_bytes = 0
+        while (line = readuntil("\r\n")) != ".\r\n"
+          read_bytes += line.size
+          yield line.delete_prefix('.')
+        end
+      ensure
+        LOG_on()
       end
-      LOG_on()
       LOG "read message (#{read_bytes} bytes)"
     end
 
@@ -457,12 +464,15 @@ module Net # :nodoc:
     def write_message(src)
       LOG "writing message from #{src.class}"
       LOG_off()
-      len = writing {
-        using_each_crlf_line {
-          write_message_0 src
+      begin
+        len = writing {
+          using_each_crlf_line {
+            write_message_0 src
+          }
         }
-      }
-      LOG_on()
+      ensure
+        LOG_on()
+      end
       LOG "wrote #{len} bytes"
       len
     end
@@ -470,16 +480,19 @@ module Net # :nodoc:
     def write_message_by_block(&block)
       LOG 'writing message from block'
       LOG_off()
-      len = writing {
-        using_each_crlf_line {
-          begin
-            block.call(WriteAdapter.new(self.method(:write_message_0)))
-          rescue LocalJumpError
-            # allow `break' from writer block
-          end
+      begin
+        len = writing {
+          using_each_crlf_line {
+            begin
+              block.call(WriteAdapter.new(self.method(:write_message_0)))
+            rescue LocalJumpError
+              # allow `break' from writer block
+            end
+          }
         }
-      }
-      LOG_on()
+      ensure
+        LOG_on()
+      end
       LOG "wrote #{len} bytes"
       len
     end
@@ -499,6 +512,8 @@ module Net # :nodoc:
         write0 "\r\n"
       end
       write0 ".\r\n"
+      nil
+    ensure
       @wbuf = nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-protocol
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Yukihiro Matsumoto