rgeo 0.3.14 → 0.3.15

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.3.15 / 2012-08-02
+
+* The class shuffle in 0.3.14 broke RGeo::Geos.is_geos? and similar. Fixed.
+
 === 0.3.14 / 2012-07-08
 
 * Compatibility note: The class names for some of the factory and feature implementations, as well as the superclass relationships, have changed in this release. These class names and hierarchy are internal, and clients should not depend on them. That is, RGeo types are generally duck-types. If you need to interrogate type, see the documentation for the ::RGeo::Feature::Type module.

data/Version

@@ -1 +1 @@
-0.3.14
+0.3.15

data/lib/rgeo/geos/capi_feature_classes.rb

@@ -96,7 +96,7 @@ module RGeo
     end
 
 
-    class CAPIGeometryImpl
+    class CAPIGeometryImpl  # :nodoc:
 
 
       include CAPIGeometryMethods
@@ -107,7 +107,7 @@ module RGeo
     end
 
 
-    class CAPIPointImpl
+    class CAPIPointImpl  # :nodoc:
 
 
       include CAPIGeometryMethods
@@ -119,7 +119,7 @@ module RGeo
     end
 
 
-    class CAPILineStringImpl
+    class CAPILineStringImpl  # :nodoc:
 
 
       include CAPIGeometryMethods
@@ -131,7 +131,7 @@ module RGeo
     end
 
 
-    class CAPILinearRingImpl
+    class CAPILinearRingImpl  # :nodoc:
 
 
       include CAPIGeometryMethods
@@ -144,7 +144,7 @@ module RGeo
     end
 
 
-    class CAPILineImpl
+    class CAPILineImpl  # :nodoc:
 
 
       include CAPIGeometryMethods
@@ -157,7 +157,7 @@ module RGeo
     end
 
 
-    class CAPIPolygonImpl
+    class CAPIPolygonImpl  # :nodoc:
 
 
       include CAPIGeometryMethods
@@ -169,7 +169,7 @@ module RGeo
     end
 
 
-    class CAPIGeometryCollectionImpl
+    class CAPIGeometryCollectionImpl  # :nodoc:
 
 
       include CAPIGeometryMethods
@@ -181,7 +181,7 @@ module RGeo
     end
 
 
-    class CAPIMultiPointImpl
+    class CAPIMultiPointImpl  # :nodoc:
 
 
       include CAPIGeometryMethods
@@ -194,7 +194,7 @@ module RGeo
     end
 
 
-    class CAPIMultiLineStringImpl
+    class CAPIMultiLineStringImpl  # :nodoc:
 
 
       include CAPIGeometryMethods
@@ -207,7 +207,7 @@ module RGeo
     end
 
 
-    class CAPIMultiPolygonImpl
+    class CAPIMultiPolygonImpl  # :nodoc:
 
 
       include CAPIGeometryMethods

data/lib/rgeo/geos/interface.rb

@@ -67,9 +67,10 @@ module RGeo
       # the given factory is a CAPI GEOS factory.
 
       def is_capi_geos?(object_)
-        CAPIFactory === object_ || CAPIGeometryImpl === object_ ||
+        CAPI_SUPPORTED &&
+          (CAPIFactory === object_ || CAPIGeometryMethods === object_ ||
           ZMFactory === object_ && CAPIFactory === object_.z_factory ||
-          ZMGeometryImpl === object_ && CAPIGeometryImpl === object_.z_geometry
+          ZMGeometryMethods === object_ && CAPIGeometryMethods === object_.z_geometry)
       end
 
 
@@ -77,9 +78,10 @@ module RGeo
       # the given factory is an FFI GEOS factory.
 
       def is_ffi_geos?(object_)
-        FFIFactory === object_ || FFIGeometryImpl === object_ ||
+        FFI_SUPPORTED &&
+          (FFIFactory === object_ || FFIGeometryMethods === object_ ||
           ZMFactory === object_ && FFIFactory === object_.z_factory ||
-          ZMGeometryImpl === object_ && FFIGeometryImpl === object_.z_geometry
+          ZMGeometryMethods === object_ && FFIGeometryMethods === object_.z_geometry)
       end
 
 
@@ -87,9 +89,9 @@ module RGeo
       # factory is a GEOS factory. Does not distinguish between CAPI and FFI.
 
       def is_geos?(object_)
