librtree 0.8.2 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f559b211be3e93ded31a86b61c68ea28cdea151ef62d0c64a79aa38131fa5a7
-  data.tar.gz: 7df99f8990a461d60e2276a20891be62c1dc27e6279a2226f2fec6d63d30f5dd
+  metadata.gz: b33e172341a9e44682c139df3a6b92198b3dd83059340da9fb8752444afbac70
+  data.tar.gz: 7ba6d8c71b6afeb8e5dedde55ff08074db758fa7ea150a67195ff07ca426a312
 SHA512:
-  metadata.gz: d6c204e2ba3a7b26fe2ab8ba1148b159a21cc697061d672fa2ccff85924dc56c2a9f19b6241d68e5ec96e3b5f955ffc617ecfc26bc9db94cb0f2190e3178e693
-  data.tar.gz: c831af24c76a719bfae623a5b525840cf910065426833589d8c04160524e576daf4ad13daf2793387931599187ad80f6bc596aaf21b72334e5230a449cda818d
+  metadata.gz: d4440a12038bd07dcb458ff993269fd72ac3826753f6e2757b86f19913a1cc748d7af1f37a7355e015d5a6dd3a750b8335a6f87d2a1dbdc5e4ef5387f9424f6a
+  data.tar.gz: ce193b26ab45e5ca2cab29c0c145a9432440355585e5cc5e226bbe0e762b3d4c33bcd693626ccd3f60eaad11513c94d3e8246e86cf8b703a7d89f19b22090d1b

data/ext/rtree/extconf.rb

@@ -20,11 +20,9 @@ puts LIB_DIRS.inspect
 
 dir_config('librtree', HEADER_DIRS, LIB_DIRS)
 
-abort 'missing csv.h' unless find_header('csv.h')
 abort 'missing jansson.h' unless find_header('jansson.h')
 abort 'missing rtree.h' unless find_header('rtree.h')
 
-abort "libcsv is missing" unless find_library('csv', 'csv_init')
 abort "libjansson is missing" unless find_library('jansson', 'json_pack')
 abort "librtree is missing" unless find_library('rtree', 'rtree_new')
 

data/ext/rtree/rtree.c

@@ -1,38 +1,36 @@
 #include <ruby.h>
 #include <ruby/io.h>
+#include <ruby/version.h>
 
 #include <rtree.h>
+#include <rtree/package.h>
+#include <rtree/postscript.h>
 
 #include <errno.h>
 #include <stdint.h>
 
-typedef struct
-{
-  rtree_t *rtree;
-} lrt_t;
+static rb_data_type_t style_type;
+static rb_data_type_t rtree_type;
 
-static void lrt_free(void *p)
+static void rt_dfree(void *p)
 {
-  lrt_t *lrt = p;
-
-  if (lrt->rtree)
-    {
-      rtree_destroy(lrt->rtree);
-      lrt->rtree = NULL;
-    }
+  rtree_destroy((rtree_t*)p);
 }
 
-static VALUE lrt_alloc(VALUE cls)
+static size_t rt_dsize(const void *p)
 {
-  lrt_t *lrt;
-  VALUE obj = Data_Make_Struct(cls, lrt_t, NULL, lrt_free, lrt);
-
-  lrt->rtree = NULL;
+  return rtree_bytes((const rtree_t*)p);
+}
 
-  return obj;
+static VALUE rt_alloc(VALUE cls)
+{
+  rtree_t *rtree;;
+  if ((rtree = rtree_alloc()) == NULL)
+    rb_raise(rb_eNoMemError, "failed to alloc rtree");
+  return TypedData_Wrap_Struct(cls, &rtree_type, rtree);
 }
 
-static VALUE lrt_init(VALUE self, VALUE dim_obj, VALUE flags_obj)
+static VALUE rt_init(VALUE self, VALUE dim_obj, VALUE flags_obj)
 {
   Check_Type(dim_obj, T_FIXNUM);
   size_t dim = FIX2ULONG(dim_obj);
@@ -40,43 +38,38 @@ static VALUE lrt_init(VALUE self, VALUE dim_obj, VALUE flags_obj)
   Check_Type(dim_obj, T_FIXNUM);
   state_flags_t flags = FIX2UINT(flags_obj);
 
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
 
-  if ((lrt->rtree = rtree_new(dim, flags)) == NULL)
-    rb_raise(rb_eNoMemError, "failed to create rtree");
+  if ((rtree_init(rtree, dim, flags)) != 0)
+    rb_raise(rb_eNoMemError, "failed to init rtree");
 
   return self;
 }
 
