librtree 1.0.1 → 1.0.3

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

@@ -103,7 +103,7 @@ class RTree < RTreeBase
         wr.close
         unset_nonblock(rd)
         begin
-          result = rd.read
+          result = rd.read || raise(IOError, 'reading from pipe')
         ensure
           rd.close
           Process.wait
@@ -233,19 +233,12 @@ class RTree < RTreeBase
     # 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
+    # the expected behaviour.  Note that self.const_get(:FOO) is
+    # the same as self::FOO, but the latter gives a spurious
+    # type-warning from steep
     #
     def split_flag(split)
-      case split
-      when :quadratic
-        self::SPLIT_QUADRATIC
-      when :linear
-        self::SPLIT_LINEAR
-      when :greene
-        self::SPLIT_GREENE
-      else
-        raise ArgumentError, "bad split value: #{split}"
-      end
+      self.const_get(split_symbol(split))
     end
 
     # @!visibility private
@@ -256,10 +249,22 @@ class RTree < RTreeBase
 
     private
 
-    def deserialise(*args, &block)
-      RTree::IOUtil.deserialise(*args, &block)
+    def deserialise(string, encoding, &block)
+      RTree::IOUtil.deserialise(string, encoding, &block)
     end
 
+    def split_symbol(split)
+      case split
+      when :quadratic
+        :SPLIT_QUADRATIC
+      when :linear
+        :SPLIT_LINEAR
+      when :greene
+        :SPLIT_GREENE
+      else
+        raise ArgumentError, "bad split value: #{split}"
+      end
+    end
   end
 
   # Initialize a new (empty) RTree
@@ -512,8 +517,8 @@ class RTree < RTreeBase
     node_page_flag | split_flag
   end
 
-  def serialise(*args, &block)
-    RTree::IOUtil.serialise(*args, &block)
+  def serialise(encoding, &block)
+    RTree::IOUtil.serialise(encoding, &block)
   end
 
 end
@@ -576,8 +581,8 @@ class RTree::Style < RTreeStyleBase
 
     private
 
-    def deserialise(*args, &block)
-      RTree::IOUtil.deserialise(*args, &block)
+    def deserialise(string, encoding, &block)
+      RTree::IOUtil.deserialise(string, encoding, &block)
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librtree
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: steep
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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.
@@ -126,7 +154,9 @@ files:
 - ext/rtree/lib/bindex.h
 - ext/rtree/lib/bounds.h
 - ext/rtree/lib/branch.c
+- ext/rtree/lib/branch.h
 - ext/rtree/lib/branches.c
+- ext/rtree/lib/branches.h
 - ext/rtree/lib/bsrt.c
 - ext/rtree/lib/bsrt.h
 - ext/rtree/lib/constants.h
@@ -140,32 +170,34 @@ files:
 - ext/rtree/lib/mk/MakeDepend
 - ext/rtree/lib/mk/Obj.mk
 - ext/rtree/lib/node.c
+- ext/rtree/lib/node.h
 - ext/rtree/lib/package.c
 - ext/rtree/lib/page.c
 - ext/rtree/lib/page.h
 - ext/rtree/lib/postscript.c
 - ext/rtree/lib/rect.c
+- ext/rtree/lib/rect.h
 - 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/search.h
 - 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/lib/state.h
 - ext/rtree/rtree.c
 - lib/rtree.rb
 homepage: https://gitlab.com/jjg/librtree-ruby
@@ -189,7 +221,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