ffi-geos 0.0.1.beta3 → 0.0.1

data/README.rdoc

@@ -1,5 +1,5 @@
 
-= GEOS Ruby Bindings in FFI
+= GEOS Ruby Bindings via FFI
 
 == Requirements
 
@@ -12,8 +12,12 @@ Ruby versions known to work:
 * Ruby MRI 1.8.7 and 1.9.2, x86_64, OSX 10.6.5+
 * Ruby MRI 1.8.7 and 1.9.2, i386, linux
 * Ruby MRI 1.8.7, x86_64, linux
-* JRuby 1.5 and 1.6 using JRE 1.6.0_22, x86_64, OSX 10.6.5+
-* JRuby 1.5 and 1.6 using JRE 1.6.0_18, i386, linux
+
+Note that versions of JRuby prior to the as-of-yet (25 June 2011) unreleased
+version 1.6.3 have problems in their ffi implementation when dealing with
+AutoPointers that can lead to segfaults during garbage collection. Upcoming
+versions of JRuby should have the problem licked. For details, check out
+http://jira.codehaus.org/browse/JRUBY-5813.
 
 == Features
 
@@ -135,3 +139,11 @@ Ruby bindings along with the following enhancements and additions:
 === Geos::Utils
 
 * Geos::Utils.orientation_index
+
+== Thanks
+
+* Thanks to Daniel Azuma for the testing and JRuby help.
+
+* Christopher Meiklejohn for the bug reporting and PreparedGeometry fix.
+
+* Wayne Meissner for some help with some ffi issues.

data/Rakefile

@@ -2,9 +2,9 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 $:.push 'lib'
 

data/VERSION

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

data/ffi-geos.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-geos}
-  s.version = "0.0.1.beta3"
+  s.version = "0.0.1"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["J Smith"]
-  s.date = %q{2011-05-20}
+  s.date = %q{2011-06-25}
   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 = [

data/lib/ffi-geos/geometry.rb

@@ -466,7 +466,7 @@ module Geos
     end
 
     def to_prepared
-      Geos::PreparedGeometry.new(FFIGeos.GEOSPrepare_r(Geos.current_handle, self.ptr))
+      Geos::PreparedGeometry.new(self)
     end
 
     def to_s

data/lib/ffi-geos/prepared_geometry.rb

@@ -3,15 +3,18 @@ module Geos
   class PreparedGeometry
     include Geos::Tools
 
-    attr_reader :ptr
+    attr_reader :ptr, :geometry
 
     undef :clone, :dup
 
-    def initialize(ptr, auto_free = true)
+    def initialize(geom, auto_free = true)
+      check_geometry(geom)
+
       @ptr = FFI::AutoPointer.new(
-        ptr,
+        FFIGeos.GEOSPrepare_r(Geos.current_handle, geom.ptr),
         auto_free ? self.class.method(:release) : self.class.method(:no_release)
       )
+      @geometry = geom
 
       if !auto_free
         @ptr.autorelease = false

data/test/prepared_geometry_tests.rb

@@ -82,5 +82,11 @@ if defined?(Geos::PreparedGeometry)
         read(POINT_A).to_prepared.dup
       end
     end
+
+    def test_initializer_type_exception
+      assert_raise(TypeError) do
+        Geos::PreparedGeometry.new('hello world')
+      end
+    end
   end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-geos
 version: !ruby/object:Gem::Version 
-  hash: 62196397
-  prerelease: 6
+  hash: 29
+  prerelease: 
   segments: 
   - 0
   - 0
   - 1
-  - beta
-  - 3
-  version: 0.0.1.beta3
+  version: 0.0.1
 platform: ruby
 authors: 
 - J Smith
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 Z
+date: 2011-06-25 00:00:00 Z
 dependencies: []
 
 description: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
@@ -86,14 +84,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: