shapelib 0.7.2 → 0.8.0

data/ext/shapelib_ext/spwkt.h

@@ -27,10 +27,11 @@ static VALUE pt_wkt(VALUE obj)
     shape_t *self;
     size_t buflen;
     char *buf, *cur, *stop;
-    VALUE wkt;
+    VALUE wkt, storage = 0;
     TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
+    CheckPointVertices(self->obj);
     buflen = wkt_dlen * 2 + 9;
-    cur = buf = xmalloc(buflen + 1);
+    cur = buf = ALLOCV_N(char, storage, buflen + 1);
     stop = buf + buflen;
     strcpy(cur, "POINT(");
     cur = DblFmtCat(cur, self->obj->padfX[0], stop);
@@ -38,20 +39,20 @@ static VALUE pt_wkt(VALUE obj)
     cur = DblFmtCat(cur, self->obj->padfY[0], stop);
     cur = StringCat(cur, ")", stop);
     wkt = rb_str_new(buf, strlen(buf));
-    free(buf);
+    ALLOCV_END(storage);
     return wkt;
 }
 
 static VALUE mp_wkt(VALUE obj)
 {
     shape_t *self;
-    VALUE wkt;
+    VALUE wkt, storage = 0;
     size_t buflen;
     char *buf, *cur, *stop;
     int iv;
     TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
-    buflen = (2 * wkt_dlen + 3) * self->obj->nVertices + 11;
-    cur = buf = xmalloc(buflen + 1);
+    buflen = (2 * (size_t)wkt_dlen + 3) * self->obj->nVertices + 12;
+    cur = buf = ALLOCV_N(char, storage, buflen + 1);
     stop = buf + buflen;
     strcpy(buf, "MULTIPOINT(");
     for (iv = 0; iv < self->obj->nVertices; iv++) {
@@ -63,18 +64,19 @@ static VALUE mp_wkt(VALUE obj)
     }
     StringCat(cur, ")", stop);
     wkt = rb_str_new(buf, strlen(buf));
-    free(buf);
+    ALLOCV_END(storage);
     return wkt;
 }
 
 static VALUE WKTSinglePolygon(SHPObject *obj)
 {
     size_t buflen;
-    VALUE wkt;
+    VALUE wkt, storage = 0;
     char *buf, *cur, *stop;
     int ipart, endvert, ivert;
-    buflen = (2 * wkt_dlen + 3) * obj->nVertices + obj->nParts * 2 + 9;
-    cur = buf = xmalloc(buflen + 1);
+    CheckPartStarts(obj);
+    buflen = (2 * (size_t)wkt_dlen + 3) * obj->nVertices + (size_t)obj->nParts * 4 + 9;
+    cur = buf = ALLOCV_N(char, storage, buflen + 1);
     stop = cur + buflen;
     strcpy(buf, "POLYGON(");
     for (ipart = 0; ipart < obj->nParts; ipart++) {
@@ -97,7 +99,7 @@ static VALUE WKTSinglePolygon(SHPObject *obj)
     }
     cur = StringCat(cur, ")", stop);
     wkt = rb_str_new(buf, strlen(buf));
-    free(buf);
+    ALLOCV_END(storage);
     return wkt;
 }
 
