geos-extensions 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/geos-extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geos-extensions}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["J Smith"]
-  s.date = %q{2011-06-27}
+  s.authors = [%q{J Smith}]
+  s.date = %q{2011-07-06}
   s.description = %q{Extensions for the GEOS library.}
   s.email = %q{code@zoocasa.com}
   s.extra_rdoc_files = [
@@ -46,8 +46,8 @@ Gem::Specification.new do |s|
     "test/writer_test.rb"
   ]
   s.homepage = %q{http://github.com/zoocasa/geos-extensions}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{Extensions for the GEOS library.}
 
   if s.respond_to? :specification_version then

data/lib/geos/google_maps/api_3.rb

@@ -9,7 +9,7 @@ module Geos::GoogleMaps::Api3
       shape
     }.freeze
 
-    # Returns a new LatLngBounds object with the proper GLatLngs in place
+    # Returns a new LatLngBounds object with the proper LatLngs in place
     # for determining the geometry bounds.
     def to_g_lat_lng_bounds_api3(options = {})
       "new google.maps.LatLngBounds(#{self.lower_left.to_g_lat_lng_api3(options)}, #{self.upper_right.to_g_lat_lng_api3(options)})"
@@ -49,69 +49,75 @@ module Geos::GoogleMaps::Api3
   end
 
   module CoordinateSequence
-    # Returns a Ruby Array of GLatLngs.
+    UNESCAPED_POLY_OPTIONS = %w{
+      clickable
+      fillOpacity
+      geodesic
+      map
+      path
+      paths
+      strokeOpacity
+      strokeWeight
+      zIndex
+    }.freeze
+
+    # Returns a Ruby Array of LatLngs.
     def to_g_lat_lng_api3(options = {})
       self.to_a.collect do |p|
         "new google.maps.LatLng(#{p[1]}, #{p[0]})"
       end
     end
 
-    # Returns a new GPolyline. Note that this GPolyline just uses whatever
+    # Returns a new Polyline. Note that this Polyline just uses whatever
     # coordinates are found in the sequence in order, so it might not
     # make much sense at all.
     #
-    # The options Hash follows the Google Maps API arguments to the
-    # GPolyline constructor and include :color, :weight, :opacity and
-    # :options. 'null' is used in place of any unset options.
+    # The polyline_options Hash follows the Google Maps API arguments to the
+    # Polyline constructor and include :clickable, :geodesic, :map, etc. See
+    # the Google Maps API documentation for details.
+    #
+    # The options Hash allows you to specify if certain arguments should be
+    # escaped on output. Usually the options in UNESCAPED_POLY_OPTIONS are
+    # escaped, but if for some reason you want some other options to be
+    # escaped, pass them along in options[:escape]. The options Hash also
+    # passes along options to to_g_lat_lng_api3.
     def to_g_polyline_api3(polyline_options = {}, options = {})
-      klass = if options[:short_class]
-        'GPolyline'
-      else
-        'google.maps.Polyline'
-      end
-
-      poly_opts = if polyline_options[:polyline_options]
-        Geos::Helper.camelize_keys(polyline_options[:polyline_options])
-      end
+      options = {
+        :escape => [],
+        :lat_lng_options => {}
+      }.merge(options)
 
-      args = [
-        (polyline_options[:color] ? "'#{Geos::Helper.escape_javascript(polyline_options[:color])}'" : 'null'),
-        (polyline_options[:weight] || 'null'),
-        (polyline_options[:opacity] || 'null'),
-        (poly_opts ? poly_opts.to_json : 'null')
-      ].join(', ')
+      opts = Geos::Helper.camelize_keys(polyline_options)
+      opts[:path] = "[#{self.to_g_lat_lng_api3(options[:lat_lng_options]).join(', ')}]"
+      json = Geos::Helper.escape_json(opts, UNESCAPED_POLY_OPTIONS - options[:escape])
 
