librtree 1.0.2 → 1.0.4

data/ext/rtree/lib/rtree/state.h

@@ -15,29 +15,10 @@
 extern "C" {
 #endif
 
-#include <stdlib.h>
 #include <stdint.h>
-#include <stdbool.h>
-
-#include <rtree/types.h>
-#include <rtree/rectf.h>
 
 typedef uint32_t state_flags_t;
 
-typedef struct
-{
-  size_t dims, factor;
-  rtree_coord_t volume;
-  struct {
-    size_t page, branch, node;
-  } size;
-  struct {
-    rectf_rsv_t *spherical_volume;
-    rectf_rc_t *combine;
-  } rectf;
-  state_flags_t flags;
-} state_t;
-
 #define RTREE_DEFAULT 0
 
 #define RTREE_SPLIT_QUADRATIC 0
@@ -46,66 +27,6 @@ typedef struct
 
 #define RTREE_NODE_PAGE(n) ((n) << 2)
 
-state_t* state_new(size_t, state_flags_t);
-state_t* state_clone(const state_t*);
-void state_destroy(state_t*);
-state_flags_t state_split(const state_t*);
-state_flags_t state_node_page(const state_t*);
-bool state_identical(const state_t*, const state_t*);
-
-inline rtree_coord_t state_rsv(const state_t *state, const rtree_coord_t *rect)
-{
-  return state->rectf.spherical_volume(state->dims, rect) * state->volume;
-}
-
-inline void state_rc(const state_t *state,
-                     const rtree_coord_t *rect0,
-                     const rtree_coord_t *rect1,
-                     rtree_coord_t *rect2)
-{
-  state->rectf.combine(state->dims, rect0, rect1, rect2);
-}
-
-inline size_t state_dims(const state_t *state)
-{
-  return state->dims;
-}
-
-inline size_t state_branch_size(const state_t *state)
-{
-  return state->size.branch;
-}
-
-inline size_t state_page_size(const state_t *state)
-{
-  return state->size.page;
-}
-
-inline size_t state_node_size(const state_t *state)
-{
-  return state->size.node;
-}
-
-inline size_t state_rect_size(const state_t *state)
-{
-  return state_dims(state) * 2 * sizeof(rtree_coord_t);
-}
-
-inline size_t state_branching_factor(const state_t *state)
-{
-  return state->factor;
-}
-
-inline double state_unit_sphere_volume(const state_t *state)
-{
-  return state->volume;
-}
-
-inline size_t state_bytes(const state_t *state)
-{
-  return (state ? sizeof(state_t) : 0);
-}
-
 #ifdef __cplusplus
 }
 #endif

data/ext/rtree/lib/rtree-base.c

@@ -2,13 +2,17 @@
 #include "config.h"
 #endif
 
+#include "private/bsrt.h"
+#include "private/csv.h"
+#include "private/json.h"
+#include "private/node.h"
+#include "private/postscript.h"
+#include "private/search.h"
+#include "private/state.h"
+
 #include "rtree.h"
 #include "rtree/error.h"
 
-#include "csv.h"
-#include "json.h"
-#include "bsrt.h"
-
 #include <errno.h>
 #include <stdlib.h>
 
@@ -189,6 +193,62 @@ size_t rtree_bytes(const rtree_t *rtree)
       node_bytes(rtree->state, rtree->root);
 }
 
