librtree 0.8.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d796bcdad6e023f99009363c9c11a10d8c6dfc7b9c797b487925fa319ace78b9
-  data.tar.gz: 83d563781db1c1e1b6bd8b8790cbb68fbbd9a7f997dd49840ff8cba7bfcac3e8
+  metadata.gz: 3ea7105c3090ca70b99cec081b01ed6f46490208e79ee6ecdaf9045b827280ca
+  data.tar.gz: 7071f07e2e9ced00f34d48764e229057a9b69cec6e57b003babc27b5577e5372
 SHA512:
-  metadata.gz: e1a6c56ad9c14ae15c8ed047e980262477f36b672bb08c5cc584eff7b2fba3b20845e8671ee166f8929abbb5a7d11e596cca36da6d89a67cef167773ada20577
-  data.tar.gz: b699d85386e8ea991eb2d4e4816635b6a0d550e2dbeb36b670526186d0b72f72f8cf763d22ba6339fe595dc3f70c7d6f9e9bfa5714216ec125e0b1748c146d97
+  metadata.gz: f96d9eb0c8d21ef03a8d716f544ec34d84dabe4f598e606af99184e7cfb951c5a80f55e058b0d20ebafd4d2f173bae76bf230fac8489d8e71cbbe2a57c5170fa
+  data.tar.gz: cd2d89976e36b6c0aadf7b0d95c823c4f39869d480886746aa8e1f2a402bdaf7e9f7e0b87695beacd75aad7655bfeaa8b65bca11fed80e9a15464de854da3a94

data/ext/rtree/extconf.rb

@@ -16,14 +16,12 @@ LIB_DIRS = [
   '/usr/lib'
 ]
 
-puts LIB_DIRS.inspect
-
 dir_config('librtree', HEADER_DIRS, LIB_DIRS)
 
 abort 'missing jansson.h' unless find_header('jansson.h')
 abort 'missing rtree.h' unless find_header('rtree.h')
 
-abort "libjansson is missing" unless find_library('jansson', 'json_pack')
-abort "librtree is missing" unless find_library('rtree', 'rtree_new')
+abort 'libjansson is missing' unless find_library('jansson', 'json_pack')
+abort 'librtree is missing' unless find_library('rtree', 'rtree_new')
 
 create_makefile 'rtree/rtree'

data/ext/rtree/rtree.c

@@ -24,7 +24,7 @@ static size_t rt_dsize(const void *p)
 
 static VALUE rt_alloc(VALUE cls)
 {
-  rtree_t *rtree;;
+  rtree_t *rtree;
   if ((rtree = rtree_alloc()) == NULL)
     rb_raise(rb_eNoMemError, "failed to alloc rtree");
   return TypedData_Wrap_Struct(cls, &rtree_type, rtree);
@@ -534,6 +534,7 @@ void Init_rtree(void)
 
   VALUE cRTreeStyleBase = rb_const_get(rb_cObject, rb_intern("RTreeStyleBase"));
 
+  rb_undef_alloc_func(cRTreeStyleBase);
   rb_define_method(cRTreeStyleBase, "free", st_release, 0);
   rb_define_singleton_method(cRTreeStyleBase, "json_read", st_json_read, 1);
 }

data/lib/rtree.rb

@@ -1,8 +1,10 @@
-# The internal Ruby/C interface for RTree, not documented in YARD.
+# frozen_string_literal: true
+
+# @!visibility private
 #
 class RTreeBase ; end
 
-# The internal Ruby/C interface for RTree::Style, not documented in YARD.
+# @!visibility private
 #
 class RTreeStyleBase ; end
 
@@ -62,25 +64,78 @@ require 'fcntl'
 #
 class RTree < RTreeBase
 
+  # @!visibility private
+  #
   module IOUtil
+    extend self
+
+    # @!visibility private
+    #
+    def deserialise(string, encoding)
+      raise TypeError unless string.is_a? String
+      rd, wr = IO.pipe(encoding)
+      if fork then
+        wr.close
+        unset_nonblock(rd)
+        begin
+          result = yield(rd)
+        ensure
+          rd.close
+          Process.wait
+        end
+      else
+        rd.close
+        begin
+          wr.write(string)
+        ensure
+          wr.close
+          exit!
+        end
+      end
+      result
+    end
+
+    # @!visibility private
+    #
+    def serialise(encoding)
+      rd, wr = IO.pipe(encoding)
+      if fork then
+        wr.close
+        unset_nonblock(rd)
+        begin
+          result = rd.read
+        ensure
+          rd.close
+          Process.wait
+        end
+      else
+        rd.close
+        begin
+          yield(wr)
+        ensure
+          wr.close
+          exit!
+        end
+      end
+      result
+    end
 
     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.
