geos-extensions 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/geos-extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geos-extensions}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{J Smith}]
-  s.date = %q{2011-07-06}
+  s.date = %q{2011-07-11}
   s.description = %q{Extensions for the GEOS library.}
   s.email = %q{code@zoocasa.com}
   s.extra_rdoc_files = [
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/geos/rails/engine.rb",
     "lib/geos_extensions.rb",
     "lib/tasks/test.rake",
+    "test/adapter_test.rb",
     "test/fixtures/foos.yml",
     "test/geometry_columns_test.rb",
     "test/geospatial_scopes_test.rb",

data/lib/geos/active_record_extensions/connection_adapters/postgresql_adapter.rb

@@ -11,6 +11,17 @@ module ActiveRecord
       end
     end
 
+    class PostgreSQLColumn < Column
+      def simplified_type_with_geometry_type(field_type)
+        if field_type == 'geometry'
+          :geometry
+        else
+          simplified_type_without_geometry_type(field_type)
+        end
+      end
+      alias_method_chain :simplified_type, :geometry_type
+    end
+
     class PostgreSQLAdapter < AbstractAdapter
       # Returns the geometry columns for the table.
       def geometry_columns(table_name, name = nil)

data/lib/geos/google_maps/api_3.rb

@@ -1,6 +1,9 @@
 
-module Geos::GoogleMaps::Api3
-  module Geometry
+module Geos::GoogleMaps
+  module Api3
+  end
+
+  module Api3Constants
     UNESCAPED_MARKER_OPTIONS = %w{
       icon
       map
@@ -9,6 +12,20 @@ module Geos::GoogleMaps::Api3
       shape
     }.freeze
 
+    UNESCAPED_POLY_OPTIONS = %w{
+      clickable
+      fillOpacity
+      geodesic
+      map
+      path
+      paths
+      strokeOpacity
+      strokeWeight
+      zIndex
+    }.freeze
+  end
+
+  module Api3::Geometry
     # Returns a new LatLngBounds object with the proper LatLngs in place
     # for determining the geometry bounds.
     def to_g_lat_lng_bounds_api3(options = {})
@@ -42,25 +59,13 @@ module Geos::GoogleMaps::Api3
 
       opts = Geos::Helper.camelize_keys(marker_options)
       opts[:position] = self.centroid.to_g_lat_lng(options[:lat_lng_options])
-      json = Geos::Helper.escape_json(opts, UNESCAPED_MARKER_OPTIONS - options[:escape])
+      json = Geos::Helper.escape_json(opts, Geos::GoogleMaps::Api3Constants::UNESCAPED_MARKER_OPTIONS - options[:escape])
 
       "new google.maps.Marker(#{json})"
     end
   end
 
-  module CoordinateSequence
-    UNESCAPED_POLY_OPTIONS = %w{
-      clickable
-      fillOpacity
-      geodesic
-      map
-      path
-      paths
-      strokeOpacity
-      strokeWeight
-      zIndex
-    }.freeze
-
+  module Api3::CoordinateSequence
     # Returns a Ruby Array of LatLngs.
     def to_g_lat_lng_api3(options = {})
       self.to_a.collect do |p|
@@ -89,7 +94,7 @@ module Geos::GoogleMaps::Api3
 
       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])
+      json = Geos::Helper.escape_json(opts, Geos::GoogleMaps::Api3Constants::UNESCAPED_POLY_OPTIONS - options[:escape])
 
       "new google.maps.Polyline(#{json})"
     end
@@ -115,13 +120,13 @@ module Geos::GoogleMaps::Api3
 
       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])
+      json = Geos::Helper.escape_json(opts, Geos::GoogleMaps::Api3Constants::UNESCAPED_POLY_OPTIONS - options[:escape])
 
       "new google.maps.Polygon(#{json})"
     end
   end
 
-  module Point
+  module Api3::Point
     # Returns a new LatLng.
     def to_g_lat_lng_api3(options = {})
       no_wrap = if options[:no_wrap]
@@ -137,7 +142,7 @@ module Geos::GoogleMaps::Api3
     end
   end
 
-  module Polygon
+  module Api3::Polygon
     # Returns a Polyline of the exterior ring of the Polygon. This does
     # not take into consideration any interior rings the Polygon may
     # have.
@@ -153,7 +158,7 @@ module Geos::GoogleMaps::Api3
     end
   end
 