-      "new #{klass}([#{self.to_g_lat_lng(options).join(', ')}], #{args})"
+      "new google.maps.Polyline(#{json})"
     end
 
-    # Returns a new GPolygon. Note that this GPolygon just uses whatever
+    # Returns a new Polygon. Note that this Polygon just uses whatever
     # coordinates are found in the sequence in order, so it might not
     # make much sense at all.
     #
-    # The options Hash follows the Google Maps API arguments to the
-    # GPolygon constructor and include :stroke_color, :stroke_weight,
-    # :stroke_opacity, :fill_color, :fill_opacity and :options. 'null' is
-    # used in place of any unset options.
+    # The polygon_options Hash follows the Google Maps API arguments to the
+    # Polyline constructor and include :clickable, :geodesic, :map, etc. See
+    # the Google Maps API documentation for details.
+    #
+    # The options Hash allows you to specify if certain arguments should be
+    # escaped on output. Usually the options in UNESCAPED_POLY_OPTIONS are
+    # escaped, but if for some reason you want some other options to be
+    # escaped, pass them along in options[:escape]. The options Hash also
+    # passes along options to to_g_lat_lng_api3.
     def to_g_polygon_api3(polygon_options = {}, options = {})
-      klass = if options[:short_class]
-        'GPolygon'
-      else
-        'google.maps.Polygon'
-      end
+      options = {
+        :escape => [],
+        :lat_lng_options => {}
+      }.merge(options)
 
-      poly_opts = if polygon_options[:polygon_options]
-        Geos::Helper.camelize_keys(polygon_options[:polygon_options])
-      end
+      opts = Geos::Helper.camelize_keys(polygon_options)
+      opts[:paths] = "[#{self.to_g_lat_lng_api3(options[:lat_lng_options]).join(', ')}]"
+      json = Geos::Helper.escape_json(opts, UNESCAPED_POLY_OPTIONS - options[:escape])
 
-      args = [
-        (polygon_options[:stroke_color] ? "'#{Geos::Helper.escape_javascript(polygon_options[:stroke_color])}'" : 'null'),
-        (polygon_options[:stroke_weight] || 'null'),
-        (polygon_options[:stroke_opacity] || 'null'),
-        (polygon_options[:fill_color] ? "'#{Geos::Helper.escape_javascript(polygon_options[:fill_color])}'" : 'null'),
-        (polygon_options[:fill_opacity] || 'null'),
-        (poly_opts ? poly_opts.to_json : 'null')
-      ].join(', ')
-      "new #{klass}([#{self.to_g_lat_lng_api3(options).join(', ')}], #{args})"
+      "new google.maps.Polygon(#{json})"
     end
   end
 
@@ -132,14 +138,14 @@ module Geos::GoogleMaps::Api3
   end
 
   module Polygon
-    # Returns a GPolyline of the exterior ring of the Polygon. This does
+    # Returns a Polyline of the exterior ring of the Polygon. This does
     # not take into consideration any interior rings the Polygon may
     # have.
     def to_g_polyline_api3(polyline_options = {}, options = {})
       self.exterior_ring.to_g_polyline_api3(polyline_options, options)
     end
 
-    # Returns a GPolygon of the exterior ring of the Polygon. This does
+    # Returns a Polygon of the exterior ring of the Polygon. This does
     # not take into consideration any interior rings the Polygon may
     # have.
     def to_g_polygon_api3(polygon_options = {}, options = {})
@@ -148,7 +154,7 @@ module Geos::GoogleMaps::Api3
   end
 
   module GeometryCollection
-    # Returns a Ruby Array of GPolylines for each geometry in the
+    # Returns a Ruby Array of Polylines for each geometry in the
     # collection.
     def to_g_polyline_api3(polyline_options = {}, options = {})
       self.collect do |p|
@@ -156,7 +162,7 @@ module Geos::GoogleMaps::Api3
       end
     end
 