+    # with some fairly low-level fcntl(2) magic.
 
     def unset_nonblock(fd)
-      flags0 = fd.fcntl(Fcntl::F_GETFL, 0)
-      flags1 = flags0 & ~Fcntl::O_NONBLOCK
-      fd.fcntl(Fcntl::F_SETFL, flags1)
+      fd.fcntl(
+        Fcntl::F_SETFL,
+        fd.fcntl(Fcntl::F_GETFL, 0) & ~Fcntl::O_NONBLOCK
+      )
     end
 
   end
 
-  extend IOUtil
-
   class << self
 
     # Create a new RTree instance from JSON stream
@@ -201,29 +256,10 @@ class RTree < RTreeBase
 
     private
 
-    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
-          result = yield(rd)
-        ensure
-          rd.close
-          Process.wait
-        end
-      else
-        rd.close
-        begin
-          wr.write(string)
-        ensure
-          wr.close
-          exit!
-        end
-      end
-      result
+    def deserialise(*args, &block)
+      RTree::IOUtil.deserialise(*args, &block)
     end
+
   end
 
   # Initialize a new (empty) RTree
@@ -235,7 +271,7 @@ class RTree < RTreeBase
   # @param node_page [Integer] the nodes-per-page value. This value can
   #   affect performance quite dramatically, particularly build time. A
   #   value which is too large would result in an infeasible branching
-  #   factor for the R-tree and will case the function to error with errno
+  #   factor for the R-tree and will cause the function to error with errno
   #   set to EINVAL. A value of zero is permitted and the default; in
   #   this case the function will choose a good value based on heuristics.
   #   You may get better performance for your use-case by manual
@@ -319,7 +355,7 @@ class RTree < RTreeBase
   # @return [Boolean] true if the RTree is empty
   #
   def empty?
-    height == 0
+    height.zero?
   end
 
   # Serialise to JSON stream
@@ -434,6 +470,7 @@ class RTree < RTreeBase
   end
 
   # Create a PostScript plot of the RTree
+  #
   # @param io [IO] a writeable stream object
   # @param style [RTree::Style] a style object describing the fill
   #   colour and stroke width and colour for each level of the tree.
@@ -475,21 +512,10 @@ class RTree < RTreeBase
     node_page_flag | split_flag
   end
 
-  def serialise(encoding)
-    rd, wr = IO.pipe(encoding)
-    if fork then
-      wr.close
-      result = rd.read
-      rd.close
-      Process.wait
-    else
-      rd.close
-      yield(wr)
-      wr.close
-      exit!
-    end
-    result
+  def serialise(*args, &block)
+    RTree::IOUtil.serialise(*args, &block)
   end
+
 end
 
 # @author RTree::Style J. J. Green
@@ -499,8 +525,6 @@ end
 #
 class RTree::Style < RTreeStyleBase
 
-  extend RTree::IOUtil
-
   class << self
 
     # Create a new Style instance from JSON stream
@@ -521,27 +545,7 @@ class RTree::Style < RTreeStyleBase
     # @see .json_read
     #
     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
-          result = json_read(rd)
-        ensure
-          rd.close
-          Process.wait
-        end
-      else
-        rd.close
-        begin
-          wr.write(json)
-        ensure
-          wr.close
-          exit!
-        end
-      end
-      result
+      deserialise(json, Encoding::UTF_8) { |io| json_read(io) }
     end
 
     # Create a new Style instance from array of Hash
@@ -570,5 +574,11 @@ class RTree::Style < RTreeStyleBase
 
     alias_method :from_array, :from_a
 
+    private
+
+    def deserialise(*args, &block)
+      RTree::IOUtil.deserialise(*args, &block)
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librtree
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.1
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2023-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +70,30 @@ dependencies:
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.1'
 description: |
   A Ruby extension implementing the R-tree spatial-index of
   Guttman-Green.
@@ -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.2.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: R-tree spatial index