librtree 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a175d9b929078c0a8d94c7adbb7af7eb728acda5a401a99f95504fa30f129470
-  data.tar.gz: c5042bd9893f64c112d3940d549fa9dde8503121ced5507ddf2392840950aac0
+  metadata.gz: 636adac7b1df4b79407c5d7402aa101d4362379dc7c325e7283c81eb2faeb94e
+  data.tar.gz: ee8da51ba25d5e5648ee9b511a0507beb0b1bb5325b1c5dcfbb499e01cf9fb77
 SHA512:
-  metadata.gz: c106ef413a5d28068882ce4c9a24d9d1cb7124b925722915482d59809fdb71b556326e6bca3ebc1fcb9191edb9d799a6233054ae417e9f3c8d3ae5f871057c08
-  data.tar.gz: b14066ff0a21bfea29efb91fd52018906358b2ef6eb9ba9337869af62a4be4f2e17b6686f7788fda038b96015630b0b005d0c0a9133899b96e163ac630e49c7d
+  metadata.gz: c6a7c7d731a9d09caf84e9e9c1b7133cdbadad297efe09af3875f5f97352740c7c9786c6ceb3c74665110b2b248b2c59ab712b9e3bb3b8e195e946745648f840
+  data.tar.gz: 2be108c80ff14fc3d2d5ba0ebead91a07e0a537d8a7a4ded460fdec4645ff41eb3412a765d02edc3d7fff87dc04b9dc7c2d0af4516b70e14464e51c556f379f9

data/ext/rtree/rtree.c

@@ -1,26 +1,48 @@
 #include <ruby.h>
 #include <ruby/io.h>
+#include <ruby/version.h>
 
 #include <rtree.h>
+#include <rtree/package.h>
 
 #include <errno.h>
 #include <stdint.h>
 
-static void lrt_free(void *p)
+
+static void lrt_dfree(void *p)
 {
-  rtree_t *rtree = p;
-  rtree_destroy(rtree);
+  rtree_destroy((rtree_t*)p);
+}
+
+static size_t lrt_dsize(const void *p)
+{
+  return rtree_bytes((const rtree_t*)p);
 }
 
+static rb_data_type_t type = {
+  .wrap_struct_name = "rtree-wrap",
+  .function = {
+    .dmark = NULL,
+    .dfree = lrt_dfree,
+    .dsize = lrt_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
+};
+
 static VALUE lrt_alloc(VALUE cls)
 {
   rtree_t *rtree;;
-
   if ((rtree = rtree_alloc()) == NULL)
     rb_raise(rb_eNoMemError, "failed to alloc rtree");
-
-  VALUE obj = Data_Wrap_Struct(cls, NULL, lrt_free, rtree);
-  return obj;
+  return TypedData_Wrap_Struct(cls, &type, rtree);
 }
 
 static VALUE lrt_init(VALUE self, VALUE dim_obj, VALUE flags_obj)
@@ -32,7 +54,7 @@ static VALUE lrt_init(VALUE self, VALUE dim_obj, VALUE flags_obj)
   state_flags_t flags = FIX2UINT(flags_obj);
 
   rtree_t *rtree;
-  Data_Get_Struct(self, rtree_t, rtree);
+  TypedData_Get_Struct(self, rtree_t, &type, rtree);
 
   if ((rtree_init(rtree, dim, flags)) != 0)
     rb_raise(rb_eNoMemError, "failed to init rtree");
@@ -43,7 +65,7 @@ static VALUE lrt_init(VALUE self, VALUE dim_obj, VALUE flags_obj)
 static VALUE lrt_release(VALUE self)
 {
   rtree_t *rtree;
-  Data_Get_Struct(self, rtree_t, rtree);
+  TypedData_Get_Struct(self, rtree_t, &type, rtree);
   rtree_destroy(rtree);
   return self;
 }
@@ -51,7 +73,7 @@ static VALUE lrt_release(VALUE self)
 static VALUE lrt_height(VALUE self)
 {
   rtree_t *rtree;
-  Data_Get_Struct(self, rtree_t, rtree);
+  TypedData_Get_Struct(self, rtree_t, &type, rtree);
   return INT2NUM(rtree_height(rtree));
 }
 
@@ -61,7 +83,7 @@ static VALUE lrt_add_rect(VALUE self, VALUE id_obj, VALUE coord_obj)
   Check_Type(id_obj, T_FIXNUM);
 
   rtree_t *rtree;
-  Data_Get_Struct(self, rtree_t, rtree);
+  TypedData_Get_Struct(self, rtree_t, &type, rtree);
 
   rtree_id_t
     id = FIX2ULONG(id_obj);
@@ -119,7 +141,7 @@ static VALUE lrt_update(VALUE self)
     rb_raise(rb_eArgError, "Expected block");
 
   rtree_t *rtree;
-  Data_Get_Struct(self, rtree_t, rtree);
+  TypedData_Get_Struct(self, rtree_t, &type, rtree);
 
   size_t len = 2 * state_dims(rtree->state);
   int err = rtree_update(rtree, update_cb, &len);
@@ -155,7 +177,7 @@ static VALUE lrt_search(VALUE self, VALUE coord_obj)
   Check_Type(coord_obj, T_ARRAY);
 
   rtree_t *rtree;
-  Data_Get_Struct(self, rtree_t, rtree);
+  TypedData_Get_Struct(self, rtree_t, &type, rtree);
 
   size_t
     len = RARRAY_LEN(coord_obj),
@@ -198,9 +220,7 @@ static VALUE deserialise(VALUE cls, VALUE io_obj, deserialise_t *f)
         rb_raise(rb_eRuntimeError, "Failed read from stream");
     }
 