@@ -120,11 +122,13 @@ static VALUE pl_wkt(VALUE obj)
 static VALUE WKTSingleArc(SHPObject *obj)
 {
     size_t buflen;
-    VALUE wkt;
+    VALUE wkt, storage = 0;
     char *buf, *cur, *stop;
     int ivert;
+    if (obj->nVertices < 1)
+	rb_raise(rb_eArgError, "cannot format an empty line");
     buflen = (2 * wkt_dlen + 3) * obj->nVertices + 10;
-    cur = buf = xmalloc(buflen + 1);
+    cur = buf = ALLOCV_N(char, storage, buflen + 1);
     stop = cur + buflen;
     strcpy(buf, "LINESTRING(");
     for (ivert = 0; ivert < obj->nVertices; ivert++) {
@@ -136,18 +140,19 @@ static VALUE WKTSingleArc(SHPObject *obj)
     }
     cur = StringCat(cur, ")", stop);
     wkt = rb_str_new(buf, strlen(buf));
-    free(buf);
+    ALLOCV_END(storage);
     return wkt;
 }
 
 static VALUE WKTMultiArc(SHPObject *obj)
 {
     size_t buflen;
-    VALUE wkt;
+    VALUE wkt, storage = 0;
     char *buf, *cur, *stop;
     int ipart, endvert, ivert;
-    buflen = (2 * wkt_dlen + 3) * obj->nVertices + obj->nParts * 1 + 16;
-    cur = buf = xmalloc(buflen + 1);
+    CheckPartStarts(obj);
+    buflen = (2 * (size_t)wkt_dlen + 3) * obj->nVertices + (size_t)obj->nParts * 4 + 16;
+    cur = buf = ALLOCV_N(char, storage, buflen + 1);
     stop = cur + buflen;
     strcpy(buf, "MULTILINESTRING(");
     for (ipart = 0; ipart < obj->nParts; ipart++) {
@@ -170,7 +175,7 @@ static VALUE WKTMultiArc(SHPObject *obj)
     }
     cur = StringCat(cur, ")", stop);
     wkt = rb_str_new(buf, strlen(buf));
-    free(buf);
+    ALLOCV_END(storage);
     return wkt;
 }
 
@@ -214,6 +219,6 @@ static VALUE sp_wkt(VALUE obj)
 	    return pl_wkt(obj);
 	    break;
     }
-    rb_bug("invalid shape type %d", self->obj->nSHPType);
+    rb_raise(rb_eArgError, "unsupported WKT shape type %d", self->obj->nSHPType);
     return Qnil;
 }

data/ext/shapelib_ext/valconv.h

@@ -1,9 +1,11 @@
 /* valconv.h */
 
-#define SHP_NODATA_LIM	-1.0e-38
-#define SHP_NODATA	-2.0e-38
+#define SHP_NODATA_LIM	-1.0e38
+#define SHP_NODATA	-2.0e38
+/* Preserve null measures written by earlier versions of this gem. */
+#define SHP_NODATA_LEGACY	-2.0e-38
 #define SHP_NUM2DBL(value) (NIL_P(value) ? SHP_NODATA : NUM2DBL(value))
-#define SHP_FLOAT_NEW(f) (((f) < SHP_NODATA_LIM) ? Qnil : rb_float_new((f)))
+#define SHP_FLOAT_NEW(f) (((f) < SHP_NODATA_LIM || (f) == SHP_NODATA_LEGACY) ? Qnil : rb_float_new((f)))
 #define CSTR2SYM(s) (ID2SYM(rb_intern((s))))
 static int NUM2INT_nil(VALUE v) { return NIL_P(v) ? -1 : NUM2INT(v); }
 
@@ -12,6 +14,9 @@ static const_table_entry sl_consts[] = {
     { "Integer", INT2FIX((int)FTInteger) },
     { "Float", INT2FIX((int)FTDouble) },
     { "Logical", INT2FIX((int)FTLogical) },
+#ifdef HAVE_CONST_FTDATE
+    { "Date", INT2FIX((int)FTDate) },
+#endif
     { NULL, Qnil }
 };
 
@@ -48,6 +53,9 @@ static ID *FieldTypeNameTable(void)
     ids[FTInteger] = rb_intern("Integer");
     ids[FTDouble] = rb_intern("Float");
     ids[FTLogical] = rb_intern("Logical");
+#ifdef HAVE_CONST_FTDATE
+    ids[FTDate] = rb_intern("Date");
+#endif
     ids[FTInvalid] = rb_intern("Invalid");
     return ids;
 }
@@ -82,13 +90,18 @@ static int Ruby2PartType(VALUE ptype)
 		if (ids[i] == given)
 		    return i;
 	    }
-	    return -1;
+	    rb_raise(rb_eArgError, "invalid part type name");
 	    break;
 	case T_FIXNUM:
-	    return FIX2INT(ptype);
+	    i = FIX2INT(ptype);
+	    break;
 	default:
