shapelib 0.7.0 → 0.7.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: d4b63230d6b9cb35b579690564efd7332e6ef11233cc9776a2fe481e0a3711df
+  data.tar.gz: 28037b023308d67c24e028c3d8127ea1e59b3f183b87ed144136dbd854f2d045
+SHA512:
+  metadata.gz: d671c1e27a6ae74ede90fd6d68cef7337384e11d31aa71ec01e3253306ab0a1a385ce5b5a35cb95cfd476817a43f8f0c2797bc5c2a1ed9950124cd7e77fbb9af
+  data.tar.gz: 4ad801f9c17ffcc949e959ab1ca459ec4af1d204ca6a0550e64a72579e5e01c57e988921182821284d74beec7e6c744603a3870ad53f1e150f4b374f7ffc2e48

data/README.md

@@ -7,7 +7,7 @@ prasinos@users.sourceforge.net.
 How to install
 -----------------
 
-* You must have ShapeLib and ruby.
+* Install the shapelib C library with your Unix package management system.
 * It is expected to run on all ruby-running environments. But it is tested
   only on RedHat Enterprise Linux 4.0 and Vine Linux 3.0.
   
@@ -18,35 +18,19 @@ Install MacPorts.  Use it to install the shapelib C library:
 
     sudo port install shapelib
 
-Now install the gem, pointing it to the port installation:
+Now install the Rubygem:
 
-    gem build shapelib.gemspec
-    gem install shapelib-X.X.X.gem -- --with-opt-dir=/opt/local
-
-Quick directions
-----------------
-
-    $ tar xvfz ruby-shapelib.tar.gz      (you did it if you see this file)
-    $ cd ruby-shapelib
-    $ ruby ./extconf.rb
-    $ make 
-    # make install
-  
+    gem install shapelib
 
 Troubleshooting
 ---------------
 
-* I have ruby but can't run extconf.rb
-  
-  Some Linux distributions divide Ruby into several packages such as
-  "ruby" and "ruby-devel". You may have to install additional packages.
-
-* I have shapelib installed but extconf.rb fails
+* I have shapelib installed but the build fails
 
-  Try --with-shapelib-include= and --with-shapelib-lib= options of extconf.rb.
+  Try --with-shapelib-include= and --with-shapelib-lib= options:
+  gem install shapelib -- --with-shapelib-include=...
 
-If above advice doesn't help, please visit
-http://sourceforge.net/projects/ruby-shapelib and post a message.
+If above advice doesn't help, please visit http://github.com/mperham/shapelib and post an issue.
 
 How to use
 ==========

data/Rakefile

@@ -9,9 +9,9 @@ begin
     gem.name = "shapelib"
     gem.summary = %Q{Simple wrapper around the shapelib library}
     gem.description = gem.summary
-    gem.email = %q{mmangino@elevatedrails.com}
+    gem.email = %q{nick@nickstoys.com}
     gem.homepage = "http://github.com/mperham/shapelib"
-    gem.authors =  ["prasinos@users.sourceforge.net", "Mike Mangino", "Mike Perham"]
+    gem.authors =  ["prasinos@users.sourceforge.net", "Mike Mangino", "Mike Perham", "Nick Estes"]
     gem.add_development_dependency 'rake-compiler', '>= 0.7.0'
     gem.has_rdoc = false
     gem.version = Shapelib::VERSION
@@ -32,7 +32,8 @@ end
 task :test => :check_dependencies
 task :default => :test
 
-require 'rake/rdoctask'
+#require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "shapelib"

data/ext/shapelib_ext/main.c

@@ -37,6 +37,24 @@ static VALUE cMultiPatch;
 
 /* code begins here */
 
+static void shape_free(void *ptr)
+{
+    shape_close(ptr);
+}
+
+static void shapefile_free(void *ptr)
+{
+    shapefile_close(ptr);
+}
+
+static const rb_data_type_t shape_data_type = {
+    "Shapelib::Shape", { 0, shape_free, 0 }
+};
+
+static const rb_data_type_t shapefile_data_type = {
+    "Shapelib::ShapeFile", { 0, shapefile_free, 0 }
+};
+
 #include "valconv.h"
 #include "sfcode.h"
 #include "sflist.h"
