ffi-geos 0.0.5 → 0.0.6

data/ffi-geos.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/dark-panda/ffi-geos"
   s.require_paths = ["lib"]
 
-  s.add_dependency("ffi", ["~> 1.0.0"])
+  s.add_dependency("ffi", [">= 1.0.0"])
   s.add_dependency("rdoc")
   s.add_dependency("rake", ["~> 0.9"])
 end

data/lib/ffi-geos.rb

@@ -340,7 +340,7 @@ module Geos
       ],
 
       :GEOSBufferWithParams_r => [
-        # *geom, *handle, *geom, *oarams, width
+        # *geom, *handle, *geom, *params, width
         :pointer, :pointer, :pointer, :pointer, :double
       ],
 
@@ -1035,8 +1035,14 @@ module Geos
     GEOS_VERSION,
       GEOS_VERSION_MAJOR, GEOS_VERSION_MINOR, GEOS_VERSION_PATCH, GEOS_VERSION_PRERELEASE,
       GEOS_CAPI_VERSION,
-      GEOS_CAPI_VERSION_MAJOR, GEOS_CAPI_VERSION_MINOR, GEOS_CAPI_VERSION_PATCH =
-        if !(versions = Geos.version.scan(/^((\d+)\.(\d+)\.(\d+)((?:dev|rc|beta|alpha)\d*)?)-CAPI-((\d+)\.(\d+)\.(\d+))$/)).empty?
+      GEOS_CAPI_VERSION_MAJOR, GEOS_CAPI_VERSION_MINOR, GEOS_CAPI_VERSION_PATCH,
+      GEOS_SVN_REVISION =
+        if !(versions = Geos.version.scan(/^
+          ((\d+)\.(\d+)\.(\d+)((?:dev|rc|beta|alpha)\d*)?)
+          -CAPI-
+          ((\d+)\.(\d+)\.(\d+))
+          (?:\s+r(\d+))?
+        $/x)).empty?
           versions = versions[0]
           [
             versions[0],
@@ -1047,7 +1053,8 @@ module Geos
             versions[5],
             versions[6].to_i,
             versions[7].to_i,
-            versions[8].to_i
+            versions[8].to_i,
+            (versions[9].to_i if versions[9])
           ]
         else
           [ '0.0.0', 0, 0, 0, nil, '0.0.0', 0, 0, 0 ]

data/lib/ffi-geos/geometry.rb

@@ -45,9 +45,14 @@ module Geos
       FFIGeos.GEOSGeomTypeId_r(Geos.current_handle, self.ptr)
     end
 
-    def normalize
-      FFIGeos.GEOSNormalize_r(Geos.current_handle, self.ptr)
+    def normalize!
+      if FFIGeos.GEOSNormalize_r(Geos.current_handle, self.ptr) == -1
+        raise RuntimeError.new("Couldn't normalize #{self.class}")
+      end
+
+      self
     end
+    alias :normalize :normalize!
 
     def srid
       FFIGeos.GEOSGetSRID_r(Geos.current_handle, self.ptr)

data/lib/ffi-geos/version.rb

@@ -1,5 +1,5 @@
 
 module Geos
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end
 

data/test/geometry_tests.rb

@@ -1598,4 +1598,22 @@ class GeometryTests < Test::Unit::TestCase
     assert_kind_of(Enumerable, geom.to_enum)
     assert_equal(geom, geom.each {})
   end
+
+  def test_normalize
+    geom = read('POLYGON((0 0, 5 0, 5 5, 0 5, 0 0))')
+    geom.normalize
+    assert_equal('POLYGON ((0 0, 0 5, 5 5, 5 0, 0 0))', write(geom, :trim => true))
+
+    geom = read('POLYGON((0 0, 5 0, 5 5, 0 5, 0 0))').normalize
+    assert_equal('POLYGON ((0 0, 0 5, 5 5, 5 0, 0 0))', write(geom, :trim => true))
+  end
+
+  def test_normalize_bang
+    geom = read('POLYGON((0 0, 5 0, 5 5, 0 5, 0 0))')
+    geom.normalize!
+    assert_equal('POLYGON ((0 0, 0 5, 5 5, 5 0, 0 0))', write(geom, :trim => true))
+
+    geom = read('POLYGON((0 0, 5 0, 5 5, 0 5, 0 0))').normalize!
+    assert_equal('POLYGON ((0 0, 0 5, 5 5, 5 0, 0 0))', write(geom, :trim => true))
+  end
 end

data/test/test_helper.rb

@@ -10,8 +10,15 @@ end
 
 puts "Ruby version #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} - #{RbConfig::CONFIG['RUBY_INSTALL_NAME']}"
 puts "ffi version #{Gem.loaded_specs['ffi'].version}" if Gem.loaded_specs['ffi']
-puts "GEOS version #{Geos::GEOS_VERSION}"
+
+if Geos.respond_to?(:version)
+  puts "GEOS version #{Geos.version}"
+else
+  puts "GEOS version #{Geos::GEOS_VERSION}"
+end
+
 puts "ffi-geos version #{Geos::VERSION}" if defined?(Geos::VERSION)
+
 if defined?(Geos::FFIGeos)
   puts "Using #{Geos::FFIGeos.geos_library_path}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).