librtree 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33e172341a9e44682c139df3a6b92198b3dd83059340da9fb8752444afbac70
-  data.tar.gz: 7ba6d8c71b6afeb8e5dedde55ff08074db758fa7ea150a67195ff07ca426a312
+  metadata.gz: fc74390aa8eb79643f88f2c48f7408ef9dd17dd12ed1049e3bfe2961b7523e4b
+  data.tar.gz: 25488f67912344fcd69cb2c19ca6b4344cf708bfc07d9f8e1629b5893030a759
 SHA512:
-  metadata.gz: d4440a12038bd07dcb458ff993269fd72ac3826753f6e2757b86f19913a1cc748d7af1f37a7355e015d5a6dd3a750b8335a6f87d2a1dbdc5e4ef5387f9424f6a
-  data.tar.gz: ce193b26ab45e5ca2cab29c0c145a9432440355585e5cc5e226bbe0e762b3d4c33bcd693626ccd3f60eaad11513c94d3e8246e86cf8b703a7d89f19b22090d1b
+  metadata.gz: 4bc5ae0e333e077a8331164e87f3d4c60470bfadc046c86424b8147d59ecfdb32b212d7ae7ec0d3e834d62b0c564929723a56af988a5b5a05364ba9e841407ff
+  data.tar.gz: 2b5d8c0799fabb2085686f4c3eb23feb367201d6630d4ac7e0621cc76ba5dbc6422b0e4d5649aee33fc375cff3411308ef81d61567f1af6049f50b677aa198de

data/ext/rtree/rtree.c

@@ -498,42 +498,42 @@ static rb_data_type_t style_type = {
 
 void Init_rtree(void)
 {
-  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);
+  VALUE cRTreeBase = rb_const_get(rb_cObject, rb_intern("RTreeBase"));
+
+  rb_define_alloc_func(cRTreeBase, rt_alloc);
+  rb_define_method(cRTreeBase, "initialize", rt_init, 2);
+  rb_define_method(cRTreeBase, "free", rt_release, 0);
+  rb_define_method(cRTreeBase, "clone", rt_clone, 0);
+  rb_define_method(cRTreeBase, "update!", rt_update, 0);
+  rb_define_method(cRTreeBase, "height", rt_height, 0);
+  rb_define_method(cRTreeBase, "add_rect", rt_add_rect, 2);
+  rb_define_method(cRTreeBase, "search", rt_search, 1);
+  rb_define_method(cRTreeBase, "json_write", rt_json_write, 1);
+  rb_define_method(cRTreeBase, "bsrt_write", rt_bsrt_write, 1);
+  rb_define_method(cRTreeBase, "eq?", rt_identical, 1);
+  rb_define_method(cRTreeBase, "dim", rt_dim, 0);
+  rb_define_method(cRTreeBase, "size", rt_size, 0);
+  rb_define_method(cRTreeBase, "page_size", rt_page_size, 0);
+  rb_define_method(cRTreeBase, "node_size", rt_node_size, 0);
+  rb_define_method(cRTreeBase, "rect_size", rt_rect_size, 0);
+  rb_define_method(cRTreeBase, "branch_size", rt_branch_size, 0);
+  rb_define_method(cRTreeBase, "branching_factor", rt_branching_factor, 0);
+  rb_define_method(cRTreeBase, "unit_sphere_volume", rt_unit_sphere_volume, 0);
+  rb_define_method(cRTreeBase, "postscript", rt_postscript, 5);
+  rb_define_singleton_method(cRTreeBase, "version", rt_version, 0);
+  rb_define_singleton_method(cRTreeBase, "bugreport", rt_bugreport, 0);
+  rb_define_singleton_method(cRTreeBase, "url", rt_url, 0);
+  rb_define_singleton_method(cRTreeBase, "json_read", rt_json_read, 1);
+  rb_define_singleton_method(cRTreeBase, "bsrt_read", rt_bsrt_read, 1);
+  rb_define_singleton_method(cRTreeBase, "csv_read", rt_csv_read, 3);
+  rb_define_const(cRTreeBase, "SPLIT_QUADRATIC", INT2NUM(RTREE_SPLIT_QUADRATIC));
+  rb_define_const(cRTreeBase, "SPLIT_LINEAR", INT2NUM(RTREE_SPLIT_LINEAR));
+  rb_define_const(cRTreeBase, "SPLIT_GREENE", INT2NUM(RTREE_SPLIT_GREENE));
+  rb_define_const(cRTreeBase, "AXIS_HEIGHT", INT2NUM(axis_height));
+  rb_define_const(cRTreeBase, "AXIS_WIDTH", INT2NUM(axis_width));
+
+  VALUE cRTreeStyleBase = rb_const_get(rb_cObject, rb_intern("RTreeStyleBase"));
+
+  rb_define_method(cRTreeStyleBase, "free", st_release, 0);
+  rb_define_singleton_method(cRTreeStyleBase, "json_read", st_json_read, 1);
 }

data/lib/rtree.rb

@@ -1,11 +1,12 @@
-# The Ruby/C interface to RTree, not documented in YARD.
+# The internal Ruby/C interface for RTree, not documented in YARD.
 #
-class RTreeC
-  # The Ruby/C interface to RTree::Style, not documented in YARD.
-  #
-  class StyleC ; end
-end
+class RTreeBase ; end
+
+# The internal Ruby/C interface for RTree::Style, not documented in YARD.
+#
+class RTreeStyleBase ; end
 
+require 'rtree/rtree'
 require 'json'
 
 # @author RTree J. J. Green
@@ -58,7 +59,7 @@ require 'json'
 # determined at compile-time (with the RTREE_ID_TYPE variable) and by
 # default this is a 64-bit unsigned integer.
 #
-class RTree < RTreeC
+class RTree < RTreeBase
 
   class << self
 
@@ -152,6 +153,12 @@ class RTree < RTreeC
     end
 
     # @!visibility private
+    # This seems to need the self qualification on the constants,
+    # without them we get a NameError, not sure why so asked on SO
+    # https://stackoverflow.com/questions/68122256/ It's still not
+    # clear to me why this qualification is needed, but that's a
+    # problem with my understanding of the Ruby Eigenclass, it is
+    # the expected behaviour
     #
     def split_flag(split)
       case split
@@ -464,18 +471,12 @@ class RTree < RTreeC
   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 RTree::Style < RTreeStyleBase
 
   class << self
 
@@ -546,5 +547,3 @@ class RTree::Style
     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.7
+  version: 0.8.8
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler