ffi-geos 0.0.1.beta2 → 0.0.1.beta3

data/VERSION

@@ -1 +1 @@
-0.0.1.beta2
+0.0.1.beta3

data/ffi-geos.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-geos}
-  s.version = "0.0.1.beta2"
+  s.version = "0.0.1.beta3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["J Smith"]
-  s.date = %q{2011-05-11}
+  s.date = %q{2011-05-20}
   s.description = %q{An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).}
   s.email = %q{dark.panda@gmail.com}
   s.extra_rdoc_files = [
@@ -21,26 +21,26 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "ffi-geos.gemspec",
-    "lib/buffer_params.rb",
-    "lib/coordinate_sequence.rb",
     "lib/ffi-geos.rb",
-    "lib/geometry.rb",
-    "lib/geometry_collection.rb",
-    "lib/line_string.rb",
-    "lib/linear_ring.rb",
-    "lib/multi_line_string.rb",
-    "lib/multi_point.rb",
-    "lib/multi_polygon.rb",
-    "lib/point.rb",
-    "lib/polygon.rb",
-    "lib/prepared_geometry.rb",
-    "lib/strtree.rb",
-    "lib/tools.rb",
-    "lib/utils.rb",
-    "lib/wkb_reader.rb",
-    "lib/wkb_writer.rb",
-    "lib/wkt_reader.rb",
-    "lib/wkt_writer.rb",
+    "lib/ffi-geos/buffer_params.rb",
+    "lib/ffi-geos/coordinate_sequence.rb",
+    "lib/ffi-geos/geometry.rb",
+    "lib/ffi-geos/geometry_collection.rb",
+    "lib/ffi-geos/line_string.rb",
+    "lib/ffi-geos/linear_ring.rb",
+    "lib/ffi-geos/multi_line_string.rb",
+    "lib/ffi-geos/multi_point.rb",
+    "lib/ffi-geos/multi_polygon.rb",
+    "lib/ffi-geos/point.rb",
+    "lib/ffi-geos/polygon.rb",
+    "lib/ffi-geos/prepared_geometry.rb",
+    "lib/ffi-geos/strtree.rb",
+    "lib/ffi-geos/tools.rb",
+    "lib/ffi-geos/utils.rb",
+    "lib/ffi-geos/wkb_reader.rb",
+    "lib/ffi-geos/wkb_writer.rb",
+    "lib/ffi-geos/wkt_reader.rb",
+    "lib/ffi-geos/wkt_writer.rb",
     "test/coordinate_sequence_tests.rb",
     "test/geometry_tests.rb",
     "test/misc_tests.rb",
@@ -58,20 +58,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.7.2}
   s.summary = %q{An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).}
-  s.test_files = [
-    "test/coordinate_sequence_tests.rb",
-    "test/geometry_tests.rb",
-    "test/misc_tests.rb",
-    "test/point_tests.rb",
-    "test/prepared_geometry_tests.rb",
-    "test/strtree_tests.rb",
-    "test/test_helper.rb",
-    "test/utils_tests.rb",
-    "test/wkb_reader_tests.rb",
-    "test/wkb_writer_tests.rb",
-    "test/wkt_reader_tests.rb",
-    "test/wkt_writer_tests.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/ffi-geos.rb

@@ -3,7 +3,7 @@ require 'ffi'
 require 'rbconfig'
 
 module Geos
-  GEOS_BASE = File.dirname(__FILE__)
+  GEOS_BASE = File.join(File.dirname(__FILE__), 'ffi-geos')
 
   autoload :WktReader,
     File.join(GEOS_BASE, 'wkt_reader')
@@ -1023,7 +1023,7 @@ module Geos
   end
 
   module VersionConstants
-    VERSION = File.read(File.join(GEOS_BASE, %w{ .. VERSION })).strip
+    VERSION = File.read(File.join(GEOS_BASE, %w{ .. .. VERSION })).strip
     GEOS_JTS_PORT = Geos.jts_port
     GEOS_VERSION,
       GEOS_VERSION_MAJOR, GEOS_VERSION_MINOR, GEOS_VERISON_PATCH, GEOS_VERSION_PRERELEASE,

data/lib/{buffer_params.rb → ffi-geos/buffer_params.rb}

@@ -9,6 +9,8 @@ module Geos
       :quad_segs, :endcap, :join, :mitre_limit, :single_sided
     ].freeze
 
+    undef :clone, :dup
+
     # The defaults for the params according to GEOS are as found in
     # Geos::Constants::BUFFER_PARAMS_DEFAULTS. Note that when setting the
     # :quad_segs value that you should set it before setting other values like

data/lib/{coordinate_sequence.rb → ffi-geos/coordinate_sequence.rb}

@@ -29,6 +29,17 @@ module Geos
         ptr,
         auto_free ? self.class.method(:release) : self.class.method(:no_release)
       )
+
+      if !auto_free
+        @ptr.autorelease = false
+      end
+    end
+
+    def initialize_copy(source)
+      @ptr = FFI::AutoPointer.new(
+        FFIGeos.GEOSCoordSeq_clone_r(Geos.current_handle, source.ptr),
+        self.class.method(:release)
+      )
     end
 
     def self.no_release(ptr) #:nodoc:
@@ -38,10 +49,6 @@ module Geos
       FFIGeos.GEOSCoordSeq_destroy_r(Geos.current_handle, ptr)
     end
 
-    def clone
-      self.class.new(FFIGeos.GEOSCoordSeq_clone_r(Geos.current_handle, self.ptr))
-    end
-
     # Yields coordinates as [ x, y, z ]. The z coordinate may be omitted for
     # 2-dimensional CoordinateSequences.
     def each

data/lib/{geometry.rb → ffi-geos/geometry.rb}

@@ -12,6 +12,17 @@ module Geos
         ptr,
         auto_free ? self.class.method(:release) : self.class.method(:no_release)
       )
+
+      if !auto_free
+        @ptr.autorelease = false
+      end
+    end
+
+    def initialize_copy(source)
+      @ptr = FFI::AutoPointer.new(
+        FFIGeos.GEOSGeom_clone_r(Geos.current_handle, source.ptr),
+        self.class.method(:release)
+      )
     end
 
     def self.no_release(ptr) #:nodoc:
@@ -21,10 +32,6 @@ module Geos
       FFIGeos.GEOSGeom_destroy_r(Geos.current_handle, ptr)
     end
 
-    def clone
-      cast_geometry_ptr(FFIGeos.GEOSGeom_clone_r(Geos.current_handle, ptr))
-    end
-
     # Returns the name of the Geometry type, i.e. "Point", "Polygon", etc.
     def geom_type
       FFIGeos.GEOSGeomType_r(Geos.current_handle, self.ptr)

data/lib/{geometry_collection.rb → ffi-geos/geometry_collection.rb}

@@ -18,6 +18,7 @@ module Geos
         cast_geometry_ptr(FFIGeos.GEOSGetGeometryN_r(Geos.current_handle, self.ptr, n), false)
       end
     end
+    alias :geometry_n :get_geometry_n
 
     def [](*args)
       self.to_a[*args]

data/lib/{prepared_geometry.rb → ffi-geos/prepared_geometry.rb}

@@ -5,11 +5,17 @@ module Geos
 
     attr_reader :ptr
 
+    undef :clone, :dup
+
     def initialize(ptr, auto_free = true)
       @ptr = FFI::AutoPointer.new(
         ptr,
         auto_free ? self.class.method(:release) : self.class.method(:no_release)
       )
+
+      if !auto_free
+        @ptr.autorelease = false
+      end
     end
 
     def self.no_release(ptr) #:nodoc:

data/lib/{strtree.rb → ffi-geos/strtree.rb}

@@ -6,6 +6,8 @@ module Geos
 
     attr_reader :ptr
 
+    undef :clone, :dup
+
     def initialize(capacity)
       ptr = FFIGeos.GEOSSTRtree_create_r(Geos.current_handle, capacity)
 

data/lib/{utils.rb → ffi-geos/utils.rb}

@@ -31,8 +31,10 @@ module Geos
           raise RuntimeError.new("IllegalArgumentException: Point coordinate list must contain a single element")
         end
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createPoint_r(Geos.current_handle, cs.ptr)).tap {
-          cs.ptr.autorelease = false
+        cs_clone = cs.clone
+
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createPoint_r(Geos.current_handle, cs_clone.ptr)).tap {
+          cs_clone.ptr.autorelease = false
         }
       end
 
@@ -41,8 +43,10 @@ module Geos
           raise RuntimeError.new("IllegalArgumentException: point array must contain 0 or >1 elements")
         end
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createLineString_r(Geos.current_handle, cs.ptr)).tap {
-          cs.ptr.autorelease = false
+        cs_clone = cs.clone
+
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createLineString_r(Geos.current_handle, cs_clone.ptr)).tap {
+          cs_clone.ptr.autorelease = false
         }
       end
 