-        CAPIFactory === object_ || CAPIGeometryImpl === object_ ||
-          FFIFactory === object_ || FFIGeometryImpl === object_ ||
-          ZMFactory === object_ || ZMGeometryImpl === object_
+        CAPI_SUPPORTED && (CAPIFactory === object_ || CAPIGeometryMethods === object_) ||
+          FFI_SUPPORTED && (FFIFactory === object_ || FFIGeometryMethods === object_) ||
+          ZMFactory === object_ || ZMGeometryMethods === object_
       end
 
 

data/test/geos_capi/tc_factory.rb

@@ -56,6 +56,13 @@ module RGeo
         include ::RGeo::Tests::Common::FactoryTests
 
 
+        def test_is_geos_factory
+          assert_equal(true, ::RGeo::Geos.is_geos?(@factory))
+          assert_equal(true, ::RGeo::Geos.is_capi_geos?(@factory))
+          assert_equal(false, ::RGeo::Geos.is_ffi_geos?(@factory))
+        end
+
+
       end
 
     end

data/test/geos_capi/tc_point.rb

@@ -58,6 +58,18 @@ module RGeo
         include ::RGeo::Tests::Common::PointTests
 
 
+        def test_is_geos
+          point_ = @factory.point(21, -22)
+          assert_equal(true, ::RGeo::Geos.is_geos?(point_))
+          assert_equal(true, ::RGeo::Geos.is_capi_geos?(point_))
+          assert_equal(false, ::RGeo::Geos.is_ffi_geos?(point_))
+          point2_ = @zmfactory.point(21, -22, 0, 0)
+          assert_equal(true, ::RGeo::Geos.is_geos?(point2_))
+          assert_equal(true, ::RGeo::Geos.is_capi_geos?(point2_))
+          assert_equal(false, ::RGeo::Geos.is_ffi_geos?(point2_))
+        end
+
+
         def test_has_no_projection
           point_ = @factory.point(21, -22)
           assert(!point_.respond_to?(:projection))

data/test/geos_capi/tc_zmfactory.rb

@@ -56,6 +56,13 @@ module RGeo
         include ::RGeo::Tests::Common::FactoryTests
 
 
+        def test_is_geos_factory
+          assert_equal(true, ::RGeo::Geos.is_geos?(@factory))
+          assert_equal(true, ::RGeo::Geos.is_capi_geos?(@factory))
+          assert_equal(false, ::RGeo::Geos.is_ffi_geos?(@factory))
+        end
+
+
         def test_factory_parts
           assert_equal(1000, @factory.srid)
           assert_equal(1000, @factory.z_factory.srid)

data/test/geos_ffi/tc_factory.rb

@@ -56,6 +56,13 @@ module RGeo
         include ::RGeo::Tests::Common::FactoryTests
 
 
+        def test_is_geos_factory
+          assert_equal(true, ::RGeo::Geos.is_geos?(@factory))
+          assert_equal(false, ::RGeo::Geos.is_capi_geos?(@factory))
+          assert_equal(true, ::RGeo::Geos.is_ffi_geos?(@factory))
+        end
+
+
       end
 
     end

data/test/geos_ffi/tc_point.rb

@@ -64,6 +64,18 @@ module RGeo
         # END_TEMP
 
 
+        def test_is_geos
+          point_ = @factory.point(21, -22)
+          assert_equal(true, ::RGeo::Geos.is_geos?(point_))
+          assert_equal(false, ::RGeo::Geos.is_capi_geos?(point_))
+          assert_equal(true, ::RGeo::Geos.is_ffi_geos?(point_))
+          point2_ = @zmfactory.point(21, -22, 0, 0)
+          assert_equal(true, ::RGeo::Geos.is_geos?(point2_))
+          assert_equal(false, ::RGeo::Geos.is_capi_geos?(point2_))
+          assert_equal(true, ::RGeo::Geos.is_ffi_geos?(point2_))
+        end
+
+
         def test_has_no_projection
           point_ = @factory.point(21, -22)
           assert(!point_.respond_to?(:projection))

data/test/geos_ffi/tc_zmfactory.rb

@@ -57,6 +57,13 @@ module RGeo
         include ::RGeo::Tests::Common::FactoryTests
 
 
+        def test_is_geos_factory
+          assert_equal(true, ::RGeo::Geos.is_geos?(@factory))
+          assert_equal(false, ::RGeo::Geos.is_capi_geos?(@factory))
+          assert_equal(true, ::RGeo::Geos.is_ffi_geos?(@factory))
+        end
+
+
         def test_factory_parts
           assert_equal(1000, @factory.srid)
           assert_equal(1000, @factory.z_factory.srid)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies: []
 description: RGeo is a geospatial data library for Ruby. It provides an implementation
   of the Open Geospatial Consortium's Simple Features Specification, used by most