-static VALUE lrt_release(VALUE self)
+static VALUE rt_release(VALUE self)
 {
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-
-  free(lrt->rtree);
-
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
+  rtree_destroy(rtree);
   return self;
 }
 
-static VALUE lrt_height(VALUE self)
+static VALUE rt_height(VALUE self)
 {
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-
-  return INT2NUM(rtree_height(lrt->rtree));
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
+  return INT2NUM(rtree_height(rtree));
 }
 
-static VALUE lrt_add_rect(VALUE self, VALUE id_obj, VALUE coord_obj)
+static VALUE rt_add_rect(VALUE self, VALUE id_obj, VALUE coord_obj)
 {
   Check_Type(coord_obj, T_ARRAY);
   Check_Type(id_obj, T_FIXNUM);
 
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
 
-  rtree_t
-    *rtree = lrt->rtree;
   rtree_id_t
     id = FIX2ULONG(id_obj);
   size_t
@@ -127,16 +120,15 @@ static int update_cb(rtree_id_t id, rtree_coord_t *coord, void *context)
   return 0;
 }
 
-static VALUE lrt_update(VALUE self)
+static VALUE rt_update(VALUE self)
 {
   if (!rb_block_given_p())
     rb_raise(rb_eArgError, "Expected block");
 
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-  rtree_t *rtree = lrt->rtree;
-  size_t len = 2 * state_dims(rtree->state);
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
 
+  size_t len = 2 * state_dims(rtree->state);
   int err = rtree_update(rtree, update_cb, &len);
 
   if (err != 0)
@@ -162,18 +154,16 @@ static int search_cb(rtree_id_t id, void *context)
   return 0;
 }
 
-static VALUE lrt_search(VALUE self, VALUE coord_obj)
+static VALUE rt_search(VALUE self, VALUE coord_obj)
 {
   if (!rb_block_given_p())
     rb_raise(rb_eArgError, "Expected block");
 
   Check_Type(coord_obj, T_ARRAY);
 
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
 
-  rtree_t
-    *rtree = lrt->rtree;
   size_t
     len = RARRAY_LEN(coord_obj),
     dim = state_dims(rtree->state);
@@ -215,26 +205,21 @@ static VALUE deserialise(VALUE cls, VALUE io_obj, deserialise_t *f)
         rb_raise(rb_eRuntimeError, "Failed read from stream");
     }
 
-  lrt_t *lrt;
-  VALUE obj = Data_Make_Struct(cls, lrt_t, NULL, lrt_free, lrt);
-
-  lrt->rtree = rtree;
-
-  return obj;
+  return TypedData_Wrap_Struct(cls, &rtree_type, rtree);
 }
 
-static VALUE lrt_json_read(VALUE cls, VALUE io_obj)
+static VALUE rt_json_read(VALUE cls, VALUE io_obj)
 {
   return deserialise(cls, io_obj, rtree_json_read);
 }
 
-static VALUE lrt_bsrt_read(VALUE cls, VALUE io_obj)
+static VALUE rt_bsrt_read(VALUE cls, VALUE io_obj)
 {
   return deserialise(cls, io_obj, rtree_bsrt_read);
 }
 
-static VALUE lrt_csv_read(VALUE cls,
-                          VALUE io_obj, VALUE dim_obj, VALUE flags_obj)
+static VALUE rt_csv_read(VALUE cls,
+                         VALUE io_obj, VALUE dim_obj, VALUE flags_obj)
 {
   Check_Type(io_obj, T_FILE);
   rb_io_t *io;
@@ -259,12 +244,7 @@ static VALUE lrt_csv_read(VALUE cls,
         rb_raise(rb_eRuntimeError, "Failed read from stream");
     }
 
-  lrt_t *lrt;
-  VALUE obj = Data_Make_Struct(cls, lrt_t, NULL, lrt_free, lrt);
-
-  lrt->rtree = rtree;
-
-  return obj;
+  return TypedData_Wrap_Struct(cls, &rtree_type, rtree);
 }
 
 /* serialisation */