-  module GeometryCollection
+  module Api3::GeometryCollection
     # Returns a Ruby Array of Polylines for each geometry in the
     # collection.
     def to_g_polyline_api3(polyline_options = {}, options = {})
@@ -161,14 +166,39 @@ module Geos::GoogleMaps::Api3
         p.to_g_polyline_api3(polyline_options, options)
       end
     end
+    alias :to_g_polylines_api3 :to_g_polyline_api3
 
     # Returns a Ruby Array of Polygons for each geometry in the
-    # collection.
+    # collection. If the :single option is set, a single Polygon object will
+    # be returned with all of the geometries set in the Polygon's "path"
+    # attribute. You can also use to_g_polygon_single for the same effect.
     def to_g_polygon_api3(polygon_options = {}, options = {})
-      self.collect do |p|
-        p.to_g_polygon_api3(polygon_options, options)
+      if options[:single]
+        self.to_g_polygon_single_api3(polygon_options, options)
+      else
+        self.collect do |p|
+          p.to_g_polygon_api3(polygon_options, options)
+        end
       end
     end
+
+    # Behaves the same as to_g_polygon_api3 with the :single option set, where
+    # a single Google Maps Polygon will be returned with all of the Polygons
+    # set in the Polygon's "path" attribute.
+    def to_g_polygon_single_api3(polygon_options = {}, options = {})
+      options = {
+        :escape => [],
+        :lat_lng_options => {}
+      }.merge(options)
+
+      opts = Geos::Helper.camelize_keys(polygon_options)
+      opts[:paths] = %{[#{self.collect { |p|
+        "[#{p.exterior_ring.coord_seq.to_g_lat_lng_api3(options[:lat_lng_options]).join(', ')}]"
+      }.join(', ')}]}
+      json = Geos::Helper.escape_json(opts, Geos::GoogleMaps::Api3Constants::UNESCAPED_POLY_OPTIONS - options[:escape])
+
+      "new google.maps.Polygon(#{json})"
+    end
   end
 end
 

data/test/adapter_test.rb

@@ -0,0 +1,23 @@
+
+$: << File.dirname(__FILE__)
+require 'test_helper'
+
+if ENV['TEST_ACTIVERECORD']
+  class AdapterTests < ActiveRecord::TestCase
+    include TestHelper
+    include ActiveRecord::TestFixtures
+
+    def test_simplified_type
+      geometry_columns = Foo.columns.select do |c|
+        c.type == :geometry
+      end
+
+      other_columns = Foo.columns.select do |c|
+        c.type != :geometry
+      end
+
+      assert_equal(2, geometry_columns.length)
+      assert_equal(2, other_columns.length)
+    end
+  end
+end

data/test/google_maps_api_3_test.rb

@@ -53,7 +53,7 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
       )
 
       assert_equal(
-        "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})",
+        "new google.maps.Polygon({\"strokeColor\": \"#b00b1e\", \"strokeWeight\": 5, \"strokeOpacity\": 0.5, \"fillColor\": \"#b00b1e\", \"map\": map, \"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(
           :stroke_color => '#b00b1e',
           :stroke_weight => 5,
@@ -64,6 +64,60 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
       )
     end
 