+size_t rtree_dims(const rtree_t *rtree)
+{
+  if (rtree == NULL)
+    return 0;
+  else
+    return state_dims(rtree->state);
+}
+
+size_t rtree_page_size(const rtree_t *rtree)
+{
+  if (rtree == NULL)
+    return 0;
+  else
+    return state_page_size(rtree->state);
+}
+
+size_t rtree_node_size(const rtree_t *rtree)
+{
+  if (rtree == NULL)
+    return 0;
+  else
+    return state_node_size(rtree->state);
+}
+
+size_t rtree_rect_size(const rtree_t *rtree)
+{
+  if (rtree == NULL)
+    return 0;
+  else
+    return state_rect_size(rtree->state);
+}
+
+size_t rtree_branch_size(const rtree_t *rtree)
+{
+  if (rtree == NULL)
+    return 0;
+  else
+    return state_branch_size(rtree->state);
+}
+
+size_t rtree_branching_factor(const rtree_t *rtree)
+{
+  if (rtree == NULL)
+    return 0;
+  else
+    return state_branching_factor(rtree->state);
+}
+
+double rtree_unit_sphere_volume(const rtree_t *rtree)
+{
+  if (rtree == NULL)
+    return 0;
+  else
+    return state_unit_sphere_volume(rtree->state);
+}
+
 bool rtree_empty(const rtree_t *rtree)
 {
   return

data/ext/rtree/lib/rtree.h

@@ -1,10 +1,5 @@
 /*
   rtree.h
-
-  This is the bottom-level "public" header, it does not
-  include all of the rtree headers, just enough to define
-  the members of the (atypically) open structure rtree_t.
-
   Copyright (c) J.J. Green 2020
 */
 
@@ -29,12 +24,6 @@ typedef uint16_t rtree_height_t;
 #include <rtree/search.h>
 #include <rtree/error.h>
 
-struct rtree_t
-{
-  state_t *state;
-  node_t *root;
-};
-
 rtree_t* rtree_alloc(void);
 int rtree_init(rtree_t*, size_t, state_flags_t);
 rtree_t* rtree_new(size_t, state_flags_t);
@@ -53,6 +42,13 @@ rtree_t* rtree_bsrt_read(FILE*);
 int rtree_postscript(const rtree_t*, const rtree_postscript_t*, FILE*);
 const char* rtree_strerror(int);
 size_t rtree_bytes(const rtree_t*);
+size_t rtree_dims(const rtree_t*);
+size_t rtree_page_size(const rtree_t*);
+size_t rtree_node_size(const rtree_t*);
+size_t rtree_rect_size(const rtree_t*);
+size_t rtree_branch_size(const rtree_t*);
+size_t rtree_branching_factor(const rtree_t*);
+double rtree_unit_sphere_volume(const rtree_t*);
 bool rtree_empty(const rtree_t*);
 
 #ifdef __cplusplus

data/ext/rtree/lib/search.c

@@ -2,11 +2,12 @@
 #include "config.h"
 #endif
 
-#include "rtree/search.h"
+#include "private/search.h"
+#include "private/node.h"
+#include "private/branch.h"
+#include "private/rect.h"
 
-#include "rtree/branch.h"
 #include "rtree/error.h"
-#include "rtree/rect.h"
 
 typedef struct
 {

data/ext/rtree/lib/split.c

@@ -2,8 +2,17 @@
 #include "config.h"
 #endif
 
+#include "private/bindex.h"
+#include "private/branch.h"
+#include "private/branches.h"
+#include "private/node.h"
+#include "private/split.h"
+
+#include "rtree/error.h"
+
 #include <float.h>
 #include <errno.h>
+#include <stdlib.h>
 
 #ifdef HAVE_TGMATH_H
 #include <tgmath.h>
@@ -11,12 +20,6 @@
 #include <math.h>
 #endif
 
-#include "rtree/error.h"
-#include "rtree/branches.h"
-
-#include "split.h"
-#include "bindex.h"
-
 typedef struct
 {
   bindex_t *choice, *taken;

data/ext/rtree/lib/spvol.c

@@ -1,6 +1,6 @@
 /* Autogenerated by spvol.py, do not edit */
 
-#include "spvol.h"
+#include "private/spvol.h"
 
 int spvol(size_t dim, double *val)
 {

data/ext/rtree/lib/state.c

@@ -2,16 +2,16 @@
 #include "config.h"
 #endif
 
-#include "rtree/state.h"
-#include "rtree/branch.h"
-#include "rtree/node.h"
-
-#include "page.h"
-#include "constants.h"
-#include "spvol.h"
+#include "private/branch.h"
+#include "private/constants.h"
+#include "private/node.h"
+#include "private/page.h"
+#include "private/spvol.h"
+#include "private/state.h"
 
 #include <errno.h>
 #include <string.h>
+#include <stdlib.h>
 
 #ifdef HAVE_TGMATH_H
 #include <tgmath.h>

data/ext/rtree/rtree.c

@@ -84,7 +84,7 @@ static VALUE rt_add_rect(VALUE self, VALUE id_obj, VALUE coord_obj)
     id = FIX2ULONG(id_obj);
   size_t
     len = RARRAY_LEN(coord_obj),
-    dim = state_dims(rtree->state);
+    dim = rtree_dims(rtree);
 
   if (len != 2 * dim)
     rb_raise(rb_eArgError, "expected array length %zi, got %zi", 2 * dim, len);
@@ -138,7 +138,7 @@ static VALUE rt_update(VALUE self)
   rtree_t *rtree;
   TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
 
-  size_t len = 2 * state_dims(rtree->state);
+  size_t len = 2 * rtree_dims(rtree);
   int err = rtree_update(rtree, update_cb, &len);
 
   if (err != 0)
@@ -176,7 +176,7 @@ static VALUE rt_search(VALUE self, VALUE coord_obj)
 
   size_t
     len = RARRAY_LEN(coord_obj),
-    dim = state_dims(rtree->state);
+    dim = rtree_dims(rtree);
 
   if (len != 2 * dim)
     rb_raise(rb_eArgError, "expected array length %zi, got %zi", 2 * dim, len);
@@ -322,48 +322,48 @@ static VALUE rt_clone(VALUE self)
   return TypedData_Wrap_Struct(CLASS_OF(self), &rtree_type, clone);
 }
 
-static VALUE state_size_access(VALUE self, size_t (*f)(const state_t*))
+static VALUE state_size_access(VALUE self, size_t (*f)(const rtree_t*))
 {
   rtree_t *rtree;
   TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
-  return INT2NUM(f(rtree->state));
+  return INT2NUM(f(rtree));
 }
 
 static VALUE rt_dim(VALUE self)
 {
-  return state_size_access(self, state_dims);
+  return state_size_access(self, rtree_dims);
 }
 
 static VALUE rt_page_size(VALUE self)
 {
-  return state_size_access(self, state_page_size);
+  return state_size_access(self, rtree_page_size);
 }
 
 static VALUE rt_node_size(VALUE self)
 {
-  return state_size_access(self, state_node_size);
+  return state_size_access(self, rtree_node_size);
 }
 
 static VALUE rt_rect_size(VALUE self)
 {
-  return state_size_access(self, state_rect_size);
+  return state_size_access(self, rtree_rect_size);
 }
 
 static VALUE rt_branch_size(VALUE self)
 {
-  return state_size_access(self, state_branch_size);
+  return state_size_access(self, rtree_branch_size);
 }
 
 static VALUE rt_branching_factor(VALUE self)
 {
-  return state_size_access(self, state_branching_factor);
+  return state_size_access(self, rtree_branching_factor);
 }
 
 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));
+  return DBL2NUM(rtree_unit_sphere_volume(rtree));
 }
 
 static VALUE rt_size(VALUE self)