-  VALUE obj = Data_Wrap_Struct(cls, NULL, lrt_free, rtree);
-
-  return obj;
+  return TypedData_Wrap_Struct(cls, &type, rtree);
 }
 
 static VALUE lrt_json_read(VALUE cls, VALUE io_obj)
@@ -239,9 +259,7 @@ static VALUE lrt_csv_read(VALUE cls,
         rb_raise(rb_eRuntimeError, "Failed read from stream");
     }
 
-  VALUE obj = Data_Wrap_Struct(cls, NULL, lrt_free, rtree);
-
-  return obj;
+  return TypedData_Wrap_Struct(cls, &type, rtree);
 }
 
 /* serialisation */
@@ -259,7 +277,7 @@ static VALUE serialise(VALUE self, VALUE io_obj, serialise_t *f)
   FILE *fp = rb_io_stdio_file(io);
 
   rtree_t *rtree;
-  Data_Get_Struct(self, rtree_t, rtree);
+  TypedData_Get_Struct(self, rtree_t, &type, rtree);
 
   int err = f(rtree, fp);
   if (err != 0)
@@ -282,8 +300,8 @@ static VALUE lrt_identical(VALUE self, VALUE other)
 {
   rtree_t *rtree_self, *rtree_other;
 
-  Data_Get_Struct(self, rtree_t, rtree_self);
-  Data_Get_Struct(other, rtree_t, rtree_other);
+  TypedData_Get_Struct(self, rtree_t, &type, rtree_self);
+  TypedData_Get_Struct(other, rtree_t, &type, rtree_other);
 
   if (rtree_identical(rtree_self, rtree_other))
     return Qtrue;
@@ -294,7 +312,7 @@ static VALUE lrt_identical(VALUE self, VALUE other)
 static VALUE lrt_clone(VALUE self)
 {
   rtree_t *rtree;
-  Data_Get_Struct(self, rtree_t, rtree);
+  TypedData_Get_Struct(self, rtree_t, &type, rtree);
 
   rtree_t *clone;
   errno = 0;
@@ -306,16 +324,13 @@ static VALUE lrt_clone(VALUE self)
         rb_raise(rb_eRuntimeError, "Failed clone");
     }
 
-  VALUE cls = CLASS_OF(self);
-  VALUE obj = Data_Wrap_Struct(cls, NULL, lrt_free, clone);
-
-  return obj;
+  return TypedData_Wrap_Struct(CLASS_OF(self), &type, clone);
 }
 
 static VALUE state_size_access(VALUE self, size_t (*f)(const state_t*))
 {
   rtree_t *rtree;
-  Data_Get_Struct(self, rtree_t, rtree);
+  TypedData_Get_Struct(self, rtree_t, &type, rtree);
   return INT2NUM(f(rtree->state));
 }
 
@@ -352,10 +367,32 @@ static VALUE lrt_branching_factor(VALUE self)
 static VALUE lrt_unit_sphere_volume(VALUE self)
 {
   rtree_t *rtree;
-  Data_Get_Struct(self, rtree_t, rtree);
+  TypedData_Get_Struct(self, rtree_t, &type, rtree);
   return DBL2NUM(state_unit_sphere_volume(rtree->state));
 }
 
+static VALUE lrt_size(VALUE self)
+{
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &type, rtree);
+  return INT2NUM(rtree_bytes(rtree));
+}
+
+static VALUE lrt_version(VALUE self)
+{
+  return rb_str_new_cstr(rtree_package_version);
+}
+
+static VALUE lrt_bugreport(VALUE self)
+{
+  return rb_str_new_cstr(rtree_package_bugreport);
+}
+
+static VALUE lrt_url(VALUE self)
+{
+  return rb_str_new_cstr(rtree_package_url);
+}
+
 void Init_rtree(void)
 {
   VALUE cls = rb_const_get(rb_cObject, rb_intern("RTreeC"));
@@ -372,12 +409,16 @@ void Init_rtree(void)
   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, "size", lrt_size, 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, "version", lrt_version, 0);
+  rb_define_singleton_method(cls, "bugreport", lrt_bugreport, 0);
+  rb_define_singleton_method(cls, "url", lrt_url, 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);

data/lib/rtree.rb

@@ -120,6 +120,21 @@ class RTree < RTreeC
       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
@@ -307,6 +322,16 @@ class RTree < RTreeC
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librtree
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- The librtree library (1.0.2 or later)
+- The librtree library (1.0.3 or later)
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4