rgeo 2.3.0 → 3.0.0.pre.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e86885f1c2a19a3b89ea73784add4644f6cbfa6afb1cf73dc0f1dda22151923
-  data.tar.gz: 83690993b988a200dc689750e31f8aabdb78fc7aade2af339a068f5adb41b9a1
+  metadata.gz: e26b01fb2fff6915756d98e206ee4bdabefeaceadae3cd0b85cb7be9ee6d8285
+  data.tar.gz: 9b94dd4e6c57e9fa5ab07c7b5fb9c622a52d843b67d146b52454933cb817a4a1
 SHA512:
-  metadata.gz: 733c109fc5858536ca56a18bac9d9ab78204365a1ea5cd2e4eb7f9d06eaf833cafb28907a547698954c5b5963be921b415b9e5cc881f7235d644be2619de482f
-  data.tar.gz: 7ab29b70bcfb8f7a58832271245a6a125861c5298db870a3ecad3ff2869aa56045fb42213b44609b44edcf7531349a205ef0e688773bab1f652508c66925730d
+  metadata.gz: 9adb8cc283c8663fb0a178eeb7a1629fe466265f7fa15c54d4e8dac4188646a2682f591a3e76d12271df5dc6c875961833600b88952d035f824933bd454211de
+  data.tar.gz: c1f7e26d5a5edcc060cac2efaa782a586c9ee95e1dda08f7af771648ecc1ea2373a1e4ba9053aae00288332e401370c7f61e254367231ceabb4fb36ad5406209

data/.yardopts

@@ -0,0 +1,6 @@
+--markup rdoc
+--output-dir ./yardoc
+lib/**/*.rb
+ext/**/*.{c,h}
+-
+doc/*.md

data/README.md

@@ -129,6 +129,7 @@ Here's the current list of available topics:
 - [Installing GEOS](https://github.com/rgeo/rgeo/blob/master/doc/Installing-GEOS.md)
 - [Factory Compatibility](https://github.com/rgeo/rgeo/blob/master/doc/Factory-Compatibility.md)
 - [Which factory should I use?](https://github.com/rgeo/rgeo/blob/master/doc/Which-factory-should-I-use.md)
+- [Geometry validity handling](https://github.com/rgeo/rgeo/blob/master/doc/Geometry-Validity.md)
 - [Examples](https://github.com/rgeo/rgeo/blob/master/doc/Examples.md)
 - [Who uses `rgeo`?](https://github.com/rgeo/rgeo/blob/master/doc/Gallery.md)
 

data/ext/geos_c_impl/analysis.c

@@ -9,6 +9,8 @@
 #include <ruby.h>
 #include <geos_c.h>
 
+#include "globals.h"
+
 #include "analysis.h"
 #include "factory.h"
 #include "errors.h"
@@ -35,9 +37,9 @@ VALUE rgeo_geos_analysis_ccw_p(VALUE self, VALUE ring)
   ring_data = RGEO_GEOMETRY_DATA_PTR(ring);
 
   coord_seq = GEOSGeom_getCoordSeq_r(ring_data->geos_context, ring_data->geom);
-  if (!coord_seq) { rb_raise(geos_error, "Could not retrieve CoordSeq from given ring."); }
+  if (!coord_seq) { rb_raise(rb_eGeosError, "Could not retrieve CoordSeq from given ring."); }
   if (!GEOSCoordSeq_isCCW_r(ring_data->geos_context, coord_seq, &is_ccw)) {
-    rb_raise(geos_error, "Could not determine if the CoordSeq is CCW.");
+    rb_raise(rb_eGeosError, "Could not determine if the CoordSeq is CCW.");
   }
 
   return is_ccw ? Qtrue : Qfalse;
@@ -47,8 +49,8 @@ VALUE rgeo_geos_analysis_ccw_p(VALUE self, VALUE ring)
 
 /**
  * call-seq:
- *   RGeo::Geos::Analysis.ccw_supported? -> true or false 
- * 
+ *   RGeo::Geos::Analysis.ccw_supported? -> true or false
+ *
  * Checks if the RGEO_GEOS_SUPPORTS_ISCCW macro is defined, returns +true+
  * if it is, +false+ otherwise
  */
@@ -62,11 +64,11 @@ VALUE rgeo_geos_analysis_supports_ccw(VALUE self)
 }
 
 