@@ -64,20 +82,36 @@ void Init_shapelib_ext()
 {
     mShapeLib = rb_define_module("Shapelib");
     cShapeFile = rb_define_class_under(mShapeLib, "ShapeFile", rb_cObject);
+    rb_undef_alloc_func(cShapeFile);
     cShape = rb_define_class_under(mShapeLib, "Shape", rb_cObject);
+    rb_undef_alloc_func(cShape);
     cPoint = rb_define_class_under(mShapeLib, "Point", cShape);
+    rb_undef_alloc_func(cPoint);
     cPointM = rb_define_class_under(mShapeLib, "PointM", cPoint);
+    rb_undef_alloc_func(cPointM);
     cPointZ = rb_define_class_under(mShapeLib, "PointZ", cPointM);
+    rb_undef_alloc_func(cPointZ);
     cArc = rb_define_class_under(mShapeLib, "Arc", cShape);
+    rb_undef_alloc_func(cArc);
     cArcM = rb_define_class_under(mShapeLib, "ArcM", cArc);
+    rb_undef_alloc_func(cArcM);
     cArcZ = rb_define_class_under(mShapeLib, "ArcZ", cArcM);
+    rb_undef_alloc_func(cArcZ);
     cPolygon = rb_define_class_under(mShapeLib, "Polygon", cShape);
+    rb_undef_alloc_func(cPolygon);
     cPolygonM = rb_define_class_under(mShapeLib, "PolygonM", cPolygon);
+    rb_undef_alloc_func(cPolygonM);
     cPolygonZ = rb_define_class_under(mShapeLib, "PolygonZ", cPolygonM);
+    rb_undef_alloc_func(cPolygonZ);
     cMultiPoint = rb_define_class_under(mShapeLib, "MultiPoint", cShape);
+    rb_undef_alloc_func(cMultiPoint);
     cMultiPointM = rb_define_class_under(mShapeLib, "MultiPointM", cMultiPoint);
+    rb_undef_alloc_func(cMultiPointM);
     cMultiPointZ = rb_define_class_under(mShapeLib, "MultiPointZ", cMultiPointM);
+    rb_undef_alloc_func(cMultiPointZ);
     cMultiPatch = rb_define_class_under(mShapeLib, "MultiPatch", cShape);
+    rb_undef_alloc_func(cMultiPatch);
+
     rb_define_module_function(mShapeLib, "new_point", sl_m_new_point, -1);
     rb_define_singleton_method(cShapeFile, "new", sf_s_new, -1);
     rb_define_singleton_method(cShapeFile, "open", sf_s_open, -1);

data/ext/shapelib_ext/sfcode.h

@@ -11,7 +11,6 @@ static VALUE sf_add_field(int argc, VALUE *args, VALUE obj)
 
     rb_scan_args(argc, args, "31",
 	    &name, &field_type, &field_width, &decimal_place);
-    SECURE(name);
     StringValue(name);
     atype = Ruby2FieldType(field_type);
     width = NUM2INT(field_width);
@@ -19,7 +18,7 @@ static VALUE sf_add_field(int argc, VALUE *args, VALUE obj)
     if (atype == FTDouble && argc == 3) {
 	rb_raise(rb_eArgError, "specify decimal places for Float attribute");
     }
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     r = shapefile_add_field(self, RSTRING_PTR(name), atype, width, wdeci);
     return obj;
 }
@@ -27,7 +26,7 @@ static VALUE sf_add_field(int argc, VALUE *args, VALUE obj)
 static VALUE sf_close(VALUE obj)
 {
     shapefile_t *self;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     return INT2FIX(shapefile_close(self));
 }
 
@@ -35,7 +34,7 @@ static VALUE sf_field_count(VALUE obj)
 {
     shapefile_t *self;
     int r;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     r = shapefile_field_count(self);
     return INT2FIX(r);
 }
@@ -45,7 +44,6 @@ static int Ruby2FieldIndex(shapefile_t *sfile, VALUE field)
     if (FIXNUM_P(field)) {
 	return FIX2INT(field);
     } else {
-	SECURE(field);
 	return shapefile_field_index(sfile, StringValuePtr(field));
     }
 }
@@ -53,7 +51,7 @@ static int Ruby2FieldIndex(shapefile_t *sfile, VALUE field)
 static VALUE sf_delete_shape(VALUE obj, VALUE ishape)
 {
     shapefile_t *self;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     shapefile_delete_shape(self, NUM2INT(ishape));
     return Qnil;
 }
