geos-extensions 0.0.7 → 0.1.0

data/test/google_maps_api_3_test.rb

@@ -0,0 +1,145 @@
+
+$: << File.dirname(__FILE__)
+require 'test_helper'
+
+begin
+  require 'json'
+rescue LoadError
+  # do nothing
+end
+
+class GoogleMapsApi3Tests < Test::Unit::TestCase
+  include TestHelper
+
+  def setup
+    Geos::GoogleMaps.use_api(3)
+
+    @point = Geos.read(POINT_EWKB)
+    @polygon = Geos.read(POLYGON_EWKB)
+  end
+
+  def test_to_g_lat_lng
+    assert_equal("new google.maps.LatLng(10.01, 10.0)", @point.to_g_lat_lng)
+    assert_equal("new google.maps.LatLng(10.01, 10.0, true)", @point.to_g_lat_lng(:no_wrap => true))
+  end
+
+  def test_to_jsonable
+    assert_equal({
+      :type => "point",
+      :lat => 10.01,
+      :lng => 10.0
+    }, @point.to_jsonable)
+
+    assert_equal({
+      :type => "polygon",
+      :polylines => [{
+        :points => "??_ibE_ibE_~cH_~cH_hgN_hgN~po]~po]",
+        :bounds => {
+          :sw => [ 0.0, 0.0 ],
+          :ne => [ 5.0, 5.0 ]
+        },
+        :levels=>"BBBBB"
+      }],
+      :options => {},
+      :encoded => true
+    }, @polygon.to_jsonable)
+  end
+
+  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)",
+        @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})",
+        @polygon.to_g_polygon(
+          :stroke_color => '#b00b1e',
+          :stroke_weight => 5,
+          :stroke_opacity => 0.5,
+          :fill_color => '#b00b1e',
+          :polygon_options => {
+            :mouse_out_tolerence => 5
+          }
+        )
+      )
+    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)",
+        @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})",
+        @polygon.to_g_polyline(
+          :color => '#b00b1e',
+          :weight => 5,
+          :opacity => 0.5,
+          :polyline_options => {
+            :mouse_out_tolerence => 5
+          }
+        )
+      )
+    end
+
+    def test_to_g_marker_long
+      marker = @point.to_g_marker
+
+      lat, lng, json = if marker =~ /^new\s+
+        google\.maps\.Marker\(\{
+          "position":\s*
+          new\s+google\.maps\.LatLng\(
+            (\d+\.\d+),\s*
+            (\d+\.\d+)
+          \)
+        \}\)
+        /x
+        [ $1, $2, $3 ]
+      end
+
+      assert_in_delta(lng.to_f, 10.00, 0.000001)
+      assert_in_delta(lat.to_f, 10.01, 0.000001)
+    end
+
+
+    def test_to_g_marker_with_options
+      marker = @point.to_g_marker({
+        :raise_on_drag => true,
+        :cursor => 'test'
+      }, {
+        :escape => %w{ position }
+      })
+
+      json = if marker =~ /^new\s+
+        google\.maps\.Marker\((
+          \{[^}]+\}
+        )/x
+        $1
+      end
+
+      assert_equal(
+        { "raiseOnDrag" => true, "cursor" => 'test' },
+        JSON.load(json).reject { |k, v|
+          %w{ position }.include?(k)
+        }
+      )
+    end
+
+    def test_to_g_json_point
+      assert_equal(
+        { :coordinates => [ 10.0, 10.01, 0 ] },
+        @point.to_g_json_point
+      )
+    end
+
+    def test_to_g_lat_lon_box
+      assert_equal(
+        { :east => 5.0, :west => 0.0, :north => 5.0, :south => 0.0},
+        @polygon.to_g_lat_lon_box
+      )
+    end
+  end
+end

data/test/test_helper.rb

@@ -24,7 +24,9 @@ end
 require File.join(File.dirname(__FILE__), %w{ .. lib geos_extensions })
 
 puts "Ruby version #{RUBY_VERSION} - #{RbConfig::CONFIG['RUBY_INSTALL_NAME']}"
+puts "Geos library version #{Geos::VERSION}" if defined?(Geos::VERSION)
 puts "GEOS version #{Geos::GEOS_VERSION}"
+puts "GEOS extensions version #{Geos::GEOS_EXTENSIONS_VERSION}"
 if defined?(Geos::FFIGeos)
   puts "Using #{Geos::FFIGeos.geos_library_paths.join(', ')}"
 end

data/test/writer_test.rb

@@ -2,12 +2,6 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-begin
-  require 'json'
-rescue LoadError
-  # do nothing
-end
-
 begin
   require 'builder'
   require 'stringio'
@@ -62,175 +56,10 @@ class GeosWriterTests < Test::Unit::TestCase
     assert_in_delta(lat, 10.01, 0.000001)
   end
 