@@ -281,9 +261,8 @@ static VALUE serialise(VALUE self, VALUE io_obj, serialise_t *f)
   rb_io_check_writable(io);
   FILE *fp = rb_io_stdio_file(io);
 
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-  rtree_t *rtree = lrt->rtree;
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
 
   int err = f(rtree, fp);
   if (err != 0)
@@ -292,24 +271,22 @@ static VALUE serialise(VALUE self, VALUE io_obj, serialise_t *f)
   return self;
 }
 
-static VALUE lrt_json_write(VALUE self, VALUE io_obj)
+static VALUE rt_json_write(VALUE self, VALUE io_obj)
 {
   return serialise(self, io_obj, rtree_json_write);
 }
 
-static VALUE lrt_bsrt_write(VALUE self, VALUE io_obj)
+static VALUE rt_bsrt_write(VALUE self, VALUE io_obj)
 {
   return serialise(self, io_obj, rtree_bsrt_write);
 }
 
-static VALUE lrt_identical(VALUE self, VALUE other)
+static VALUE rt_identical(VALUE self, VALUE other)
 {
-  lrt_t *lrt_self, *lrt_other;
-  Data_Get_Struct(self, lrt_t, lrt_self);
-  Data_Get_Struct(other, lrt_t, lrt_other);
-  rtree_t
-    *rtree_self = lrt_self->rtree,
-    *rtree_other = lrt_other->rtree;
+  rtree_t *rtree_self, *rtree_other;
+
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree_self);
+  TypedData_Get_Struct(other, rtree_t, &rtree_type, rtree_other);
 
   if (rtree_identical(rtree_self, rtree_other))
     return Qtrue;
@@ -317,14 +294,14 @@ static VALUE lrt_identical(VALUE self, VALUE other)
     return Qfalse;
 }
 
-static VALUE lrt_clone(VALUE self)
+static VALUE rt_clone(VALUE self)
 {
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
   rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
 
+  rtree_t *clone;
   errno = 0;
-  if ((rtree = rtree_clone(lrt->rtree)) == NULL)
+  if ((clone = rtree_clone(rtree)) == NULL)
     {
       if (errno)
         rb_sys_fail(__func__);
@@ -332,83 +309,231 @@ static VALUE lrt_clone(VALUE self)
         rb_raise(rb_eRuntimeError, "Failed clone");
     }
 
-  lrt_t *lrt_cloned;
-  VALUE cls = CLASS_OF(self);
-  VALUE obj = Data_Make_Struct(cls, lrt_t, NULL, lrt_free, lrt_cloned);
-
-  lrt_cloned->rtree = rtree;
-
-  return obj;
+  return TypedData_Wrap_Struct(CLASS_OF(self), &rtree_type, clone);
 }
 
 static VALUE state_size_access(VALUE self, size_t (*f)(const state_t*))
 {
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-  return INT2NUM(f(lrt->rtree->state));
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
+  return INT2NUM(f(rtree->state));
 }
 
-static VALUE lrt_dim(VALUE self)
+static VALUE rt_dim(VALUE self)
 {
   return state_size_access(self, state_dims);
 }
 
-static VALUE lrt_page_size(VALUE self)
+static VALUE rt_page_size(VALUE self)
 {
   return state_size_access(self, state_page_size);
 }
 
-static VALUE lrt_node_size(VALUE self)
+static VALUE rt_node_size(VALUE self)
 {
   return state_size_access(self, state_node_size);
 }
 
-static VALUE lrt_rect_size(VALUE self)
+static VALUE rt_rect_size(VALUE self)
 {
   return state_size_access(self, state_rect_size);
 }
 
-static VALUE lrt_branch_size(VALUE self)
+static VALUE rt_branch_size(VALUE self)
 {
   return state_size_access(self, state_branch_size);
 }
 