-void rgeo_init_geos_analysis(RGeo_Globals* globals)
+void rgeo_init_geos_analysis()
 {
   VALUE geos_analysis_module;
 
-  geos_analysis_module = rb_define_module_under(globals->geos_module, "Analysis");
+  geos_analysis_module = rb_define_module_under(rgeo_geos_module, "Analysis");
   rb_define_singleton_method(geos_analysis_module, "ccw_supported?", rgeo_geos_analysis_supports_ccw, 0);
   #ifdef RGEO_GEOS_SUPPORTS_ISCCW
   rb_define_singleton_method(geos_analysis_module, "ccw?", rgeo_geos_analysis_ccw_p, 1);

data/ext/geos_c_impl/analysis.h

@@ -9,8 +9,6 @@
 
 #ifdef RGEO_GEOS_SUPPORTED
 
-#include "factory.h"
-
 RGEO_BEGIN_C
 
 /*
@@ -33,7 +31,7 @@ VALUE rgeo_geos_analysis_ccw_p(VALUE self, VALUE ring);
  */
 VALUE rgeo_geos_analysis_supports_ccw(VALUE self);
 
-void rgeo_init_geos_analysis(RGeo_Globals* globals);
+void rgeo_init_geos_analysis();
 
 RGEO_END_C
 

data/ext/geos_c_impl/errors.c

@@ -8,24 +8,26 @@
 
 #ifdef RGEO_GEOS_SUPPORTED
 
+#include "globals.h"
+
 #include "errors.h"
 
 RGEO_BEGIN_C
 
-// Any error relative to RGeo.
-VALUE rgeo_error;
-// RGeo error specific to the GEOS implementation.
-VALUE geos_error;
+VALUE rb_eRGeoError;
+VALUE rb_eRGeoInvalidGeometry;
+VALUE rb_eRGeoUnsupportedOperation;
+VALUE rb_eGeosError;
 
 
 void rgeo_init_geos_errors() {
-  VALUE rgeo_module;
   VALUE error_module;
 
-  rgeo_module = rb_define_module("RGeo");
   error_module = rb_define_module_under(rgeo_module, "Error");
-  rgeo_error = rb_define_class_under(error_module, "RGeoError", rb_eRuntimeError);
-  geos_error = rb_define_class_under(error_module, "GeosError", rgeo_error);
+  rb_eRGeoError = rb_define_class_under(error_module, "RGeoError", rb_eRuntimeError);
+  rb_eRGeoInvalidGeometry = rb_define_class_under(error_module, "InvalidGeometry", rb_eRGeoError);
+  rb_eRGeoUnsupportedOperation = rb_define_class_under(error_module, "UnsupportedOperation", rb_eRGeoError);
+  rb_eGeosError = rb_define_class_under(error_module, "GeosError", rb_eRGeoError);
 }
 
 RGEO_END_C

data/ext/geos_c_impl/errors.h

@@ -8,10 +8,14 @@
 
 RGEO_BEGIN_C
 
-// Any error relative to RGeo.
-extern VALUE rgeo_error;
+// Main rgeo error type
+extern VALUE rb_eRGeoError;
+// RGeo::Error::InvalidGeometry
+extern VALUE rb_eRGeoInvalidGeometry;
+// RGeo::Error::UnsupportedOperation
+extern VALUE rb_eRGeoUnsupportedOperation;
 // RGeo error specific to the GEOS implementation.
-extern VALUE geos_error;
+extern VALUE rb_eGeosError;
 
 void rgeo_init_geos_errors();
 

data/ext/geos_c_impl/extconf.rb

@@ -14,6 +14,8 @@ if RUBY_DESCRIPTION =~ /^jruby\s/
 else
   require "mkmf"
 
+  $CFLAGS << " -DRGEO_GEOS_DEBUG" if ENV.key?("DEBUG") || ENV.key?("RGEO_GEOS_DEBUG")
+
   geosconfig = with_config("geos-config") || find_executable("geos-config")
 
   if geosconfig
@@ -33,6 +35,7 @@ else
     have_func("GEOSUnaryUnion_r", "geos_c.h")
     have_func("GEOSCoordSeq_isCCW_r", "geos_c.h")
     have_func("rb_memhash", "ruby.h")
+    have_func("rb_gc_mark_movable", "ruby.h")
   end
 
   if found_geos_