ffi-geos 0.0.2 → 0.0.3

data/README.rdoc

@@ -146,3 +146,6 @@ Ruby bindings along with the following enhancements and additions:
 * Christopher Meiklejohn for the bug reporting and PreparedGeometry fix.
 
 * Wayne Meissner for some help with some ffi issues.
+
+* Charlie Savage for the original SWIG-based GEOS bindings implementation and
+  some fixes for MinGW.

data/Rakefile

@@ -4,7 +4,7 @@
 require 'rubygems'
 require 'rubygems/package_task'
 require 'rake/testtask'
-require 'rdoc/task'
+require 'rake/rdoctask'
 
 $:.push 'lib'
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/ffi-geos.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-geos}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["J Smith"]
-  s.date = %q{2011-07-22}
+  s.authors = [%q{J Smith}]
+  s.date = %q{2011-08-22}
   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 = [
@@ -55,8 +55,8 @@ Gem::Specification.new do |s|
     "test/wkt_writer_tests.rb"
   ]
   s.homepage = %q{http://github.com/dark-panda/ffi-geos}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.8}
   s.summary = %q{An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).}
 
   if s.respond_to? :specification_version then

data/lib/ffi-geos.rb

@@ -45,29 +45,32 @@ module Geos
     File.join(GEOS_BASE, 'utils')
 
   module FFIGeos
-    def self.geos_library_paths
-      return @geos_library_paths if @geos_library_paths
-
-      paths = if ENV['GEOS_LIBRARY_PATH']
-        [ ENV['GEOS_LIBRARY_PATH'] ]
-      else
-        [ '/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}' ]
+    def self.search_paths
+      @search_paths ||= begin
+        if ENV['GEOS_LIBRARY_PATH']
+          [ ENV['GEOS_LIBRARY_PATH'] ]
+        elsif FFI::Platform::IS_WINDOWS
+          ENV['PATH'].split(File::PATH_SEPARATOR)
+        else
+          [ '/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}' ]
+        end
       end
+    end
 
-      libs = if [
-        Config::CONFIG['arch'],
-        Config::CONFIG['host_os']
-      ].detect { |c| c =~ /darwin/ }
-        %w{ libgeos_c.dylib libgeos.dylib }
-      else
-        %w{ libgeos.so libgeos_c.so }
-      end
+    def self.find_lib(lib)
+      search_paths.inject(Array.new) { |array, path|
+        file_name = File.expand_path(File.join(path, "#{lib}.#{FFI::Platform::LIBSUFFIX}"))
+        array << Dir.glob(file_name)
+      }.flatten.sort.compact.first
+    end
 
-      @geos_library_paths = libs.collect { |lib|
-        Dir.glob(paths.collect { |path|
-          "#{path}/#{lib}"
-        }).first
-      }
+    def self.geos_library_paths
+      @geos_library_paths ||= begin
+        # On MingW the libraries have version numbers
+        [ 'libgeos_c{,-?}', 'libgeos{,-?-?-?}' ].map { |lib|
+          find_lib(lib)
+        }.compact
+      end
     end
 
     extend ::FFI::Library

data/lib/ffi-geos/coordinate_sequence.rb

@@ -154,12 +154,20 @@ module Geos
     end
     alias :size :length
 
+    def empty?
+      self.length == 0
+    end
+
     def dimensions
       @dimensions ||= FFI::MemoryPointer.new(:int).tap { |ret|
         FFIGeos.GEOSCoordSeq_getDimensions_r(Geos.current_handle, self.ptr, ret)
       }.read_int
     end
 
+    def to_point
+      Geos.create_point(self)
+    end
+
     def to_linear_ring
       Geos.create_linear_ring(self)
     end
@@ -172,6 +180,12 @@ module Geos
       Geos.create_polygon(self)
     end
 
+    def to_s
+      self.entries.collect { |entry|
+        entry.join(' ')
+      }.join(', ')
+    end
+
     protected
 
     def check_bounds(idx) #:nodoc:

data/lib/ffi-geos/geometry.rb

@@ -23,6 +23,9 @@ module Geos
         FFIGeos.GEOSGeom_clone_r(Geos.current_handle, source.ptr),
         self.class.method(:release)
       )
+
+      # Copy over SRID since GEOS does not
+      self.srid = source.srid
     end
 
     def self.no_release(ptr) #:nodoc:

data/test/coordinate_sequence_tests.rb

@@ -123,6 +123,11 @@ class CoordinateSequenceTests < Test::Unit::TestCase
     end
   end
 
+  def test_to_point
+    cs = Geos::CoordinateSequence.new([5,7])
+    assert_equal('POINT (5 7)', write(cs.to_point, :trim => true))
+  end
+
   def test_to_to_linear_ring
     cs = Geos::CoordinateSequence.new([
       [ 0, 0 ],
@@ -135,6 +140,14 @@ class CoordinateSequenceTests < Test::Unit::TestCase
     assert_equal('LINEARRING (0 0, 0 5, 5 5, 5 0, 0 0)', write(cs.to_linear_ring, :trim => true))
   end
 
+  def test_empty
+    cs = Geos::CoordinateSequence.new
+    assert(cs.empty?)
+
+    cs = Geos::CoordinateSequence.new([4,1])
+    assert(!cs.empty?)
+  end
+
   def test_to_empty_linear_ring
     cs = Geos::CoordinateSequence.new
 
@@ -175,4 +188,12 @@ class CoordinateSequenceTests < Test::Unit::TestCase
 
     assert_equal('POLYGON EMPTY', write(cs.to_polygon, :trim => true))
   end
+
+  def test_to_s
+    cs = Geos::CoordinateSequence.new([[1, 2], [10, 11]])
+    assert_equal("1.0 2.0, 10.0 11.0", cs.to_s)
+
+    cs = Geos::CoordinateSequence.new([[1, 2, 3], [10, 11, 12]])
+    assert_equal("1.0 2.0 3.0, 10.0 11.0 12.0", cs.to_s)
+  end
 end

data/test/geometry_tests.rb

@@ -1524,6 +1524,16 @@ class GeometryTests < Test::Unit::TestCase
     assert(geom_a.eql?(geom_b))
   end
 
+  def test_clone_srid
+    srid = 4326
+    geom_a = read('POINT(0 0)')
+    geom_a.srid = srid
+    geom_b = geom_a.clone
+
+    assert(geom_a.eql?(geom_b))
+    assert_equal(srid, geom_b.srid)
+  end
+
   def test_dup
     geom_a = read('POINT(0 0)')
     geom_b = geom_a.dup
@@ -1531,6 +1541,15 @@ class GeometryTests < Test::Unit::TestCase
     assert(geom_a.eql?(geom_b))
   end
 
+  def test_dup_srid
+    srid = 4326
+    geom_a = read('POINT(0 0)')
+    geom_a.srid = srid
+    geom_b = geom_a.dup
+    assert(geom_a.eql?(geom_b))
+    assert_equal(srid, geom_b.srid)
+  end
+
   def test_geometry_collection_enumerator
     geom = read('GEOMETRYCOLLECTION(POINT(0 0))')
     assert_kind_of(Enumerable, geom.each)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-22 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-08-22 00:00:00.000000000Z
 dependencies: []
 description: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
 email: dark.panda@gmail.com
@@ -56,7 +55,6 @@ files:
 - test/wkb_writer_tests.rb
 - test/wkt_reader_tests.rb
 - test/wkt_writer_tests.rb
-has_rdoc: true
 homepage: http://github.com/dark-panda/ffi-geos
 licenses: []
 post_install_message: 
@@ -77,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).