ffi-geos 0.1.2 → 0.2.1

data/lib/ffi-geos.rb

@@ -975,14 +975,17 @@ module Geos
     attr_reader :ptr
 
     def initialize
-      @ptr = FFIGeos.initGEOS_r(
-        @notice_handler = self.method(:notice_handler),
-        @error_handler = self.method(:error_handler)
+      @ptr = FFI::AutoPointer.new(
+        FFIGeos.initGEOS_r(
+          @notice_handler = self.method(:notice_handler),
+          @error_handler = self.method(:error_handler)
+        ),
+        self.class.method(:release)
       )
+    end
 
-      Kernel.at_exit {
-        FFIGeos.finishGEOS_r(@ptr)
-      }
+    def self.release(ptr)
+      FFIGeos.finishGEOS_r(ptr)
     end
 
     def notice_handler(*args)

data/lib/ffi-geos/geometry.rb

@@ -8,13 +8,18 @@ module Geos
 
     # For internal use. Geometry objects should be created via WkbReader,
     # WktReader and the various Geos.create_* methods.
-    def initialize(ptr, auto_free = true)
+    def initialize(ptr, options = {})
+      options = {
+        :auto_free => true
+      }.merge(options)
+
       @ptr = FFI::AutoPointer.new(
         ptr,
         self.class.method(:release)
       )
 
-      @ptr.autorelease = auto_free
+      @ptr.autorelease = !!options[:auto_free]
+      @parent = options[:parent] if options[:parent]
     end
 
     def initialize_copy(source)

data/lib/ffi-geos/linear_ring.rb

@@ -5,5 +5,9 @@ module Geos
     def to_polygon
       Geos.create_polygon(self, :srid => pick_srid_according_to_policy(self.srid))
     end
+
+    def to_line_string
+      Geos.create_line_string(self.coord_seq, :srid => pick_srid_according_to_policy(self.srid))
+    end
   end
 end

data/lib/ffi-geos/polygon.rb

@@ -13,7 +13,8 @@ module Geos
         cast_geometry_ptr(
           FFIGeos.GEOSGetInteriorRingN_r(Geos.current_handle, self.ptr, n), {
             :auto_free => false,
-            :srid_copy => self.srid
+            :srid_copy => self.srid,
+            :parent => self
           }
         )
       end
@@ -24,7 +25,8 @@ module Geos
       cast_geometry_ptr(
         FFIGeos.GEOSGetExteriorRing_r(Geos.current_handle, self.ptr), {
           :auto_free => false,
-          :srid_copy => self.srid
+          :srid_copy => self.srid,
+          :parent => self
         }
       )
     end

data/lib/ffi-geos/prepared_geometry.rb

@@ -8,21 +8,20 @@ module Geos
 
     undef :clone, :dup
 
-    def initialize(geom, auto_free = true)
+    def initialize(geom, options = {})
       check_geometry(geom)
 
+      options = {
+        :auto_free => true
+      }.merge(options)
+
       @ptr = FFI::AutoPointer.new(
         FFIGeos.GEOSPrepare_r(Geos.current_handle, geom.ptr),
-        auto_free ? self.class.method(:release) : self.class.method(:no_release)
+        self.class.method(:release)
       )
       @geometry = geom
 
-      if !auto_free
-        @ptr.autorelease = false
-      end
-    end
-
-    def self.no_release(ptr) #:nodoc:
+      @ptr.autorelease = !!options[:auto_free]
     end
 
     def self.release(ptr) #:nodoc:

data/lib/ffi-geos/tools.rb

@@ -34,7 +34,7 @@ module Geos
           raise RuntimeError.new("Invalid geometry type")
       end
 
-      klass.new(geom_ptr, options[:auto_free]).tap { |ret|
+      klass.new(geom_ptr, options).tap { |ret|
         if options[:srid]
           ret.srid = options[:srid] || 0
         elsif options[:srid_copy]

data/lib/ffi-geos/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Geos
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end
 

data/test/linear_ring_tests.rb

@@ -6,11 +6,23 @@ require 'test_helper'
 class LinearRingTests < MiniTest::Unit::TestCase
   include TestHelper
 
+  def setup
+    super
+    writer.trim = true
+  end
+
   def test_to_polygon
     geom = read('POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))')
     ring = geom.exterior_ring
 
-    assert_equal(write(geom), write(ring.to_polygon))
+    assert_equal('POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))', write(ring.to_polygon))
+  end
+
+  def test_to_line_string
+    geom = read('POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))')
+    ring = geom.exterior_ring
+
+    assert_equal('LINESTRING (0 0, 5 0, 5 5, 0 5, 0 0)', write(ring.to_line_string))
   end
 
   def test_to_polygon_with_srid

metadata

@@ -1,29 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: ffi
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :runtime
-  prerelease: false
-  name: ffi
 description: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
 email: dark.panda@gmail.com
 executables: []
@@ -78,26 +81,27 @@ files:
 - test/wkt_writer_tests.rb
 homepage: http://github.com/dark-panda/ffi-geos
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+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

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTIxMDI2MjAzYTBlNmI2MTJlNDU2NzVkN2I2ZGJhY2U5MmVmMWNmYQ==
-  data.tar.gz: !binary |-
-    MjY3YWI1MzAzMTNkZDhlNDEyMzRkNTlmOGE1NzA5MWQ3NzliNWU1Yw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZjRhYjc0ZDdjMWE3YzllYmRlYmQ4MmZjMDM1MWFhNTZjNTFjOTUzNWY0YmFm
-    ODcxNzY0MTBkOWVhNmUxNzdjZjE2ZTZiOTA4YTM2OGI5YTRiNDgzMWM4Mzdk
-    YWQ3NWNjOThmM2VlOThmMTI4YmQwNDQyMjcxOTMzOWZkMjcwNGE=
-  data.tar.gz: !binary |-
-    YjU2NTI1NjZjM2VhNDE0ZmI4Y2NlMzhmYmEwNzY3OWQzNjk3NWY4ZmE1MDhl
-    NzAxOGJlYmJmZWIxMTcyZTlmZGI1YzBmODMwNmFmM2Y2MDBhZTZjZGFiMzUz
-    MTljMGQ3NThjYTYxMTdlODYyMWQzMjhjMjIwMGRmNWFmMzNlOTM=