uringmachine 0.28.1 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fb662e62914ca38e254df5ee924b61155b510d3e862efa2f2e0997b00e7b3fd
-  data.tar.gz: 6ea55d8b64df3873677d1243342d5d6163812068392498f1f080351d0fc9d3e2
+  metadata.gz: fbdc1ca412e20436a209c2e4f77af29873d5c8bac02f88c35562333f1e5328e6
+  data.tar.gz: d426661ce83c278041042c5829a23b4bb5c0c65cf99d1cb3cb96f5706b464859
 SHA512:
-  metadata.gz: 3ca70d442ad7b7379dccb7e1e6df6acac913f2b5ae9ac9a2ca87b8ab5ecac5efd00454888921faa7960321f91493ad10dd337ab043fc3b4771fdb6bc17dead0b
-  data.tar.gz: 6e4102474725dc14bf91690edcaf0e53d3eb9c7796b8edd72e2ec89629b7fc2c821e2a8c1e1abfaf52f0a27d9dd8153e6b750ed3f525436162bd93db7bf5aece
+  metadata.gz: 9908398a698bf7a2771a88b369023e27c3669bd205eb86a8132fee154709d68b21cd05a4fcd8b0bacb0f8e10140f2a2ef002f01cd7ac8177bf678c4f8e8574b5
+  data.tar.gz: afb606febf25d41fdf99b00e8cdeaa97523608445cc842cf49acbdf5af95f726276d443a574363b23b9b6c8287fad560780913f4bf1fd09240cf5df29185a9ac

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.28.3 2026-02-22
+
+- Accept array in `#terminate` and `#join`
+
+# 0.28.2 2026-02-20
+
+- Fix `Stream#get_string`
+
 # 0.28.1 2026-02-20
 
 - Add `Stream#machine`, `Stream#fd`

data/TODO.md

@@ -1,5 +1,25 @@
 ## immediate
 
+- Add support for exception instances in `#timeout`.
+- Add support for returning a value on timeout:
+
+  Since to do this safely we need to actually raise an exception that wraps the
+  value, rescue it and return the value, we might want a separate method that
+  wraps `#timeout`:
+
+  ```ruby
+  TimeoutValueError < StandardError
+
+  def timeout_with_value(interval, value, &block)
+    timeout_error = TimeoutValueError
+    timeout(interval, timeout_error, &block)
+  rescue TimeoutValueError => e
+    raise if e != timeout_error
+    
+    value
+  end
+  ```
+
 - Add tests for support for Set in `machine#await_fibers`
 - Add tests for support for Set, Array in `machine#join`
 - Add `#read_file` for reading entire file
@@ -145,3 +165,14 @@ jobs = (1..100).map { |i|
 }
 machine.join(jobs)
 ```
+
+## Other abstractions
+
+- Happy eyeballs connect
+
+  ```ruby
+  # addrs: [['1.1.1.1', 80], ['2.2.2.2', 80]]
+  #        ['1.1.1.1:80', '2.2.2.2:80']
+  tcp_connect_happy_eyeballs(*addrs)
+  ```
+

data/ext/um/um.c

@@ -539,7 +539,7 @@ VALUE um_timeout_complete(VALUE arg) {
 
 VALUE um_timeout(struct um *machine, VALUE interval, VALUE class) {
   static ID ID_new = 0;
-  if (!ID_new) ID_new = rb_intern("new");
+  if (unlikely(!ID_new)) ID_new = rb_intern("new");
 
   struct um_op *op = um_op_acquire(machine);
   um_prep_op(machine, op, OP_TIMEOUT, 2, 0);

data/ext/um/um_stream.c

@@ -56,8 +56,8 @@ static inline void str_copy_bytes(VALUE dest, const char *src, ssize_t len) {
 }
 
 VALUE stream_get_line(struct um_stream *stream, VALUE buf, ssize_t maxlen) {
-  char *start = RSTRING_PTR(stream->buffer) + stream->pos;
   while (true) {
+    char *start = RSTRING_PTR(stream->buffer) + stream->pos;
     ssize_t pending_len = stream->len - stream->pos;
     ssize_t search_len = pending_len;
     ssize_t absmax_len = labs(maxlen);
@@ -76,32 +76,31 @@ VALUE stream_get_line(struct um_stream *stream, VALUE buf, ssize_t maxlen) {
       return buf;
     }
     else if (should_limit_len && pending_len > search_len)
-      // maxlen
+      // hit maxlen
       return Qnil;
 
     if (!stream_read_more(stream))
       return Qnil;
-    else
-      // update start ptr (it might have changed after reading)
-      start = RSTRING_PTR(stream->buffer) + stream->pos;
   }
 }
 
 VALUE stream_get_string(struct um_stream *stream, VALUE buf, ssize_t len) {
   size_t abslen = labs(len);
-  while (stream->len - stream->pos < abslen)
+  while (stream->len - stream->pos < abslen) {
     if (!stream_read_more(stream)) {
-      if (len > 0) return Qnil;
+      if (len > 0)
+        return Qnil;
 
       abslen = stream->len - stream->pos;
     }
+  }
 
   char *start = RSTRING_PTR(stream->buffer) + stream->pos;
   stream->pos += abslen;
 
   if (NIL_P(buf)) return rb_utf8_str_new(start, abslen);
 
-  str_copy_bytes(buf, start, len);
+  str_copy_bytes(buf, start, abslen);
   return buf;
 }
 

data/lib/uringmachine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class UringMachine
-  VERSION = '0.28.1'
+  VERSION = '0.28.3'
 end

data/lib/uringmachine.rb

@@ -36,9 +36,17 @@ class UringMachine
     fiber
   end
 
+  TERMINATE_EXCEPTION = UM::Terminate.new
+
+  # Terminates the given fibers by scheduling them with a `UM::Terminate`
+  # exception. This method does not wait for the fibers to be done.
+  #
+  # @param *fibers [Array<Fiber>] fibers to terminate
+  # @return [void]
   def terminate(*fibers)
-    exception = UM::Terminate.new
-    fibers.each { schedule(it, exception) }
+    fibers = fibers.first if fibers.size == 1 && fibers.first.is_a?(Enumerable)
+
+    fibers.each { schedule(it, TERMINATE_EXCEPTION) }
   end
 
   # Runs the given block in the given fiber. This method is used to run fibers
@@ -58,6 +66,8 @@ class UringMachine
   #
   # @return [Array<any>] return values of the given fibers
   def join(*fibers)
+    fibers = fibers.first if fibers.size == 1 && fibers.first.is_a?(Enumerable)
+
     results = fibers.inject({}) { |h, f| h[f] = nil; h }
     queue = nil
     pending = nil

data/test/test_stream.rb

@@ -234,3 +234,20 @@ class StreamRespTest < StreamBaseTest
       s.resp_encode_cmd(+'', :set, 'foobar', :nx, :xx)
   end
 end
+
+class StreamHTTPTest < StreamBaseTest
+  def test_stream_http_etc
+    machine.write(@wfd, "GET / HTTP/1.1\r\n\r\nblahblah")
+    machine.close(@wfd)
+
+    l = @stream.get_line(nil, 0)
+    assert_equal "GET / HTTP/1.1", l
+
+    l = @stream.get_line(nil, 0)
+    assert_equal '', l
+
+    l = @stream.get_string(nil, -50)
+    assert_equal 'blahblah', l
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uringmachine
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.3
 platform: ruby
 authors:
 - Sharon Rosner