-	    return NUM2INT(ptype);
+	    i = NUM2INT(ptype);
+	    break;
     }
+    if (i < 0 || i > 5)
+	rb_raise(rb_eArgError, "invalid part_type %d", i);
+    return i;
 }
 
 static VALUE PartType2Ruby(int part_type)
@@ -111,6 +124,9 @@ static DBFFieldType Ruby2FieldType(VALUE obj)
 	case FTInteger:
 	case FTDouble:
 	case FTLogical:
+#ifdef HAVE_CONST_FTDATE
+	case FTDate:
+#endif
 	case FTInvalid:
 	    return ft;
 	default:
@@ -133,7 +149,7 @@ static VALUE FieldType2Ruby(DBFFieldType ftype)
 {
     int ft;
     ft = ftype;
-    if (ft < 0 || ft >= FTInvalid)
+    if (ft < 0 || ft >= FTInvalid || FieldTypeNameTable()[ft] == 0)
 	return INT2FIX(ft);
     return ID2SYM(FieldTypeNameTable()[ft]);
 }
@@ -250,8 +266,12 @@ static int ShapeSym_to_Int(VALUE stype)
 static int Ruby2ShapeType(VALUE stype)
 {
     switch (TYPE(stype)) {
-    case T_FIXNUM:
-	return FIX2INT(stype);
+    case T_FIXNUM: {
+	int type = FIX2INT(stype);
+	if (type >= SHPT_NULL && type <= SHPT_MULTIPATCH && ShapeTypeNameTable()[type] != 0)
+	    return type;
+	rb_raise(rb_eArgError, "invalid shape_type %d", type);
+    }
     case T_CLASS:
 	return ShapeClass_to_Int(stype);
     case T_STRING:
@@ -294,9 +314,10 @@ static VALUE IntUnpack(int *up, unsigned num)
     static VALUE unpackfmt = 0;
     VALUE buf;
     if (unpackfmt == 0) {
-			unpackid = rb_intern("unpack");
-			unpackfmt = rb_str_new2("i*");
-                        rb_global_variable(&unpackfmt);
+	unpackid = rb_intern("unpack");
+	/* Register first: registration can trigger GC. */
+	rb_global_variable(&unpackfmt);
+	unpackfmt = rb_str_new2("i*");
     }
     buf = rb_str_new((char *)up, sizeof(int) * num);
     return rb_funcall(buf, unpackid, 1, unpackfmt);

data/lib/shapelib/shape.rb

@@ -7,7 +7,10 @@ module Shapelib
     end
     
     def latlngs
-      @latlngs ||= yvals.zip(xvals)
+      return @latlngs if @latlngs
+      coordinates = yvals.zip(xvals)
+      @latlngs = coordinates unless frozen?
+      coordinates
     end
     
     def inspect

data/lib/shapelib/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Shapelib
-  VERSION = "0.7.2"
+  VERSION = '0.8.0'
 end

data/lib/shapelib.rb

@@ -1,2 +1,3 @@
 require 'shapelib_ext'
-require 'shapelib/shape'
+require 'shapelib/version'
+require 'shapelib/shape'

data/shapelib.gemspec

@@ -1,58 +1,58 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: shapelib 0.7.2 ruby lib
-# stub: ext/shapelib_ext/extconf.rb
+# frozen_string_literal: true
+
+require_relative 'lib/shapelib/version'
 
 Gem::Specification.new do |s|
-  s.name = "shapelib".freeze
-  s.version = "0.7.2"
+  s.name = 'shapelib'
+  s.version = Shapelib::VERSION
+  s.required_ruby_version = '>= 2.6'
+  s.licenses = ['MIT', 'LGPL-2.0-only', 'CC-BY-SA-3.0']
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["prasinos@users.sourceforge.net".freeze, "Mike Mangino".freeze, "Mike Perham".freeze, "Nick Estes".freeze]
-  s.date = "2026-10-14"
-  s.description = "Simple wrapper around the shapelib library".freeze
-  s.email = "nick@nickstoys.com".freeze
-  s.extensions = ["ext/shapelib_ext/extconf.rb".freeze]
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  s.require_paths = ['lib']
+  s.authors = ['prasinos@users.sourceforge.net', 'Mike Mangino', 'Mike Perham', 'Nick Estes']
+  s.description = 'Simple wrapper around the shapelib library'
+  s.email = 'nick@nickstoys.com'
+  s.extensions = ['ext/shapelib_ext/extconf.rb']
   s.extra_rdoc_files = [
-    "README.md"
+    'README.md'
   ]
   s.files = [
-    "README.md",
-    "Rakefile",
-    "doc/Interface.html",
-    "doc/Interface.rd",
-    "doc/style.css",
-    "ext/shapelib_ext/depend",
-    "ext/shapelib_ext/extconf.rb",
-    "ext/shapelib_ext/main.c",
-    "ext/shapelib_ext/sfcode.h",
-    "ext/shapelib_ext/sflist.h",
-    "ext/shapelib_ext/shpplus.c",
-    "ext/shapelib_ext/shpplus.h",
-    "ext/shapelib_ext/spcode.h",
-    "ext/shapelib_ext/splist.h",
-    "ext/shapelib_ext/spwkt.h",
-    "ext/shapelib_ext/valconv.h",
-    "lib/shapelib.rb",
-    "lib/shapelib/shape.rb",
-    "lib/shapelib/version.rb",
-    "shapelib.gemspec",
-    "test/data/ZillowNeighborhoods-CA/ZillowNeighborhoods-CA.dbf",
-    "test/data/ZillowNeighborhoods-CA/ZillowNeighborhoods-CA.prj",
-    "test/data/ZillowNeighborhoods-CA/ZillowNeighborhoods-CA.shp",
-    "test/data/ZillowNeighborhoods-CA/ZillowNeighborhoods-CA.shp.xml",
-    "test/data/ZillowNeighborhoods-CA/ZillowNeighborhoods-CA.shx",
-    "test/test_zillow_data.rb"
+    'LICENSE',
+    'LICENSE-MIT',
+    'LICENSE-LGPL',
+    'LICENSE-CC-BY-SA-3.0',
+    'README.md',
+    'Rakefile',
+    'doc/Interface.html',
+    'doc/Interface.rd',
+    'doc/style.css',
+    'ext/shapelib_ext/depend',
+    'ext/shapelib_ext/extconf.rb',
+    'ext/shapelib_ext/main.c',
+    'ext/shapelib_ext/sfcode.h',
+    'ext/shapelib_ext/sflist.h',
+    'ext/shapelib_ext/shpplus.c',
+    'ext/shapelib_ext/shpplus.h',
+    'ext/shapelib_ext/spcode.h',
+    'ext/shapelib_ext/splist.h',
+    'ext/shapelib_ext/spwkt.h',
+    'ext/shapelib_ext/valconv.h',
+    'lib/shapelib.rb',
+    'lib/shapelib/shape.rb',
+    'lib/shapelib/version.rb',
+    'shapelib.gemspec',
+    'test/data/ZillowNeighborhoods-CA/ZillowNeighborhoods-CA.dbf',
+    'test/data/ZillowNeighborhoods-CA/ZillowNeighborhoods-CA.prj',
+    'test/data/ZillowNeighborhoods-CA/ZillowNeighborhoods-CA.shp',
+    'test/data/ZillowNeighborhoods-CA/ZillowNeighborhoods-CA.shp.xml',
+    'test/data/ZillowNeighborhoods-CA/ZillowNeighborhoods-CA.shx',
+    'test/test_zillow_data.rb'
   ]
-  s.homepage = "http://github.com/mperham/shapelib".freeze
-  s.rubygems_version = "3.4.20".freeze
-  s.summary = "Simple wrapper around the shapelib library".freeze
-
-  s.specification_version = 4
+  s.homepage = 'https://github.com/gravatite/shapelib'
+  s.summary = 'Simple wrapper around the shapelib library'
 
-  s.add_development_dependency(%q<rake-compiler>.freeze, [">= 0.7.0"])
+  s.add_development_dependency 'rake', '>= 13.0'
+  s.add_development_dependency 'test-unit', '>= 3.0'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end
-