@@ -62,7 +60,7 @@ static VALUE sf_field_index(VALUE obj, VALUE name)
 {
     shapefile_t *self;
     int ifield;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     ifield = Ruby2FieldIndex(self, name);
     return (ifield < 0) ? Qnil : INT2FIX(ifield);
 }
@@ -71,7 +69,7 @@ static VALUE sf_field_name(VALUE obj, VALUE index)
 {
     shapefile_t *self;
     const char *name;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     name = shapefile_field_name(self, NUM2INT(index));
     return name ? rb_str_new2(name) : Qnil;
 }
@@ -80,7 +78,7 @@ static VALUE sf_field_type(VALUE obj, VALUE field)
 {
     shapefile_t *self;
     int ifield;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     ifield = Ruby2FieldIndex(self, field);
     return FieldType2Ruby(shapefile_field_type(self, ifield));
 }
@@ -89,7 +87,7 @@ static VALUE sf_field_width(VALUE obj, VALUE field)
 {
     shapefile_t *self;
     int ifield;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     ifield = Ruby2FieldIndex(self, field);
     return INT2FIX(shapefile_field_width(self, ifield));
 }
@@ -98,7 +96,7 @@ static VALUE sf_field_decimals(VALUE obj, VALUE field)
 {
     shapefile_t *self;
     int ifield;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     ifield = Ruby2FieldIndex(self, field);
     return INT2FIX(shapefile_field_decimals(self, ifield));
 }
@@ -108,7 +106,7 @@ static VALUE sf_fields(VALUE obj)
     shapefile_t *self;
     VALUE r;
     int fc, i;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     fc = shapefile_field_count(self);
     if (fc < 0)
 	return Qnil;
@@ -126,7 +124,7 @@ static VALUE sf_maxbound(VALUE obj)
     shapefile_t *self;
     double bound[4];
     double z;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     shapefile_bound(self, NULL, bound);
     z = bound[2];
     bound[2] = bound[3];
@@ -139,7 +137,7 @@ static VALUE sf_minbound(VALUE obj)
     shapefile_t *self;
     double bound[4];
     double z;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     shapefile_bound(self, bound, NULL);
     z = bound[2];
     bound[2] = bound[3];
@@ -154,19 +152,19 @@ static VALUE sf_read(int argc, VALUE *args, VALUE obj)
     VALUE ishape, r;
     int irec;
     rb_scan_args(argc, args, "01", &ishape);
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     irec = NIL_P(ishape) ? -1 : NUM2INT(ishape);
     s = shapefile_read(self, irec);
     if (s == NULL)
 	return Qnil;
-    r = Data_Wrap_Struct(cShape, 0, shape_close, s);
+    r = TypedData_Wrap_Struct(cShape, &shape_data_type, s);
     return r;
 }
 
 static VALUE sf_rewind(VALUE obj)
 {
     shapefile_t *self;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     self->irec = 0;
     return obj;
 }
@@ -187,7 +185,7 @@ static VALUE sf_each(VALUE obj)
 static VALUE sf_shape_type(VALUE obj)
 {
     shapefile_t *self;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     return ShapeType2Ruby(shapefile_shape_type(self));
 }
 
@@ -195,7 +193,7 @@ static VALUE sf_size(VALUE obj)
 {
     shapefile_t *self;
     int r;
-    Data_Get_Struct(obj, shapefile_t, self);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
     r = shapefile_size(self);
     if (r < 0)
 	rb_raise(rb_eRuntimeError, "size %d", r);
@@ -210,8 +208,8 @@ static VALUE sf_write(int argc, VALUE *args, VALUE obj)
     if (argc < 1 || argc > 2) {
 	rb_raise(rb_eArgError, "usage: Shapefile#write shape, [irec = -1]");
     }
-    Data_Get_Struct(obj, shapefile_t, self);
-    Data_Get_Struct(args[0], shape_t, shape);
+    TypedData_Get_Struct(obj, shapefile_t, &shapefile_data_type, self);
+    TypedData_Get_Struct(args[0], shape_t, &shape_data_type, shape);
     irec = ((argc == 2) ? NUM2INT(args[1]) : -1);
     r = shapefile_write(self, irec, shape);
     return INT2FIX(r);
@@ -237,11 +235,10 @@ static VALUE sf_s_open(int argc, VALUE *argv, VALUE klass)
     VALUE fnam, mode, sf, proc;
     shapefile_t *sfile;
     rb_scan_args(argc, argv, "11&", &fnam, &mode, &proc);
-    SECURE(fnam);
     sfile = shapefile_open(StringValuePtr(fnam), 
 	(NIL_P(mode) ? "rb" : StringValuePtr(mode))
 	);
-    sf = Data_Wrap_Struct(klass, 0, shapefile_close, sfile);
+    sf = TypedData_Wrap_Struct(klass, &shapefile_data_type, sfile);
     return YieldIfPossible(proc, sf);
 }
 