-static VALUE lrt_branching_factor(VALUE self)
+static VALUE rt_branching_factor(VALUE self)
 {
   return state_size_access(self, state_branching_factor);
 }
 
-static VALUE lrt_unit_sphere_volume(VALUE self)
+static VALUE rt_unit_sphere_volume(VALUE self)
+{
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
+  return DBL2NUM(state_unit_sphere_volume(rtree->state));
+}
+
+static VALUE rt_size(VALUE self)
+{
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
+  return INT2NUM(rtree_bytes(rtree));
+}
+
+static VALUE rt_version(VALUE self)
+{
+  return rb_str_new_cstr(rtree_package_version);
+}
+
+static VALUE rt_bugreport(VALUE self)
+{
+  return rb_str_new_cstr(rtree_package_bugreport);
+}
+
+static VALUE rt_url(VALUE self)
+{
+  return rb_str_new_cstr(rtree_package_url);
+}
+
+static VALUE rt_postscript(VALUE self,
+                           VALUE style_obj,
+                           VALUE axis_obj,
+                           VALUE extent_obj,
+                           VALUE margin_obj,
+                           VALUE io_obj)
 {
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-  return DBL2NUM(state_unit_sphere_volume(lrt->rtree->state));
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
+
+  style_t *style;
+  TypedData_Get_Struct(style_obj, style_t, &style_type, style);
+
+  Check_Type(io_obj, T_FILE);
+  rb_io_t *io;
+  GetOpenFile(io_obj, io);
+  rb_io_check_initialized(io);
+  rb_io_check_writable(io);
+  FILE *fp = rb_io_stdio_file(io);
+
+  float
+    extent = NUM2DBL(extent_obj),
+    margin = NUM2DBL(margin_obj);
+
+  Check_Type(axis_obj, T_FIXNUM);
+  extent_axis_t axis = FIX2UINT(axis_obj);
+
+  rtree_postscript_t opt =
+    {
+     .style = style,
+     .axis = axis,
+     .extent = extent,
+     .margin = margin,
+     .title = "librtree-ruby output"
+    };
+
+  int err;
+  if ((err = rtree_postscript(rtree, &opt, fp)) != 0)
+    rb_raise(rb_eRuntimeError, "librtree: %s", rtree_strerror(err));
+
+  return Qnil;
+}
+
+static rb_data_type_t rtree_type = {
+  .wrap_struct_name = "rtree-wrap",
+  .function = {
+    .dmark = NULL,
+    .dfree = rt_dfree,
+    .dsize = rt_dsize,
+#if RUBY_API_VERSION_CODE < 20700
+    .reserved = { NULL, NULL }
+#else
+    .dcompact = NULL,
+    .reserved = { NULL }
+#endif
+  },
+  .parent = NULL,
+  .data = NULL,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+/* RTree::Style */
+
+static void st_dfree(void *p)
+{
+  postscript_style_destroy((style_t*)p);
+}
+
+static VALUE st_release(VALUE self)
+{
+  style_t *style;
+  TypedData_Get_Struct(self, style_t, &style_type, style);
+  postscript_style_destroy(style);
+  return self;
+}
+
+static VALUE st_json_read(VALUE cls, VALUE io_obj)
+{
+  Check_Type(io_obj, T_FILE);
+
+  rb_io_t *io;
+  GetOpenFile(io_obj, io);
+  rb_io_check_initialized(io);
+  rb_io_check_readable(io);
+  FILE *fp = rb_io_stdio_file(io);
+
+  style_t *style;
+  errno = 0;
+
+  if ((style = postscript_style_read(fp)) == NULL)
+    {
+      if (errno)
+        rb_sys_fail(__func__);
+      else
+        rb_raise(rb_eRuntimeError, "Failed read from stream");
+    }
+
+  return TypedData_Wrap_Struct(cls, &style_type, style);
 }
 
+static rb_data_type_t style_type = {
+  .wrap_struct_name = "style-wrap",
+  .function = {
+    .dmark = NULL,
+    .dfree = st_dfree,
+    .dsize = NULL,
+#if RUBY_API_VERSION_CODE < 20700
+    .reserved = { NULL, NULL }
+#else
+    .dcompact = NULL,
+    .reserved = { NULL }
+#endif
+  },
+  .parent = NULL,
+  .data = NULL,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
 
 void Init_rtree(void)
 {
-  VALUE cls = rb_const_get(rb_cObject, rb_intern("RTreeC"));
-
-  rb_define_alloc_func(cls, lrt_alloc);
-  rb_define_method(cls, "initialize", lrt_init, 2);
-  rb_define_method(cls, "free", lrt_release, 0);
-  rb_define_method(cls, "clone", lrt_clone, 0);
-  rb_define_method(cls, "update!", lrt_update, 0);
-  rb_define_method(cls, "height", lrt_height, 0);
-  rb_define_method(cls, "add_rect", lrt_add_rect, 2);
-  rb_define_method(cls, "search", lrt_search, 1);
-  rb_define_method(cls, "json_write", lrt_json_write, 1);
-  rb_define_method(cls, "bsrt_write", lrt_bsrt_write, 1);
-  rb_define_method(cls, "eq?", lrt_identical, 1);
-  rb_define_method(cls, "dim", lrt_dim, 0);
-  rb_define_method(cls, "page_size", lrt_page_size, 0);
-  rb_define_method(cls, "node_size", lrt_node_size, 0);
-  rb_define_method(cls, "rect_size", lrt_rect_size, 0);
-  rb_define_method(cls, "branch_size", lrt_branch_size, 0);
-  rb_define_method(cls, "branching_factor", lrt_branching_factor, 0);
-  rb_define_method(cls, "unit_sphere_volume", lrt_unit_sphere_volume, 0);
-  rb_define_singleton_method(cls, "json_read", lrt_json_read, 1);
-  rb_define_singleton_method(cls, "bsrt_read", lrt_bsrt_read, 1);
-  rb_define_singleton_method(cls, "csv_read", lrt_csv_read, 3);
+  VALUE cRTree = rb_const_get(rb_cObject, rb_intern("RTreeC"));
+
+  rb_define_alloc_func(cRTree, rt_alloc);
+  rb_define_method(cRTree, "initialize", rt_init, 2);
+  rb_define_method(cRTree, "free", rt_release, 0);
+  rb_define_method(cRTree, "clone", rt_clone, 0);
+  rb_define_method(cRTree, "update!", rt_update, 0);
+  rb_define_method(cRTree, "height", rt_height, 0);
+  rb_define_method(cRTree, "add_rect", rt_add_rect, 2);
+  rb_define_method(cRTree, "search", rt_search, 1);
+  rb_define_method(cRTree, "json_write", rt_json_write, 1);
+  rb_define_method(cRTree, "bsrt_write", rt_bsrt_write, 1);
+  rb_define_method(cRTree, "eq?", rt_identical, 1);
+  rb_define_method(cRTree, "dim", rt_dim, 0);
+  rb_define_method(cRTree, "size", rt_size, 0);
+  rb_define_method(cRTree, "page_size", rt_page_size, 0);
+  rb_define_method(cRTree, "node_size", rt_node_size, 0);
+  rb_define_method(cRTree, "rect_size", rt_rect_size, 0);
+  rb_define_method(cRTree, "branch_size", rt_branch_size, 0);
+  rb_define_method(cRTree, "branching_factor", rt_branching_factor, 0);
+  rb_define_method(cRTree, "unit_sphere_volume", rt_unit_sphere_volume, 0);
+  rb_define_method(cRTree, "postscript", rt_postscript, 5);
+  rb_define_singleton_method(cRTree, "version", rt_version, 0);
+  rb_define_singleton_method(cRTree, "bugreport", rt_bugreport, 0);
+  rb_define_singleton_method(cRTree, "url", rt_url, 0);
+  rb_define_singleton_method(cRTree, "json_read", rt_json_read, 1);
+  rb_define_singleton_method(cRTree, "bsrt_read", rt_bsrt_read, 1);
+  rb_define_singleton_method(cRTree, "csv_read", rt_csv_read, 3);
+  rb_define_const(cRTree, "SPLIT_QUADRATIC", INT2NUM(RTREE_SPLIT_QUADRATIC));
+  rb_define_const(cRTree, "SPLIT_LINEAR", INT2NUM(RTREE_SPLIT_LINEAR));
+  rb_define_const(cRTree, "SPLIT_GREENE", INT2NUM(RTREE_SPLIT_GREENE));
+  rb_define_const(cRTree, "AXIS_HEIGHT", INT2NUM(axis_height));
+  rb_define_const(cRTree, "AXIS_WIDTH", INT2NUM(axis_width));
+
+  VALUE cStyle = rb_define_class_under(cRTree, "StyleC", rb_cObject);
+
+  rb_define_method(cStyle, "free", st_release, 0);
+  rb_define_singleton_method(cStyle, "json_read", st_json_read, 1);
 }

data/lib/rtree.rb

@@ -1,5 +1,12 @@
-# The Ruby/C interface, which is not documented in YARD.
-class RTreeC ; end
+# The Ruby/C interface to RTree, not documented in YARD.
+#
+class RTreeC
+  # The Ruby/C interface to RTree::Style, not documented in YARD.
+  #
+  class StyleC ; end
+end
+
+require 'json'
 
 # @author RTree J. J. Green
 #
@@ -61,6 +68,7 @@ class RTree < RTreeC
     # @see #json_write
     # @example Read from file
     #   rtree = File.open('rtree.json', 'r') { |io| RTree.json_read(io) }
+    #
     def json_read(io)
       super
     end
@@ -69,6 +77,7 @@ class RTree < RTreeC
     # @param json [String] a JSON string
     # @return [RTree] the newly instantiated RTree
     # @see #to_json
+    #
     def from_json(json)
       deserialise(json, Encoding::UTF_8) { |io| json_read(io) }
     end
@@ -80,6 +89,7 @@ class RTree < RTreeC
     # @see #bsrt_write
     # @example Read from file
     #   rtree = File.open('rtree.bsrt', 'r') { |io| RTree.bsrt_read(io) }
+    #
     def bsrt_read(io)
       super
     end
@@ -89,6 +99,7 @@ class RTree < RTreeC
     # @param bsrt [String] a binary encoded string
     # @return [RTree] the newly instantiated RTree
     # @see #to_bsrt
+    #
     def from_bsrt(bsrt)
       deserialise(bsrt, Encoding::BINARY) { |io| bsrt_read(io) }
     end
@@ -96,7 +107,7 @@ class RTree < RTreeC
     # Build a new RTree instance from CSV stream
     # @param io [IO] a readable stream object
     # @param dim [Integer] the dimension of the tree
-    # @param split [:linear, :quadratic] See {#initialize}
+    # @param split [:linear, :quadratic, :greene] See {#initialize}
     # @param node_page [Integer] See {#initialize}
     # @return [RTree] the newly built RTree
     # @note The CSV file (without header) should have the id in the
@@ -104,6 +115,7 @@ class RTree < RTreeC
     #   Extra columns may be present and will be ignored (this
     #   useful feature is the reason that the dimension is a required
     #   argument).
+    #
     def csv_read(io, dim, split: :quadratic, node_page: 0)
       flags = split_flag(split) | node_page_flag(node_page)
       super(io, dim, flags)
@@ -114,25 +126,48 @@ class RTree < RTreeC
     # @param dim [Integer] the dimension of the tree
     # @param kwarg [Hash] As for {.csv_read}
     # @return [RTree] the newly built RTree
+    #
     def from_csv(csv, dim, **kwarg)
       deserialise(csv, Encoding::UTF_8) do |io|
         csv_read(io, dim, **kwarg)
       end
     end
 
+    # @return [Array<Integer>] version of librtree
+    #
+    def version
+      @version ||= super.split('.').map(&:to_i)
+    end
+
+    # @return [String] email address for librtree bug reports
+    #
+    def bugreport
+      super
+    end
+
+    # @return [String] librtree homepage
+    #
+    def url
+      super
+    end
+
     # @!visibility private
+    #
     def split_flag(split)
       case split
       when :quadratic
-        0
+        self::SPLIT_QUADRATIC
       when :linear
-        1
+        self::SPLIT_LINEAR
+      when :greene
+        self::SPLIT_GREENE
       else
         raise ArgumentError, "bad split value: #{split}"
       end
     end
 
     # @!visibility private
+    #
     def node_page_flag(node_page)
       node_page << 2
     end
@@ -165,9 +200,10 @@ class RTree < RTreeC
 
   # Initialize a new (empty) RTree
   # @param dim [Integer] the dimension of the tree
-  # @param split [:linear, :quadratic] determines the splitting strategy,
-  #   the linear strategy is faster to build, the quadratic produces a
-  #   better-quality R-tree which is faster to query.
+  # @param split [:linear, :quadratic, :greene] determines the splitting
+  #   strategy, the linear strategy is faster to build, the quadratic
+  #   and greene strategies produce better-quality R-trees which are
+  #   faster to query.
   # @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
@@ -177,6 +213,7 @@ class RTree < RTreeC
   #   You may get better performance for your use-case by manual
   #   experimentation, but zero is a good place to start.
   # @return [RTree] the newly instantiated RTree
+  #
   def initialize(dim, split: :quadratic, node_page: 0)
     @split = split
     @node_page = node_page
@@ -185,6 +222,7 @@ class RTree < RTreeC
 
   # Create a deep copy
   # @return [RTree] a deep copy of the RTree
+  #
   def clone
     super
   end
@@ -201,6 +239,7 @@ class RTree < RTreeC
   # @example Add a rectangle to a dimension two RTree
   #   rtree = RTree.new(2)
   #   rtree.add_rect(7, [0, 0, 1, 1])
+  #
   def add_rect(id, coords)
     super
   end
@@ -210,6 +249,7 @@ class RTree < RTreeC
   # @return [Array<Integer>] the ids of all rectangles which intersect
   #   the search rectangle. If a block is given then these values will
   #   be yielded to the block (one at a time).
+  #
   def search(coords)
     if block_given? then
       super
@@ -235,18 +275,21 @@ class RTree < RTreeC
   #   block and then convert the returned Ruby Floats to C; so we would
   #   expect that it loses much of its competitive advantage when
   #   compared to an R-tree rebuild.
+  #
   def update!
     super
   end
 
   # The height to the tree in the usual mathematical sense
   # @return [Integer] the tree height
+  #
   def height
     super
   end
 
   # Whether the RTree has any rectangles or not
   # @return [Boolean] true if the RTree is empty
+  #
   def empty?
     height == 0
   end
@@ -257,6 +300,7 @@ class RTree < RTreeC
   # @see .json_read
   # @example Write to file
   #   File.open('rtree.json', 'w') { |io| rtree.json_write(io) }
+  #
   def json_write(io)
     super
   end
@@ -267,6 +311,7 @@ class RTree < RTreeC
   # @see .bsrt_read
   # @example Write to file
   #   File.open('rtree.bsrt', 'w') { |io| rtree.bsrt_write(io) }
+  #
   def bsrt_write(io)
     super
   end
@@ -274,6 +319,7 @@ class RTree < RTreeC
   # Serialise to JSON string
   # @return [String] the UTF-8 encoded JSON
   # @see .from_json
+  #
   def to_json
     serialise(Encoding::UTF_8) { |io| json_write(io) }
   end
@@ -281,12 +327,14 @@ class RTree < RTreeC
   # Serialise to BSRT string
   # @return [String] the binary encoded BSRT
   # @see .from_bsrt
+  #
   def to_bsrt
     serialise(Encoding::BINARY) { |io| bsrt_write(io) }
   end
 
   # The RTree structure in hash form
   # @return [Hash]
+  #
   def to_h
     JSON.parse(to_json, symbolize_names: true)
   end
@@ -296,6 +344,7 @@ class RTree < RTreeC
   # must be in the same order. Certainly {#clone} will produce
   # an instance which is equal in this sense.
   # @return [Boolean] true if the instances are identical
+  #
   def eq?(other)
     super
   end
@@ -303,41 +352,85 @@ class RTree < RTreeC
   alias_method(:==, :eq?)
 
   # @return [Integer] the dimension of the R-tree
+  #
   def dim
     super
   end
 
+  # @return [Integer] the total bytes allocated for the instance
+  # @note This method traverses the entire tree summing the
+  #   contributions for each node (rather than maintaining a
+  #   running count).  Performance-minded users may wish to
+  #   cache this value (invalidating the cache when calling
+  #   {#add_rect} of course).
+  #
+  def size
+    super
+  end
+
   # @return [Integer] the bytes in a page of memory
+  #
   def page_size
     super
   end
 
   # @return [Integer] the size in bytes of a node
+  #
   def node_size
     super
   end
 
   # @return [Integer] the size in bytes of a rectangle
+  #
   def rect_size
     super
   end
 
   # @return [Integer] the size in bytes of a branch
+  #
   def branch_size
     super
   end
 
   # @return [Integer] the number of branches from each node
+  #
   def branching_factor
     super
   end
 
   # @return [Float] the volume of the unit sphere in the R-tree's
   #   dimension
+  #
   def unit_sphere_volume
     super
   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.
+  # @param height [Float] the height of the plot in units of PostScript
+  #   point (1/72 inch)
+  # @param width [Float] the width of the plot in units of PostScript
+  #   point (1/72 inch), if neither height nor width is given then a
+  #   width of 216 (3 inches) will be taken as default
+  # @param margin [Float] extra space around the plot in units of
+  #   PostScript point (1/72 inch), default zero
+  #
+  def postscript(io, style, height: nil, width: nil, margin: 0)
+    if height && width then
+      raise ArgumentError, 'cannot specify both height and width'
+    end
+    if height then
+      axis = AXIS_HEIGHT
+      extent = height
+    else
+      axis = AXIS_WIDTH
+      extent = width || 216
+    end
+    super(style, axis, extent, margin, io)
+  end
+
   private
 
   attr_reader :split, :node_page
@@ -369,8 +462,89 @@ class RTree < RTreeC
     end
     result
   end
+end
+
+
+class RTree < RTreeC
+  class Style < RTreeC::StyleC
+  end
+end
+
+# @author RTree::Style J. J. Green
+#
+# A Ruby wrapper around RTree styles, used in PostScript plotting.
+# in particular by {RTree#postscript}.
+#
+class RTree::Style
+
+  class << self
 
+    # Create a new Style instance from JSON stream
+    # @param io [IO] a readable stream object
+    # @return [RTree::Style] the newly instantiated Style
+    # @example Read from file
+    #   style = File.open('some.style', 'r') do |io|
+    #     RTree::Style.json_read(io)
+    #   end
+    #
+    def json_read(io)
+      super
+    end
 
+    # Create a new Style instance from JSON string
+    # @param json [String] a JSON string
+    # @return [RTree::Style] the newly instantiated Style
+    # @see .json_read
+    #
+    def from_json(json)
+      raise TypeError unless json.is_a? String
+      rd, wr = IO.pipe(Encoding::UTF_8)
+      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
+    end
+
+    # Create a new Style instance from array of Hash
+    # @param array [Array] an array of hash, this will be converted
+    #   to JSON and read by .from_json
+    # @return [RTree::Style] the newly instantiated Style
+    # @see .from_json
+    # @example Create a simple one-level style:
+    #   style = RTree::Style.from_a(
+    #     [
+    #       {
+    #         fill: {
+    #           rgb: [0.5, 0.5, 0.5]
+    #         },
+    #         stroke: {
+    #           rgb: [0, 0, 1],
+    #           width: 3
+    #         }
+    #       }
+    #     ]
+    #   )
+    #
+    def from_a(array)
+      from_json(array.to_json)
+    end
+
+    alias_method :from_array, :from_a
+  end
 end
 
 require 'rtree/rtree'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librtree
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.7
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-22 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,8 +95,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 description: |
-  A Ruby extension for librtree implementing the R-tree
-  spatial-index of Guttman-Green.
+  A Ruby extension implementing the R-tree spatial-index of
+  Guttman-Green.
 email: j.j.green@gmx.co.uk
 executables: []
 extensions:
@@ -119,14 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- The librtree library
+- The librtree library (1.0.6 or later)
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4