-  def test_to_g_lat_lng
-    assert_equal("new google.maps.LatLng(10.01, 10.0)", @point.to_g_lat_lng)
-    assert_equal("new GLatLng(10.01, 10.0)", @point.to_g_lat_lng(:short_class => true))
-  end
-
   def test_to_flickr_bbox
     assert_equal('0.0,0.0,5.0,5.0', @polygon.to_flickr_bbox)
   end
 
-  def test_to_jsonable
-    assert_equal({
-      :type => "point",
-      :lat => 10.01,
-      :lng => 10.0
-    }, @point.to_jsonable)
-
-    assert_equal({
-      :type => "polygon",
-      :polylines => [{
-        :points => "??_ibE_ibE_~cH_~cH_hgN_hgN~po]~po]",
-        :bounds => {
-          :sw => [ 0.0, 0.0 ],
-          :ne => [ 5.0, 5.0 ]
-        },
-        :levels=>"BBBBB"
-      }],
-      :options => {},
-      :encoded => true
-    }, @polygon.to_jsonable)
-  end
-
-  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)",
-        @polygon.to_g_polygon
-      )
-
-      assert_equal(
-        "new GPolygon([new GLatLng(0.0, 0.0), new GLatLng(1.0, 1.0), new GLatLng(2.5, 2.5), new GLatLng(5.0, 5.0), new GLatLng(0.0, 0.0)], null, null, null, null, null, null)",
-        @polygon.to_g_polygon({}, :short_class => true)
-      )
-
-      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})",
-        @polygon.to_g_polygon(
-          :stroke_color => '#b00b1e',
-          :stroke_weight => 5,
-          :stroke_opacity => 0.5,
-          :fill_color => '#b00b1e',
-          :polygon_options => {
-            :mouse_out_tolerence => 5
-          }
-        )
-      )
-    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)",
-        @polygon.to_g_polyline
-      )
-
-      assert_equal(
-        "new GPolyline([new GLatLng(0.0, 0.0), new GLatLng(1.0, 1.0), new GLatLng(2.5, 2.5), new GLatLng(5.0, 5.0), new GLatLng(0.0, 0.0)], null, null, null, null)",
-        @polygon.to_g_polyline({}, :short_class => true)
-      )
-
-      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})",
-        @polygon.to_g_polyline(
-          :color => '#b00b1e',
-          :weight => 5,
-          :opacity => 0.5,
-          :polyline_options => {
-            :mouse_out_tolerence => 5
-          }
-        )
-      )
-    end
-
-    def test_to_g_marker_long
-      marker = @point.to_g_marker
-
-      lat, lng, json = if marker =~ /^new\s+
-        google\.maps\.Marker\(
-          new\s+google\.maps\.LatLng\(
-            (\d+\.\d+)\s*,\s*
-            (\d+\.\d+)
-          \),\s*
-            ((\{\}))
-        \)
-        /x
-        [ $1, $2, $3 ]
-      end
-
-      assert_in_delta(lng.to_f, 10.00, 0.000001)
-      assert_in_delta(lat.to_f, 10.01, 0.000001)
-      assert_equal(
-        {},
-        JSON.load(json)
-      )
-    end
-
-    def test_to_g_marker_short_class
-      marker = @point.to_g_marker({}, :short_class => true)
-
-      lat, lng, json = if marker =~ /^new\s+
-        GMarker\(
-          new\s+GLatLng\(
-            (\d+\.\d+)\s*,\s*
-            (\d+\.\d+)
-          \),\s*
-            (\{\})
-        \)
-        /x
-        [ $1, $2, $3 ]
-      end
-
-      assert_in_delta(lng.to_f, 10.00, 0.000001)
-      assert_in_delta(lat.to_f, 10.01, 0.000001)
-      assert_equal(
-        {},
-        JSON.load(json)
-      )
-    end
-
-
-    def test_to_g_marker_with_options
-      marker = @point.to_g_marker(
-        :bounce_gravity => 1,
-        :bouncy => true
-      )
-
-      lat, lng, json = if marker =~ /^new\s+
-        google\.maps\.Marker\(
-          new\s+google\.maps\.LatLng\(
-            (\d+\.\d+)\s*,\s*
-            (\d+\.\d+)
-          \),\s*
-            (\{[^}]+\})
-        \)
-        /x
-        [ $1, $2, $3 ]
-      end
-
-      assert_in_delta(lng.to_f, 10.00, 0.000001)
-      assert_in_delta(lat.to_f, 10.01, 0.000001)
-      assert_equal(
-        { "bounceGravity" => 1, "bouncy" => true },
-        JSON.load(json)
-      )
-    end
-
-    def test_to_g_json_point
-      assert_equal(
-        { :coordinates => [ 10.0, 10.01, 0 ] },
-        @point.to_g_json_point
-      )
-    end
-
-    def test_to_g_lat_lon_box
-      assert_equal(
-        { :east => 5.0, :west => 0.0, :north => 5.0, :south => 0.0},
-        @polygon.to_g_lat_lon_box
-      )
-    end
-  end
-
   if defined?(Builder::XmlMarkup)
     def test_to_kml_point
       out = StringIO.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geos-extensions
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 7
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors: 
 - J Smith
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -04:00
-default_executable: 
+date: 2011-06-27 00:00:00 Z
 dependencies: []
 
 description: Extensions for the GEOS library.
