geos-extensions 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/geos-extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "geos-extensions"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["J Smith"]
-  s.date = "2011-11-09"
+  s.date = "2011-12-02"
   s.description = "Extensions for the GEOS library."
   s.email = "code@zoocasa.com"
   s.extra_rdoc_files = [

data/lib/geos_extensions.rb

@@ -17,28 +17,29 @@ module Geos
   autoload :ActiveRecord, File.join(GEOS_EXTENSIONS_BASE, *%w{ geos active_record_extensions })
   autoload :GoogleMaps, File.join(GEOS_EXTENSIONS_BASE, *%w{ geos google_maps })
 
+  REGEXP_FLOAT = /(-?\d+(?:\.\d+)?)/
+  REGEXP_LAT_LNG = /#{REGEXP_FLOAT}\s*,\s*#{REGEXP_FLOAT}/
+
   REGEXP_WKT = /^\s*(?:SRID=(-?[0-9]+);)?(\s*[PLMCG].+)/im
   REGEXP_WKB_HEX = /^[A-Fa-f0-9\s]+$/
+
   REGEXP_G_LAT_LNG_BOUNDS = /^
     \(
-      \(
-        (-?\d+(?:\.\d+)?) # sw lat or x
-        \s*,\s*
-        (-?\d+(?:\.\d+)?) # sw lng or y
-      \)
+      \(#{REGEXP_LAT_LNG}\) # sw
       \s*,\s*
-      \(
-        (-?\d+(?:\.\d+)?) # ne lat or x
-        \s*,\s*
-        (-?\d+(?:\.\d+)?) # ne lng or y
-      \)
+      \(#{REGEXP_LAT_LNG}\) # ne
     \)
+  $
+    |
+  ^
+    #{REGEXP_LAT_LNG} # sw
+    \s*,\s*
+    #{REGEXP_LAT_LNG} # ne
   $/x
+
   REGEXP_G_LAT_LNG = /^
     \(?
-      (-?\d+(?:\.\d+)?) # lat or x
-      \s*,\s*
-      (-?\d+(?:\.\d+)?) # lng or y
+      #{REGEXP_LAT_LNG}
     \)?
   $/x
 
@@ -108,7 +109,7 @@ module Geos
     geom = case geometry
       when REGEXP_G_LAT_LNG_BOUNDS
         coords = Array.new
-        $~.captures.each_slice(2) { |f|
+        $~.captures.compact.each_slice(2) { |f|
           coords << f.collect(&:to_f)
         }
 

data/test/reader_tests.rb

@@ -76,10 +76,20 @@ class GeosReaderTests < Test::Unit::TestCase
     bounds = Geos.from_g_lat_lng(BOUNDS_G_LAT_LNG)
 
     assert_kind_of(Geos::Polygon, bounds)
-    assert_equal([ 0, 0 ], bounds.sw.to_a)
-    assert_equal([ 5, 5 ], bounds.ne.to_a)
-    assert_equal([ 0, 5 ], bounds.nw.to_a)
-    assert_equal([ 5, 0 ], bounds.se.to_a)
+    assert_equal([ 0.1, 0.1 ], bounds.sw.to_a)
+    assert_equal([ 5.2, 5.2 ], bounds.ne.to_a)
+    assert_equal([ 0.1, 5.2 ], bounds.nw.to_a)
+    assert_equal([ 5.2, 0.1 ], bounds.se.to_a)
+  end
+
+  def test_from_g_lat_lng_bounds_url_value
+    bounds = Geos.from_g_lat_lng(BOUNDS_G_LAT_LNG_URL_VALUE)
+
+    assert_kind_of(Geos::Polygon, bounds)
+    assert_equal([ 0.1, 0.1 ], bounds.sw.to_a)
+    assert_equal([ 5.2, 5.2 ], bounds.ne.to_a)
+    assert_equal([ 0.1, 5.2 ], bounds.nw.to_a)
+    assert_equal([ 5.2, 0.1 ], bounds.se.to_a)
   end
 
   def test_read

data/test/test_helper.rb

@@ -138,7 +138,8 @@ module TestHelper
 
   POLYGON_WITH_INTERIOR_RING = "POLYGON((0 0, 5 0, 5 5, 0 5, 0 0),(4 4, 4 1, 1 1, 1 4, 4 4))"
 
-  BOUNDS_G_LAT_LNG = "((0, 0), (5, 5))"
+  BOUNDS_G_LAT_LNG = "((0.1, 0.1), (5.2, 5.2))"
+  BOUNDS_G_LAT_LNG_URL_VALUE = '0.1,0.1,5.2,5.2'
 
   def assert_saneness_of_point(point)
     assert_kind_of(Geos::Point, point)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geos-extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000 Z
+date: 2011-12-02 00:00:00.000000000 Z
 dependencies: []
 description: Extensions for the GEOS library.
 email: code@zoocasa.com