@@ -257,7 +254,6 @@ static VALUE sf_s_new(int argc, VALUE *argv, VALUE klass)
 	return Qnil;
     }
     rb_scan_args(argc, argv, "21&", &fnam, &shapetype, &attrs, &proc);
-    SECURE(fnam);
     if ((stype = Ruby2ShapeType(shapetype)) == -1) {
 	rb_raise(rb_eArgError, "shapetype must be Shape subclass");
     }
@@ -270,7 +266,7 @@ static VALUE sf_s_new(int argc, VALUE *argv, VALUE klass)
     if (sfile == NULL) {
 	rb_raise(rb_eRuntimeError, "shapefile_new failed");
     }
-    sf = Data_Wrap_Struct(klass, 0, shapefile_close, sfile);
+    sf = TypedData_Wrap_Struct(klass, &shapefile_data_type, sfile);
     if (argc > 2) {
 	for (i = 0; i < RARRAY_LEN(attrs); i++) {
 	    VALUE p = RARRAY_PTR(attrs)[i];

data/ext/shapelib_ext/spcode.h

@@ -105,7 +105,7 @@ static VALUE sp_s_new(VALUE klass, VALUE hash)
     if (yvals) free(yvals);
     if (zvals) free(zvals);
     if (mvals) free(mvals);
-    vshape = Data_Wrap_Struct(qlass, 0, shape_close, shape);
+    vshape = TypedData_Wrap_Struct(qlass, &shape_data_type, shape);
     HashLoadAttrib(vshape, hash);
     return vshape;
 }
@@ -280,7 +280,7 @@ static VALUE NewShape(int argc, VALUE *argv, VALUE klass, int shapetype)
     } else {
 	shape = NewSinglePart(argc, argv, klass, shapetype);
     }
-    return Data_Wrap_Struct(klass, 0, shape_close, shape);
+    return TypedData_Wrap_Struct(klass, &shape_data_type, shape);
 }
 
 static VALUE MultiPointNew(int argc, VALUE *argv, VALUE klass, int shapetype)
@@ -300,7 +300,7 @@ static VALUE MultiPointNew(int argc, VALUE *argv, VALUE klass, int shapetype)
     CollectPoints(argc, argv, x, y, m, z);
     shape = shape_new_obj(shapetype, 1, part_start, NULL, n_vert, x, y, m, z);
     free(dblock);