@@ -31,25 +30,31 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- VERSION
+- app/models/geos/geometry_column.rb
+- app/models/geos/spatial_ref_sys.rb
 - geos-extensions.gemspec
-- lib/active_record_extensions.rb
-- lib/active_record_extensions/connection_adapters/postgresql_adapter.rb
-- lib/active_record_extensions/geometry_columns.rb
-- lib/active_record_extensions/geospatial_scopes.rb
 - lib/geos-extensions.rb
+- lib/geos/active_record_extensions.rb
+- lib/geos/active_record_extensions/connection_adapters/postgresql_adapter.rb
+- lib/geos/active_record_extensions/geometry_columns.rb
+- lib/geos/active_record_extensions/geospatial_scopes.rb
+- lib/geos/geos_helper.rb
+- lib/geos/google_maps.rb
+- lib/geos/google_maps/api_2.rb
+- lib/geos/google_maps/api_3.rb
+- lib/geos/google_maps/polyline_encoder.rb
+- lib/geos/rails/engine.rb
 - lib/geos_extensions.rb
-- lib/geos_helper.rb
-- lib/google_maps.rb
-- lib/google_maps/polyline_encoder.rb
-- rails/railtie.rb
-- rails/tasks/test.rake
+- lib/tasks/test.rake
 - test/fixtures/foos.yml
 - test/geometry_columns_test.rb
 - test/geospatial_scopes_test.rb
+- test/google_maps_api_2_test.rb
+- test/google_maps_api_3_test.rb
 - test/reader_test.rb
 - test/test_helper.rb
 - test/writer_test.rb
-has_rdoc: true
 homepage: http://github.com/zoocasa/geos-extensions
 licenses: []
 
@@ -79,13 +84,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Extensions for the GEOS library.
-test_files: 
-- test/geometry_columns_test.rb
-- test/geospatial_scopes_test.rb
-- test/reader_test.rb
-- test/test_helper.rb
-- test/writer_test.rb
+test_files: []
+

data/lib/active_record_extensions.rb

@@ -1,8 +0,0 @@
-
-module Geos
-  module ActiveRecord
-    autoload :GeometryColumns, File.join(GEOS_EXTENSIONS_BASE, %w{ active_record_extensions geometry_columns })
-    autoload :GeospatialScopes, File.join(GEOS_EXTENSIONS_BASE, %w{ active_record_extensions geospatial_scopes })
-  end
-end
-

data/lib/geos_helper.rb

@@ -1,51 +0,0 @@
-
-module Geos::Helper
-  JS_ESCAPE_MAP = {
-    '\\'    => '\\\\',
-    '</'    => '<\/',
-    "\r\n"  => '\n',
-    "\n"    => '\n',
-    "\r"    => '\n',
-    '"'     => '\\"',
-    "'"     => "\\'"
-  }
-
-  # Escape carrier returns and single and double quotes for JavaScript
-  # segments. Borrowed from ActiveSupport.
-  def self.escape_javascript(javascript) #:nodoc:
-    if javascript
-      javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { JS_ESCAPE_MAP[$1] }
-    else
-      ''
-    end
-  end
-
-    def self.camelize(lower_case_and_underscored_word, first_letter_in_uppercase = false)
-    if first_letter_in_uppercase
-      lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-    else
-      lower_case_and_underscored_word.to_s[0..0].downcase + camelize(lower_case_and_underscored_word, true)[1..-1]
-    end
-    end
-
-    def self.xml_options(*args) #:nodoc:
-    xml = if Builder::XmlMarkup === args.first
-      args.first
-    else
-      Builder::XmlMarkup.new(:indent => 4)
-    end
-
-    options = if Hash === args.last
-      args.last
-    else
-      Hash.new
-    end
-
-    [ xml, options ]
-  end
-
-  def self.number_with_precision(number, precision = 6)
-    rounded_number = (Float(number) * (10 ** precision)).round.to_f / 10 ** precision
-    "%01.#{precision}f" % rounded_number
-  end
-end

data/lib/google_maps.rb

@@ -1,7 +0,0 @@
-
-module Geos
-  module GoogleMaps
-    autoload :PolylineEncoder, File.join(GEOS_EXTENSIONS_BASE, *%w{ google_maps polyline_encoder })
-  end
-end
-

data/rails/railtie.rb

@@ -1,11 +0,0 @@
-
-require "rails/railtie"
-
-module Geos
-  class Railtie < ::Rails::Railtie
-    rake_tasks do
-      load File.join(File.dirname(__FILE__), %w{ tasks test.rake })
-    end
-  end
-end
-