ffi-geos 0.0.3 → 0.0.4

data/Rakefile

@@ -2,9 +2,20 @@
 # -*- ruby -*-
 
 require 'rubygems'
+
+gem 'rdoc', '~> 3.12'
+
 require 'rubygems/package_task'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
+
+if RUBY_VERSION >= '1.9'
+  begin
+    gem 'psych'
+  rescue Exception => e
+    # it's okay, fall back on the bundled psych
+  end
+end
 
 $:.push 'lib'
 
@@ -19,6 +30,7 @@ begin
     gem.email = "dark.panda@gmail.com"
     gem.homepage = "http://github.com/dark-panda/ffi-geos"
     gem.authors =    [ "J Smith" ]
+    gem.add_dependency "ffi", "~> 1.0.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -27,13 +39,12 @@ end
 
 desc 'Test GEOS interface'
 Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_tests.rb'
+  t.test_files = FileList['test/**/*_tests.rb']
   t.verbose = !!ENV['VERBOSE_TESTS']
 end
 
 desc 'Build docs'
 Rake::RDocTask.new do |t|
-  require 'rdoc'
   t.title = "ffi-geos #{version}"
   t.main = 'README.rdoc'
   t.rdoc_dir = 'doc'

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/ffi-geos.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-geos}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{J Smith}]
-  s.date = %q{2011-08-22}
+  s.date = %q{2012-02-28}
   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 = [
@@ -56,16 +56,19 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/dark-panda/ffi-geos}
   s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.8}
+  s.rubygems_version = %q{1.8.9}
   s.summary = %q{An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ffi>, ["~> 1.0.0"])
     else
+      s.add_dependency(%q<ffi>, ["~> 1.0.0"])
     end
   else
+    s.add_dependency(%q<ffi>, ["~> 1.0.0"])
   end
 end
 

data/lib/ffi-geos.rb

@@ -58,24 +58,27 @@ module Geos
     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
+      Dir.glob(search_paths.map { |path|
+        File.expand_path(File.join(path, "#{lib}.#{FFI::Platform::LIBSUFFIX}"))
+      }).first
     end
 
-    def self.geos_library_paths
-      @geos_library_paths ||= begin
+    def self.geos_library_path
+      @geos_library_path ||= begin
         # On MingW the libraries have version numbers
-        [ 'libgeos_c{,-?}', 'libgeos{,-?-?-?}' ].map { |lib|
-          find_lib(lib)
-        }.compact
+        find_lib('libgeos_c{,-?}')
       end
     end
 
+    # For backwards compatibility with older ffi-geos versions where this
+    # used to return an Array.
+    def self.geos_library_paths
+      [ self.geos_library_path ]
+    end
+
     extend ::FFI::Library
 
-    ffi_lib(*geos_library_paths)
+    ffi_lib(geos_library_path)
 
     Geos::DimensionTypes = enum(:dimension_type, [
       :dontcare, -3,
@@ -1004,6 +1007,7 @@ module Geos
       create_empty_multi_polygon
       create_empty_geometry_collection
       create_empty_collection
+      create_empty_linear_ring
     }.each do |m|
       self.class_eval <<-EOF
         def #{m}(*args)

data/lib/ffi-geos/polygon.rb

@@ -16,5 +16,11 @@ module Geos
     def exterior_ring
       cast_geometry_ptr(FFIGeos.GEOSGetExteriorRing_r(Geos.current_handle, self.ptr), false)
     end
+
+    def interior_rings
+      self.num_interior_rings.times.collect do |n|
+        self.interior_ring_n(n)
+      end
+    end
   end
 end

data/lib/ffi-geos/utils.rb

@@ -113,6 +113,10 @@ module Geos
         create_empty_collection(:geometry_collection)
       end
 
+      def create_empty_linear_ring
+        Geos::WktReader.new.read('LINEARRING EMPTY')
+      end
+
       def create_collection(t, *geoms)
         check_enum_value(Geos::GeometryTypes, t)
 

data/test/geometry_tests.rb

@@ -1005,6 +1005,41 @@ class GeometryTests < Test::Unit::TestCase
     end
   end
 
+  def test_interior_rings
+    tester = lambda { |expected, g|
+      geom = read(g)
+      result = geom.interior_rings
+
+      if expected.nil?
+        assert_nil(result)
+      else
+        assert_equal(expected, result.collect { |r| write(r) } )
+      end
+    }
+
+    writer.trim = true
+
+    tester[
+      [ 'LINEARRING (11 11, 11 12, 12 12, 12 11, 11 11)' ],
+      'POLYGON(
+        (10 10, 10 14, 14 14, 14 10, 10 10),
+        (11 11, 11 12, 12 12, 12 11, 11 11)
+      )'
+    ]
+
+    tester[
+      [
+        'LINEARRING (11 11, 11 12, 12 12, 12 11, 11 11)',
+        'LINEARRING (13 11, 13 12, 13.5 12, 13.5 11, 13 11)'
+      ],
+      'POLYGON (
+        (10 10, 10 14, 14 14, 14 10, 10 10),
+        (11 11, 11 12, 12 12, 12 11, 11 11),
+        (13 11, 13 12, 13.5 12, 13.5 11, 13 11)
+      )'
+    ]
+  end
+
   if ENV['FORCE_TESTS'] || Geos::Geometry.method_defined?(:num_coordinates)
     def test_num_coordinates
       tester = lambda { |expected, g|
@@ -1033,7 +1068,7 @@ class GeometryTests < Test::Unit::TestCase
         POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0)),
         MULTILINESTRING ((0 0, 2 3), (10 10, 3 4)),
         LINESTRING (0 0, 2 3),
-        MULTIPOINT (0 0, 2 3),
+        MULTIPOINT ((0 0), (2 3)),
         POINT (9 0)
       )']
     end

data/test/test_helper.rb

@@ -9,10 +9,11 @@ else
 end
 
 puts "Ruby version #{RUBY_VERSION} - #{RbConfig::CONFIG['RUBY_INSTALL_NAME']}"
+puts "ffi version #{Gem.loaded_specs['ffi'].version}" if Gem.loaded_specs['ffi']
 puts "GEOS version #{Geos::GEOS_VERSION}"
 puts "ffi-geos version #{Geos::VERSION}" if defined?(Geos::VERSION)
 if defined?(Geos::FFIGeos)
-  puts "Using #{Geos::FFIGeos.geos_library_paths.join(', ')}"
+  puts "Using #{Geos::FFIGeos.geos_library_path}"
 end
 
 module TestHelper

data/test/utils_tests.rb

@@ -340,4 +340,10 @@ class UtilsTests < Test::Unit::TestCase
       assert_equal('GEOMETRYCOLLECTION EMPTY', write(Geos.create_empty_geometry_collection))
     end
   end
+
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_empty_linear_ring)
+    def test_create_empty_linear_ring
+      assert_equal('LINEARRING EMPTY', write(Geos.create_empty_linear_ring))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-22 00:00:00.000000000Z
-dependencies: []
+date: 2012-02-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: &2169057720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2169057720
 description: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
 email: dark.panda@gmail.com
 executables: []
@@ -75,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).