@@ -51,8 +55,10 @@ module Geos
           raise RuntimeError.new("IllegalArgumentException: point array must contain 0 or >1 elements")
         end
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createLinearRing_r(Geos.current_handle, cs.ptr)).tap {
-          cs.ptr.autorelease = false
+        cs_clone = cs.clone
+
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createLinearRing_r(Geos.current_handle, cs_clone.ptr)).tap {
+          cs_clone.ptr.autorelease = false
         }
       end
 
@@ -63,12 +69,15 @@ module Geos
           end
         }
 
+        outer_clone = outer.clone
+        inner_clones = inner.map(&:clone)
+
         ary = FFI::MemoryPointer.new(:pointer, inner.length)
-        ary.write_array_of_pointer(inner.map(&:ptr))
+        ary.write_array_of_pointer(inner_clones.map(&:ptr))
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createPolygon_r(Geos.current_handle, outer.ptr, ary, inner.length)).tap {
-          outer.ptr.autorelease = false
-          inner.each { |i| i.ptr.autorelease = false }
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createPolygon_r(Geos.current_handle, outer_clone.ptr, ary, inner_clones.length)).tap {
+          outer_clone.ptr.autorelease = false
+          inner_clones.each { |i| i.ptr.autorelease = false }
         }
       end
 
@@ -125,11 +134,15 @@ module Geos
           end
         }
 
+        geoms_clones = geoms.map(&:clone)
+
         ary = FFI::MemoryPointer.new(:pointer, geoms.length)
-        ary.write_array_of_pointer(geoms.map(&:ptr))
+        ary.write_array_of_pointer(geoms_clones.map(&:ptr))
 
-        cast_geometry_ptr(FFIGeos.GEOSGeom_createCollection_r(Geos.current_handle, t, ary, geoms.length)).tap {
-          geoms.each { |i| i.ptr.autorelease = false }
+        cast_geometry_ptr(FFIGeos.GEOSGeom_createCollection_r(Geos.current_handle, t, ary, geoms_clones.length)).tap {
+          geoms_clones.each { |i|
+            i.ptr.autorelease = false
+          }
         }
       end
 

data/test/coordinate_sequence_tests.rb

@@ -67,4 +67,26 @@ class CoordinateSequenceTests < Test::Unit::TestCase
     assert_raise(RuntimeError) { @cs.get_ordinate(10, 0) }
     assert_raise(RuntimeError) { @cs.get_ordinate(-1, 0) }
   end
+
+  def test_clone
+    @cs.set_x(0, 1)
+    @cs.set_y(0, 2)
+
+    cs_b = @cs.clone
+
+    assert_equal(@cs.get_x(0), cs_b.get_x(0))
+    assert_equal(@cs.get_y(0), cs_b.get_y(0))
+    assert_equal(@cs.dimensions, cs_b.dimensions)
+  end
+
+  def test_dup
+    @cs.set_x(0, 1)
+    @cs.set_y(0, 2)
+
+    cs_b = @cs.dup
+
+    assert_equal(@cs.get_x(0), cs_b.get_x(0))
+    assert_equal(@cs.get_y(0), cs_b.get_y(0))
+    assert_equal(@cs.dimensions, cs_b.dimensions)
+  end
 end

data/test/geometry_tests.rb

@@ -1516,4 +1516,18 @@ class GeometryTests < Test::Unit::TestCase
       ], geom[1..2].collect { |g| write(g) })
     end
   end
+
+  def test_clone
+    geom_a = read('POINT(0 0)')
+    geom_b = geom_a.clone
+
+    assert(geom_a.eql?(geom_b))
+  end
+
+  def test_dup
+    geom_a = read('POINT(0 0)')
+    geom_b = geom_a.dup
+
+    assert(geom_a.eql?(geom_b))
+  end
 end

data/test/misc_tests.rb

@@ -50,4 +50,49 @@ class MiscTests < Test::Unit::TestCase
       "t2: [false]"
     ], @messages.sort)
   end
+
+  def test_segfault_on_cs_ownership
+    cs = Geos::CoordinateSequence.new(1, 2)
+    cs.set_x(0, 1)
+    cs.set_y(0, 2)
+
+    point = Geos.create_point(cs)
+    collection_a = Geos.create_geometry_collection(point)
+    collection_b = Geos.create_geometry_collection(point)
+
+    GC.start
+
+    writer.rounding_precision = 0
+
+    assert_equal('POINT (1 2)', write(point))
+    assert_equal(collection_a[0], point)
+    assert_equal(collection_a[0], collection_b[0])
+  end
+
+  def test_segfault_on_geom_ownership
+    point = read('POINT (10 20)')
+
+    collection_a = Geos.create_geometry_collection(point)
+    collection_b = Geos.create_geometry_collection(collection_a[0])
+
+    GC.start
+
+    writer.rounding_precision = 0
+
+    assert_equal('POINT (10 20)', write(point))
+    assert_equal(collection_a[0], point)
+    assert_equal(collection_a[0], collection_b[0])
+  end
+
+  def test_cant_clone_buffer_params
+    assert_raise(NoMethodError) do
+      Geos::BufferParams.new.clone
+    end
+  end
+
+  def test_cant_dup_buffer_params
+    assert_raise(NoMethodError) do
+      Geos::BufferParams.new.dup
+    end
+  end
 end

data/test/prepared_geometry_tests.rb

@@ -70,5 +70,17 @@ if defined?(Geos::PreparedGeometry)
     def test_covered_by
       relationship_tester(:covered_by?, true, true, true, false, false, true, false, false)
     end
+
+    def test_cant_clone
+      assert_raise(NoMethodError) do
+        read(POINT_A).to_prepared.clone
+      end
+    end
+
+    def test_cant_dup
+      assert_raise(NoMethodError) do
+        read(POINT_A).to_prepared.dup
+      end
+    end
   end
 end

data/test/strtree_tests.rb

@@ -50,5 +50,17 @@ if defined?(Geos::STRtree)
       assert_equal(2, @tree.query(read('LINESTRING(25 25, 26 26)')).length)
       assert_equal(2, @tree.query(read('LINESTRING(0 0, 100 100)')).length)
     end
+
+    def test_cant_clone
+      assert_raise(NoMethodError) do
+        Geos::STRtree.new(3).clone
+      end
+    end
+
+    def test_cant_dup
+      assert_raise(NoMethodError) do
+        Geos::STRtree.new(3).dup
+      end
+    end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-geos
 version: !ruby/object:Gem::Version 
-  hash: 62196399
+  hash: 62196397
   prerelease: 6
   segments: 
   - 0
   - 0
   - 1
   - beta
-  - 2
-  version: 0.0.1.beta2
+  - 3
+  version: 0.0.1.beta3
 platform: ruby
 authors: 
 - J Smith
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 Z
+date: 2011-05-20 00:00:00 Z
 dependencies: []
 
 description: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
@@ -34,26 +34,26 @@ files:
 - Rakefile
 - VERSION
 - ffi-geos.gemspec
-- lib/buffer_params.rb
-- lib/coordinate_sequence.rb
 - lib/ffi-geos.rb
-- lib/geometry.rb
-- lib/geometry_collection.rb
-- lib/line_string.rb
-- lib/linear_ring.rb
-- lib/multi_line_string.rb
-- lib/multi_point.rb
-- lib/multi_polygon.rb
-- lib/point.rb
-- lib/polygon.rb
-- lib/prepared_geometry.rb
-- lib/strtree.rb
-- lib/tools.rb
-- lib/utils.rb
-- lib/wkb_reader.rb
-- lib/wkb_writer.rb
-- lib/wkt_reader.rb
-- lib/wkt_writer.rb
+- lib/ffi-geos/buffer_params.rb
+- lib/ffi-geos/coordinate_sequence.rb
+- lib/ffi-geos/geometry.rb
+- lib/ffi-geos/geometry_collection.rb
+- lib/ffi-geos/line_string.rb
+- lib/ffi-geos/linear_ring.rb
+- lib/ffi-geos/multi_line_string.rb
+- lib/ffi-geos/multi_point.rb
+- lib/ffi-geos/multi_polygon.rb
+- lib/ffi-geos/point.rb
+- lib/ffi-geos/polygon.rb
+- lib/ffi-geos/prepared_geometry.rb
+- lib/ffi-geos/strtree.rb
+- lib/ffi-geos/tools.rb
+- lib/ffi-geos/utils.rb
+- lib/ffi-geos/wkb_reader.rb
+- lib/ffi-geos/wkb_writer.rb
+- lib/ffi-geos/wkt_reader.rb
+- lib/ffi-geos/wkt_writer.rb
 - test/coordinate_sequence_tests.rb
 - test/geometry_tests.rb
 - test/misc_tests.rb
@@ -101,16 +101,5 @@ rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
-test_files: 
-- test/coordinate_sequence_tests.rb
-- test/geometry_tests.rb
-- test/misc_tests.rb
-- test/point_tests.rb
-- test/prepared_geometry_tests.rb
-- test/strtree_tests.rb
-- test/test_helper.rb
-- test/utils_tests.rb
-- test/wkb_reader_tests.rb
-- test/wkb_writer_tests.rb
-- test/wkt_reader_tests.rb
-- test/wkt_writer_tests.rb
+test_files: []
+