-    return Data_Wrap_Struct(klass, 0, shape_close, shape);
+    return TypedData_Wrap_Struct(klass, &shape_data_type, shape);
 }
 
 static VALUE arc_s_new(int argc, VALUE *argv, VALUE klass) {
@@ -372,7 +372,7 @@ static VALUE pt_s_new(int argc, VALUE *argv, VALUE klass)
     rb_scan_args(argc, argv, "21", &vx, &vy, &attrs);
     shape = shape_new_point(SHPT_POINT,
 	NUM2DBLo(vx), NUM2DBLo(vy), 0.0, 0.0);
-    pt = Data_Wrap_Struct(klass, 0, shape_close, shape);
+    pt = TypedData_Wrap_Struct(klass, &shape_data_type, shape);
     if (!NIL_P(attrs)) {
 	PointAddAttr(pt, attrs);
     }
@@ -386,7 +386,7 @@ static VALUE ptm_s_new(int argc, VALUE *argv, VALUE klass)
     rb_scan_args(argc, argv, "31", &vx, &vy, &vm, &attrs);
     shape = shape_new_point(SHPT_POINTM,
 	NUM2DBLo(vx), NUM2DBLo(vy), SHP_NUM2DBL(vm), 0.0);
-    pt = Data_Wrap_Struct(klass, 0, shape_close, shape);
+    pt = TypedData_Wrap_Struct(klass, &shape_data_type, shape);
     if (!NIL_P(attrs)) {
 	PointAddAttr(pt, attrs);
     }
@@ -400,7 +400,7 @@ static VALUE ptz_s_new(int argc, VALUE *argv, VALUE klass)
     rb_scan_args(argc, argv, "41", &vx, &vy, &vm, &vz, &attrs);
     shape = shape_new_point(SHPT_POINTZ,
 	NUM2DBLo(vx), NUM2DBLo(vy), SHP_NUM2DBL(vm), NUM2DBLo(vz));
-    pt = Data_Wrap_Struct(klass, 0, shape_close, shape);
+    pt = TypedData_Wrap_Struct(klass, &shape_data_type, shape);
     if (!NIL_P(attrs)) {
 	PointAddAttr(pt, attrs);
     }
@@ -431,7 +431,7 @@ static void Attr_to_Hash(VALUE h, VALUE obj)
 {
     shape_t *self;
     int i;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     if (self->nattr <= 0)
 	return;
     for (i = 0; i < self->nattr; i++) {
@@ -466,7 +466,7 @@ static VALUE sp_field_get(VALUE obj, VALUE name)
     char *cname;
     int ofs;
 
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     cname = StringValuePtr(name);
     ofs = shape_attrib_index(self, cname, 0);
     if (ofs < 0) {
@@ -494,7 +494,7 @@ static VALUE sp_field_set(VALUE obj, VALUE name, VALUE val)
     char *cname;
     int	ofs;
 
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     cname = StringValuePtr(name);
     ofs = shape_attrib_index(self, cname, 1);
     if (ofs < 0) {
@@ -527,7 +527,7 @@ static VALUE sp_maxbound(VALUE obj)
 {
     shape_t *self;
     double buf[4];
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     buf[0] = self->obj->dfXMax;
     buf[1] = self->obj->dfYMax;
     buf[2] = self->obj->dfMMax;
@@ -539,7 +539,7 @@ static VALUE sp_minbound(VALUE obj)
 {
     shape_t *self;
     double buf[4];
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     buf[0] = self->obj->dfXMin;
     buf[1] = self->obj->dfYMin;
     buf[2] = self->obj->dfMMin;
@@ -550,28 +550,28 @@ static VALUE sp_minbound(VALUE obj)
 static VALUE sp_mvals(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     return DoubleUnpackM(self->obj->padfM, self->obj->nVertices, -1);
 }
 
 static VALUE sp_n_parts(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     return INT2NUM(self->obj->nParts);
 }
 
 static VALUE sp_n_vertices(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     return INT2NUM(self->obj->nVertices);
 }
 
 static VALUE sp_part_start(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     if (self->obj->nParts == 0)
 	return Qnil;
     return IntUnpack(self->obj->panPartStart, self->obj->nParts);
@@ -582,7 +582,7 @@ static VALUE sp_part_type(VALUE obj)
     shape_t *self;
     VALUE ary;
     int i;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     if (self->obj->nParts == 0)
 	return Qnil;
 #if 0
@@ -598,42 +598,42 @@ static VALUE sp_part_type(VALUE obj)
 static VALUE sp_shape_id(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     return (self->obj->nShapeId < 0) ? Qnil : INT2NUM(self->obj->nShapeId);
 }
 
 static VALUE sp_shape_type(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     return ShapeType2Ruby(self->obj->nSHPType);
 }
 
 static VALUE sp_rewind(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     return SHPRewindObject(NULL, self->obj) ? Qtrue : Qfalse;
 }
 
 static VALUE sp_xvals(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     return DoubleUnpack(self->obj->padfX, self->obj->nVertices);
 }
 
 static VALUE sp_yvals(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     return DoubleUnpack(self->obj->padfY, self->obj->nVertices);
 }
 
 static VALUE sp_zvals(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     return DoubleUnpack(self->obj->padfZ, self->obj->nVertices);
 }
 
@@ -644,7 +644,7 @@ static VALUE sp_zvals(VALUE obj)
 static VALUE pt_x(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     switch (self->obj->nSHPType) {
 	case SHPT_POINT:
 	case SHPT_POINTM:
@@ -659,7 +659,7 @@ static VALUE pt_x(VALUE obj)
 static VALUE pt_y(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     switch (self->obj->nSHPType) {
 	case SHPT_POINT:
 	case SHPT_POINTM:
@@ -674,7 +674,7 @@ static VALUE pt_y(VALUE obj)
 static VALUE pt_m(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     switch (self->obj->nSHPType) {
 	case SHPT_POINTM:
 	case SHPT_POINTZ:
@@ -690,7 +690,7 @@ static VALUE pt_m(VALUE obj)
 static VALUE pt_z(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     switch (self->obj->nSHPType) {
 	case SHPT_POINTZ:
 	    return rb_float_new(self->obj->padfM[0]);

data/ext/shapelib_ext/splist.h

@@ -21,27 +21,9 @@ static VALUE sp_to_h(VALUE obj)
     return h;
 }
 
-static VALUE sp_inspect(VALUE obj)
-{
-    VALUE tos;
-    static ID inspect = 0;
-    static ID id_plus, id_class, id_to_s;
-    static VALUE classnm;
-    if (inspect == 0) {
-	inspect = rb_intern("inspect");
-	id_plus = rb_intern("+");
-	id_class = rb_intern("class");
-	id_to_s = rb_intern("to_s");
-    }
-    classnm = rb_funcall(rb_funcall(obj, id_class, 0), id_to_s, 0);
-    tos = rb_funcall(sp_to_h(obj), inspect, 0);
-    return rb_funcall(classnm, id_plus, 1, tos);
-}
-
 static method_table_entry sp_methods[] = {
     { "[]",		sp_field_get, 1 },
     { "[]=",		sp_field_set, 2 },
-    { "inspect",	sp_inspect, 0 },
     { "maxbound",	sp_maxbound, 0 },
     { "minbound",	sp_minbound, 0 },
     { "mvals",		sp_mvals, 0 },

data/ext/shapelib_ext/spwkt.h

@@ -28,7 +28,7 @@ static VALUE pt_wkt(VALUE obj)
     size_t buflen;
     char *buf, *cur, *stop;
     VALUE wkt;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     buflen = wkt_dlen * 2 + 9;
     cur = buf = xmalloc(buflen + 1);
     stop = buf + buflen;
@@ -49,7 +49,7 @@ static VALUE mp_wkt(VALUE obj)
     size_t buflen;
     char *buf, *cur, *stop;
     int iv;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     buflen = (2 * wkt_dlen + 3) * self->obj->nVertices + 11;
     cur = buf = xmalloc(buflen + 1);
     stop = buf + buflen;
@@ -104,7 +104,7 @@ static VALUE WKTSinglePolygon(SHPObject *obj)
 static VALUE pl_wkt(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     /* === BUG ===
      * following code doesn't consider the possibilities:
      * - there may be multiple outer loop in a Polygon Shape.
@@ -177,7 +177,7 @@ static VALUE WKTMultiArc(SHPObject *obj)
 static VALUE arc_wkt(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     if (self->obj->nParts > 1) {
 	return WKTMultiArc(self->obj);
     } else {
@@ -188,7 +188,7 @@ static VALUE arc_wkt(VALUE obj)
 static VALUE sp_wkt(VALUE obj)
 {
     shape_t *self;
-    Data_Get_Struct(obj, shape_t, self);
+    TypedData_Get_Struct(obj, shape_t, &shape_data_type, self);
     switch (self->obj->nSHPType) {
 	case SHPT_POINT:
 	case SHPT_POINTM:

data/ext/shapelib_ext/valconv.h

@@ -1,7 +1,5 @@
 /* valconv.h */
 
-#define SECURE(obj) SecureObject((obj), #obj)
-
 #define SHP_NODATA_LIM	-1.0e-38
 #define SHP_NODATA	-2.0e-38
 #define SHP_NUM2DBL(value) (NIL_P(value) ? SHP_NODATA : NUM2DBL(value))
@@ -304,10 +302,3 @@ static VALUE IntUnpack(int *up, unsigned num)
     return rb_funcall(buf, unpackid, 1, unpackfmt);
 }
 
-static VALUE SecureObject(VALUE obj, const char *name) {
-    if (OBJ_TAINTED(obj) && rb_safe_level() >= 1) {
-	rb_raise(rb_eSecurityError, "tainted %s", name);
-    }
-    return obj;
-}
-

data/lib/shapelib/shape.rb

@@ -9,6 +9,10 @@ module Shapelib
     def latlngs
       @latlngs ||= yvals.zip(xvals)
     end
+    
+    def inspect
+      self.class.to_s + self.to_h.inspect
+    end
   end
 end
       

data/lib/shapelib/version.rb

@@ -1,3 +1,3 @@
 module Shapelib
-  VERSION = "0.7.0"
-end
+  VERSION = "0.7.2"
+end