-    # Returns a Ruby Array of GPolygons for each geometry in the
+    # Returns a Ruby Array of Polygons for each geometry in the
     # collection.
     def to_g_polygon_api3(polygon_options = {}, options = {})
       self.collect do |p|
@@ -166,4 +172,4 @@ module Geos::GoogleMaps::Api3
   end
 end
 
-Geos::GoogleMaps.use_api(2)
+Geos::GoogleMaps.use_api(3)

data/lib/geos_extensions.rb

@@ -17,7 +17,7 @@ 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_WKT = /^(?:SRID=(-?[0-9]+);)?(\s*[PLMCG].+)/i
+  REGEXP_WKT = /^\s*(?:SRID=(-?[0-9]+);)?(\s*[PLMCG].+)/im
   REGEXP_WKB_HEX = /^[A-Fa-f0-9\s]+$/
   REGEXP_G_LAT_LNG_BOUNDS = /^
     \(

data/test/google_maps_api_3_test.rb

@@ -48,44 +48,40 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
   if defined?(JSON)
     def test_to_g_polygon
       assert_equal(
-        "new google.maps.Polygon([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)], null, null, null, null, null, null)",
+        %{new google.maps.Polygon({"paths": [new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)]})},
         @polygon.to_g_polygon
       )
 
       assert_equal(
-        "new google.maps.Polygon([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)], '#b00b1e', 5, 0.5, '#b00b1e', null, {\"mouseOutTolerence\":5})",
+        "new google.maps.Polygon({\"strokeColor\": \"#b00b1e\", \"paths\": [new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)], \"fillColor\": \"#b00b1e\", \"strokeWeight\": 5, \"map\": map, \"strokeOpacity\": 0.5})",
         @polygon.to_g_polygon(
           :stroke_color => '#b00b1e',
           :stroke_weight => 5,
           :stroke_opacity => 0.5,
           :fill_color => '#b00b1e',
-          :polygon_options => {
-            :mouse_out_tolerence => 5
-          }
+          :map => 'map'
         )
       )
     end
 
     def test_to_g_polyline
       assert_equal(
-        "new google.maps.Polyline([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)], null, null, null, null)",
+        "new google.maps.Polyline({\"path\": [new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)]})",
         @polygon.to_g_polyline
       )
 
       assert_equal(
-        "new google.maps.Polyline([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)], '#b00b1e', 5, 0.5, {\"mouseOutTolerence\":5})",
+        "new google.maps.Polyline({\"path\": [new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)], \"strokeColor\": \"#b00b1e\", \"strokeWeight\": 5, \"map\": map, \"strokeOpacity\": 0.5})",
         @polygon.to_g_polyline(
-          :color => '#b00b1e',
-          :weight => 5,
-          :opacity => 0.5,
-          :polyline_options => {
-            :mouse_out_tolerence => 5
-          }
+          :stroke_color => '#b00b1e',
+          :stroke_weight => 5,
+          :stroke_opacity => 0.5,
+          :map => 'map'
         )
       )
     end
 
-    def test_to_g_marker_long
+    def test_to_g_marker
       marker = @point.to_g_marker
 
       lat, lng, json = if marker =~ /^new\s+

data/test/reader_test.rb

@@ -109,4 +109,17 @@ class GeosReaderTests < Test::Unit::TestCase
       assert_saneness_of_polygon(polygon)
     end
   end
+
+  def test_read_wkt_with_newlines
+    geom = Geos.read(<<-EOF)
+    POLYGON((
+      0 0,
+      10 10,
+      0 10,
+      0 0
+    ))
+    EOF
+
+    assert_equal('POLYGON ((0 0, 10 10, 0 10, 0 0))', geom.to_wkt(:trim => true))
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geos-extensions
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - J Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 Z
+date: 2011-07-06 00:00:00 Z
 dependencies: []
 
 description: Extensions for the GEOS library.
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Extensions for the GEOS library.