+    def test_to_g_polygon_with_multi_polygon
+      multi_polygon = Geos.read(
+        'MULTIPOLYGON(
+          ((0 0, 0 5, 5 5, 5 0, 0 0)),
+          ((10 10, 10 15, 15 15, 15 10, 10 10)),
+          ((20 20, 20 25, 25 25, 25 20, 20 20))
+        )'
+      )
+      options = {
+        :stroke_color => '#b00b1e',
+        :stroke_weight => 5,
+        :stroke_opacity => 0.5,
+        :fill_color => '#b00b1e',
+        :map => 'map'
+      }
+
+      assert_equal(
+        ["new google.maps.Polygon({\"strokeColor\": \"#b00b1e\", \"strokeWeight\": 5, \"strokeOpacity\": 0.5, \"fillColor\": \"#b00b1e\", \"map\": map, \"paths\": [new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(5.0, 0.0), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 5.0), new google.maps.LatLng(0.0, 0.0)]})",
+ "new google.maps.Polygon({\"strokeColor\": \"#b00b1e\", \"strokeWeight\": 5, \"strokeOpacity\": 0.5, \"fillColor\": \"#b00b1e\", \"map\": map, \"paths\": [new google.maps.LatLng(10.0, 10.0), new google.maps.LatLng(15.0, 10.0), new google.maps.LatLng(15.0, 15.0), new google.maps.LatLng(10.0, 15.0), new google.maps.LatLng(10.0, 10.0)]})",
+ "new google.maps.Polygon({\"strokeColor\": \"#b00b1e\", \"strokeWeight\": 5, \"strokeOpacity\": 0.5, \"fillColor\": \"#b00b1e\", \"map\": map, \"paths\": [new google.maps.LatLng(20.0, 20.0), new google.maps.LatLng(25.0, 20.0), new google.maps.LatLng(25.0, 25.0), new google.maps.LatLng(20.0, 25.0), new google.maps.LatLng(20.0, 20.0)]})"],
+        multi_polygon.to_g_polygon(
+          :stroke_color => '#b00b1e',
+          :stroke_weight => 5,
+          :stroke_opacity => 0.5,
+          :fill_color => '#b00b1e',
+          :map => 'map'
+        )
+      )
+
+      assert_equal(
+        "new google.maps.Polygon({\"strokeColor\": \"#b00b1e\", \"strokeWeight\": 5, \"strokeOpacity\": 0.5, \"fillColor\": \"#b00b1e\", \"map\": map, \"paths\": [[new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(5.0, 0.0), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 5.0), new google.maps.LatLng(0.0, 0.0)], [new google.maps.LatLng(10.0, 10.0), new google.maps.LatLng(15.0, 10.0), new google.maps.LatLng(15.0, 15.0), new google.maps.LatLng(10.0, 15.0), new google.maps.LatLng(10.0, 10.0)], [new google.maps.LatLng(20.0, 20.0), new google.maps.LatLng(25.0, 20.0), new google.maps.LatLng(25.0, 25.0), new google.maps.LatLng(20.0, 25.0), new google.maps.LatLng(20.0, 20.0)]]})",
+        multi_polygon.to_g_polygon({
+          :stroke_color => '#b00b1e',
+          :stroke_weight => 5,
+          :stroke_opacity => 0.5,
+          :fill_color => '#b00b1e',
+          :map => 'map'
+        }, {
+          :single => true
+        })
+      )
+
+      assert_equal(
+        "new google.maps.Polygon({\"strokeColor\": \"#b00b1e\", \"strokeWeight\": 5, \"strokeOpacity\": 0.5, \"fillColor\": \"#b00b1e\", \"map\": map, \"paths\": [[new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(5.0, 0.0), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 5.0), new google.maps.LatLng(0.0, 0.0)], [new google.maps.LatLng(10.0, 10.0), new google.maps.LatLng(15.0, 10.0), new google.maps.LatLng(15.0, 15.0), new google.maps.LatLng(10.0, 15.0), new google.maps.LatLng(10.0, 10.0)], [new google.maps.LatLng(20.0, 20.0), new google.maps.LatLng(25.0, 20.0), new google.maps.LatLng(25.0, 25.0), new google.maps.LatLng(20.0, 25.0), new google.maps.LatLng(20.0, 20.0)]]})",
+        multi_polygon.to_g_polygon_single(
+          :stroke_color => '#b00b1e',
+          :stroke_weight => 5,
+          :stroke_opacity => 0.5,
+          :fill_color => '#b00b1e',
+          :map => 'map'
+        )
+      )
+    end
+
     def test_to_g_polyline
       assert_equal(
         "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)]})",
@@ -71,7 +125,7 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
       )
 
       assert_equal(
-        "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})",
+        "new google.maps.Polyline({\"strokeColor\": \"#b00b1e\", \"strokeWeight\": 5, \"strokeOpacity\": 0.5, \"map\": map, \"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(
           :stroke_color => '#b00b1e',
           :stroke_weight => 5,

metadata

@@ -1,32 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geos-extensions
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-06 00:00:00 Z
+date: 2011-07-11 00:00:00.000000000Z
 dependencies: []
-
 description: Extensions for the GEOS library.
 email: code@zoocasa.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -47,6 +38,7 @@ files:
 - lib/geos/rails/engine.rb
 - lib/geos_extensions.rb
 - lib/tasks/test.rake
+- test/adapter_test.rb
 - test/fixtures/foos.yml
 - test/geometry_columns_test.rb
 - test/geospatial_scopes_test.rb
@@ -57,36 +49,26 @@ files:
 - test/writer_test.rb
 homepage: http://github.com/zoocasa/geos-extensions
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Extensions for the GEOS library.
 test_files: []
-