@@ -398,8 +398,8 @@ static VALUE rt_postscript(VALUE self,
   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);
+  postscript_style_t *style;
+  TypedData_Get_Struct(style_obj, postscript_style_t, &style_type, style);
 
   Check_Type(io_obj, T_FILE);
   rb_io_t *io;
@@ -453,13 +453,13 @@ static rb_data_type_t rtree_type = {
 
 static void st_dfree(void *p)
 {
-  postscript_style_destroy((style_t*)p);
+  postscript_style_destroy((postscript_style_t*)p);
 }
 
 static VALUE st_release(VALUE self)
 {
-  style_t *style;
-  TypedData_Get_Struct(self, style_t, &style_type, style);
+  postscript_style_t *style;
+  TypedData_Get_Struct(self, postscript_style_t, &style_type, style);
   postscript_style_destroy(style);
   return self;
 }
@@ -474,7 +474,7 @@ static VALUE st_json_read(VALUE cls, VALUE io_obj)
   rb_io_check_readable(io);
   FILE *fp = rb_io_stdio_file(io);
 
-  style_t *style;
+  postscript_style_t *style;
   errno = 0;
 
   if ((style = postscript_style_read(fp)) == NULL)

data/lib/rtree.rb

@@ -71,10 +71,6 @@ class RTree < RTreeBase
 
     # @!visibility private
     #
-    # The call to exit! here has a true argument, indicationg success,
-    # but the value is ignored, so could be omitted; but the sigature
-    # for exit! is incorrect: https://github.com/ruby/rbs/issues/1298
-    #
     def deserialise(string, encoding)
       raise TypeError unless string.is_a? String
       rd, wr = IO.pipe(encoding)
@@ -93,7 +89,7 @@ class RTree < RTreeBase
           wr.write(string)
         ensure
           wr.close
-          exit! true
+          exit!
         end
       end
       result
@@ -101,8 +97,6 @@ class RTree < RTreeBase
 
     # @!visibility private
     #
-    # See note above on argument to exit!
-    #
     def serialise(encoding)
       rd, wr = IO.pipe(encoding)
       if fork then
@@ -120,7 +114,7 @@ class RTree < RTreeBase
           yield(wr)
         ensure
           wr.close
-          exit! true
+          exit!
         end
       end
       result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librtree
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rbs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: |
   A Ruby extension implementing the R-tree spatial-index of
   Guttman-Green.
@@ -137,48 +151,53 @@ files:
 - ext/rtree/extconf.rb
 - ext/rtree/lib/README.md
 - ext/rtree/lib/bindex.c
-- ext/rtree/lib/bindex.h
-- ext/rtree/lib/bounds.h
 - ext/rtree/lib/branch.c
 - ext/rtree/lib/branches.c
 - ext/rtree/lib/bsrt.c
-- ext/rtree/lib/bsrt.h
-- ext/rtree/lib/constants.h
 - ext/rtree/lib/csv.c
-- ext/rtree/lib/csv.h
-- ext/rtree/lib/endianness.h
 - ext/rtree/lib/error.c
 - ext/rtree/lib/json.c
-- ext/rtree/lib/json.h
 - ext/rtree/lib/mk/Hdr.mk
 - ext/rtree/lib/mk/MakeDepend
 - ext/rtree/lib/mk/Obj.mk
 - ext/rtree/lib/node.c
 - ext/rtree/lib/package.c
 - ext/rtree/lib/page.c
-- ext/rtree/lib/page.h
 - ext/rtree/lib/postscript.c
+- ext/rtree/lib/private/bindex.h
+- ext/rtree/lib/private/bounds.h
+- ext/rtree/lib/private/branch.h
+- ext/rtree/lib/private/branches.h
+- ext/rtree/lib/private/bsrt.h
+- ext/rtree/lib/private/constants.h
+- ext/rtree/lib/private/csv.h
+- ext/rtree/lib/private/endianness.h
+- ext/rtree/lib/private/json.h
+- ext/rtree/lib/private/node.h
+- ext/rtree/lib/private/page.h
+- ext/rtree/lib/private/postscript.h
+- ext/rtree/lib/private/rect.h
+- ext/rtree/lib/private/rectf.h
+- ext/rtree/lib/private/rtree.h
+- ext/rtree/lib/private/search.h
+- ext/rtree/lib/private/split.h
+- ext/rtree/lib/private/spvol.h
+- ext/rtree/lib/private/state.h
 - ext/rtree/lib/rect.c
 - ext/rtree/lib/rectf.c
 - ext/rtree/lib/rtree-base.c
 - ext/rtree/lib/rtree.h
-- ext/rtree/lib/rtree/branch.h
-- ext/rtree/lib/rtree/branches.h
 - ext/rtree/lib/rtree/error.h
 - ext/rtree/lib/rtree/extent.h
 - ext/rtree/lib/rtree/node.h
 - ext/rtree/lib/rtree/package.h
 - ext/rtree/lib/rtree/postscript.h
-- ext/rtree/lib/rtree/rect.h
-- ext/rtree/lib/rtree/rectf.h
 - ext/rtree/lib/rtree/search.h
 - ext/rtree/lib/rtree/state.h
 - ext/rtree/lib/rtree/types.h
 - ext/rtree/lib/search.c
 - ext/rtree/lib/split.c
-- ext/rtree/lib/split.h
 - ext/rtree/lib/spvol.c
-- ext/rtree/lib/spvol.h
 - ext/rtree/lib/state.c
 - ext/rtree/rtree.c
 - lib/rtree.rb
@@ -203,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - The Jansson library
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: R-tree spatial index

data/ext/rtree/lib/page.h

@@ -1,13 +0,0 @@
-/*
-  page.h
-  Copyright (c) J.J. Green 2019
-*/
-
-#ifndef PAGE_H
-#define PAGE_H
-
-#include <stdlib.h>
-
-int page_size(size_t*);
-
-#endif

data/ext/rtree/lib/split.h

@@ -1,15 +0,0 @@
-/*
-  split.h
-  Copyright (c) J.J. Green 2020
-*/
-
-#ifndef SPLIT_H
-#define SPLIT_H
-
-#include <rtree/state.h>
-#include <rtree/branch.h>
-#include <rtree/node.h>
-
-node_t* split_node(const state_t*, node_t*, branch_t*);
-
-#endif