librtree 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc74390aa8eb79643f88f2c48f7408ef9dd17dd12ed1049e3bfe2961b7523e4b
-  data.tar.gz: 25488f67912344fcd69cb2c19ca6b4344cf708bfc07d9f8e1629b5893030a759
+  metadata.gz: d796bcdad6e023f99009363c9c11a10d8c6dfc7b9c797b487925fa319ace78b9
+  data.tar.gz: 83d563781db1c1e1b6bd8b8790cbb68fbbd9a7f997dd49840ff8cba7bfcac3e8
 SHA512:
-  metadata.gz: 4bc5ae0e333e077a8331164e87f3d4c60470bfadc046c86424b8147d59ecfdb32b212d7ae7ec0d3e834d62b0c564929723a56af988a5b5a05364ba9e841407ff
-  data.tar.gz: 2b5d8c0799fabb2085686f4c3eb23feb367201d6630d4ac7e0621cc76ba5dbc6422b0e4d5649aee33fc375cff3411308ef81d61567f1af6049f50b677aa198de
+  metadata.gz: e1a6c56ad9c14ae15c8ed047e980262477f36b672bb08c5cc584eff7b2fba3b20845e8671ee166f8929abbb5a7d11e596cca36da6d89a67cef167773ada20577
+  data.tar.gz: b699d85386e8ea991eb2d4e4816635b6a0d550e2dbeb36b670526186d0b72f72f8cf763d22ba6339fe595dc3f70c7d6f9e9bfa5714216ec125e0b1748c146d97

data/ext/rtree/rtree.c

@@ -139,10 +139,10 @@ static VALUE rt_update(VALUE self)
 
 /*
   The librtree API expects the search callback to return zero to
-  continue the search, non-zero to terminate. I was expecting to
+  continue the search, non-zero to terminate.  I was expecting to
   need to wrap the 'yield' in 'rescue's and 'ensure's to handle
   exceptions and breaks, but find that doing nothing actually does
-  the right thing (see specs).  The search implemetation is just
+  the right thing (see specs).  The search implementation is just
   a recursive search through the tree (as you would expect) so
   there is no end-of-search cleanup to do, so I think this is all
   just fine ... wild

data/lib/rtree.rb

@@ -8,6 +8,7 @@ class RTreeStyleBase ; end
 
 require 'rtree/rtree'
 require 'json'
+require 'fcntl'
 
 # @author RTree J. J. Green
 #
@@ -61,6 +62,25 @@ require 'json'
 #
 class RTree < RTreeBase
 
+  module IOUtil
+
+    private
+
+    # In Ruby 3, the Fibres facility exploits non-blocking IO and so pipes
+    # are non-blocking by default, this buggers-up the deserialise method
+    # since there is short delay forking here -- so we reinstate blocking
+    # with some fairly low-level fcntl)2) magick.
+
+    def unset_nonblock(fd)
+      flags0 = fd.fcntl(Fcntl::F_GETFL, 0)
+      flags1 = flags0 & ~Fcntl::O_NONBLOCK
+      fd.fcntl(Fcntl::F_SETFL, flags1)
+    end
+
+  end
+
+  extend IOUtil
+
   class << self
 
     # Create a new RTree instance from JSON stream
@@ -184,6 +204,7 @@ class RTree < RTreeBase
     def deserialise(string, encoding)
       raise TypeError unless string.is_a? String
       rd, wr = IO.pipe(encoding)
+      unset_nonblock(rd)
       if fork then
         wr.close
         begin
@@ -478,6 +499,8 @@ end
 #
 class RTree::Style < RTreeStyleBase
 
+  extend RTree::IOUtil
+
   class << self
 
     # Create a new Style instance from JSON stream
@@ -500,6 +523,7 @@ class RTree::Style < RTreeStyleBase
     def from_json(json)
       raise TypeError unless json.is_a? String
       rd, wr = IO.pipe(Encoding::UTF_8)
+      unset_nonblock(rd)
       if fork then
         wr.close
         begin
@@ -545,5 +569,6 @@ class RTree::Style < RTreeStyleBase
     end
 
     alias_method :from_array, :from_a
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librtree
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - The librtree library (1.0.6 or later)
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: R-tree spatial index