geos-extensions 0.0.3 → 0.0.4

data/README.rdoc

@@ -94,6 +94,15 @@ We've also included some Rails integration for PostGIS, including:
         :limit => 10
       )
 
-We wrote this code for Rails 2.3 and are currently testing on Rails
-3, but it appears that everything is working as expected and is
-working with Arel. (Things are looking good so far!)
+=== Running ActiveRecord Tests
+
+ActiveRecord unit tests can be run by setting the TEST_ACTIVERECORD
+environment variable when running `rake test`. The test database name
+is geos_extensions_unit_tests and requires PostGIS to be installed. The
+test scripts will try to find your postgis.sql and spatial_ref_sys.sql
+files, but if it needs a hint, set the POSTGIS_PATH environment variable
+to the directory the files are in to create the database properly. You
+can also set the database up manually before running the tests -- just
+make sure the database has PostGIS installed with the spatial_ref_sys
+table populated and you'll be fine.
+

data/Rakefile

@@ -12,7 +12,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "geos-extensions"
-    gem.version = "0.0.3"
+    gem.version = "0.0.4"
     gem.summary = "Extensions for the GEOS library."
     gem.description = gem.summary
     gem.email = "code@zoocasa.com"

data/geos-extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geos-extensions}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["J Smith"]
-  s.date = %q{2011-02-24}
+  s.date = %q{2011-02-27}
   s.description = %q{Extensions for the GEOS library.}
   s.email = %q{code@zoocasa.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,9 @@ Gem::Specification.new do |s|
     "lib/geos_helper.rb",
     "lib/google_maps.rb",
     "lib/google_maps/polyline_encoder.rb",
+    "test/fixtures/foos.yml",
+    "test/geometry_columns_test.rb",
+    "test/geospatial_scopes_test.rb",
     "test/reader_test.rb",
     "test/test_helper.rb",
     "test/writer_test.rb"
@@ -38,6 +41,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.5.2}
   s.summary = %q{Extensions for the GEOS library.}
   s.test_files = [
+    "test/geometry_columns_test.rb",
+    "test/geospatial_scopes_test.rb",
     "test/reader_test.rb",
     "test/test_helper.rb",
     "test/writer_test.rb"

data/lib/active_record_extensions/connection_adapters/postgresql_adapter.rb

@@ -20,7 +20,7 @@ module ActiveRecord
             "Geometry column load for #{table_name}"
           )
 
-          returning(PostgreSQLGeometryColumn.new(c.name)) do |g|
+          PostgreSQLGeometryColumn.new(c.name).tap do |g|
             # since we're too stupid at the moment to understand
             # PostgreSQL schemas, let's just go with this:
             if res.ntuples == 1

data/lib/active_record_extensions/geospatial_scopes.rb

@@ -50,7 +50,7 @@ module Geos
     #   as we'll assume the SRID of the column to be whatever the SRID of
     #   the geometry is.
     module GeospatialScopes
-      SCOPE_METHOD = if Rails.version >= '3.0'
+      SCOPE_METHOD = if ::ActiveRecord::VERSION::MAJOR >= 3
         'scope'
       else
         'named_scope'
@@ -83,13 +83,21 @@ module Geos
                 :use_index => true
               }.merge(args.extract_options!)
 
-              geom = Geos.read(args.first)
-              column_name = ::ActiveRecord::Base.connection.quote_table_name(options[:column])
+              column_name = self.connection.quote_table_name(options[:column])
               column_srid = self.srid_for(options[:column])
-              geom_srid = if geom.srid == 0
+
+              geom = if args.first.is_a?(String) && args.first =~ /^SRID=default;/
+                args.first.sub(/default/, (column_srid || -1).to_s)
+              else
+                args.first
+              end
+
+              geos = Geos.read(geom)
+
+              geom_srid = if geos.srid == 0
                 -1
               else
-                geom.srid
+                geos.srid
               end
 
               function = if options[:use_index]
@@ -111,7 +119,7 @@ module Geos
               {
                 :conditions => [
                   conditions,
-                  geom.to_ewkb
+                  geos.to_ewkb
                 ]
               }
             }

data/lib/geos-extensions.rb

@@ -1,9 +1,8 @@
 
 require File.join(File.dirname(__FILE__), *%w{ geos_extensions })
 
-if defined?(Rails)
+if defined?(ActiveRecord)
   require File.join(GEOS_EXTENSIONS_BASE, *%w{ active_record_extensions connection_adapters postgresql_adapter })
   require File.join(GEOS_EXTENSIONS_BASE, *%w{ active_record_extensions geometry_columns })
   require File.join(GEOS_EXTENSIONS_BASE, *%w{ active_record_extensions geospatial_scopes })
 end
-

data/lib/geos_extensions.rb

@@ -16,7 +16,7 @@ module Geos
   autoload :ActiveRecord, File.join(GEOS_EXTENSIONS_BASE, 'active_record_extensions')
   autoload :GoogleMaps, File.join(GEOS_EXTENSIONS_BASE, 'google_maps')
 
-  REGEXP_WKT = /^(?:SRID=([0-9]+);)?(\s*[PLMCG].+)/i
+  REGEXP_WKT = /^(?:SRID=(-?[0-9]+);)?(\s*[PLMCG].+)/i
   REGEXP_WKB_HEX = /^[A-Fa-f0-9\s]+$/
   REGEXP_G_LAT_LNG_BOUNDS = /^
     \(

data/test/fixtures/foos.yml

@@ -0,0 +1,16 @@
+---
+one:
+  id: 1
+  name: "one"
+  the_geom: 'POINT(0 0)'
+  the_other_geom: 'SRID=4326; POINT(10 10)'
+two:
+  id: 2
+  name: "two"
+  the_geom: 'POINT(10 10)'
+  the_other_geom: 'SRID=4326; POINT(20 20)'
+three:
+  id: 3
+  name: "three"
+  the_geom: 'POLYGON((-5 -5, -5 5, 5 5, 5 -5, -5 -5))'
+  the_other_geom: 'SRID=4326; POLYGON((5 5, 5 10, 10 10, 10 5, 5 5))'

data/test/geometry_columns_test.rb

@@ -0,0 +1,150 @@
+
+$: << File.dirname(__FILE__)
+require 'test_helper'
+
+if ENV['TEST_ACTIVERECORD']
+  class GeometryColumnsTests < ActiveRecord::TestCase
+    include TestHelper
+    include ActiveRecord::TestFixtures
+
+    self.fixture_path = File.join(File.dirname(__FILE__), 'fixtures')
+    fixtures :foos
+
+    def test_geometry_columns_detected
+      assert_equal(2, Foo.geometry_columns.length)
+
+      Foo.geometry_columns.each do |column|
+        assert_kind_of(ActiveRecord::ConnectionAdapters::PostgreSQLGeometryColumn, column)
+      end
+    end
+
+    def test_srid_for
+      assert_equal(-1, Foo.srid_for(:the_geom))
+      assert_equal(4326, Foo.srid_for(:the_other_geom))
+    end
+
+    def test_coord_dimension_for
+      assert_equal(2, Foo.coord_dimension_for(:the_geom))
+      assert_equal(2, Foo.coord_dimension_for(:the_other_geom))
+    end
+
+    def test_geometry_column_by_name
+      assert_kind_of(ActiveRecord::ConnectionAdapters::PostgreSQLGeometryColumn, Foo.geometry_column_by_name(:the_geom))
+      assert_kind_of(ActiveRecord::ConnectionAdapters::PostgreSQLGeometryColumn, Foo.geometry_column_by_name(:the_other_geom))
+    end
+
+    def test_accessors
+      foo = Foo.find(1)
+
+      Geos::ActiveRecord::GeometryColumns::GEOMETRY_COLUMN_OUTPUT_FORMATS.each do |format|
+        assert(foo.respond_to?("the_geom_#{format}"))
+        assert(foo.respond_to?("the_other_geom_#{format}"))
+      end
+    end
+
+    def test_without_accessor
+      foo = Foo.find(1)
+      assert_kind_of(String, foo.the_geom)
+    end
+
+    def test_geos_accessor
+      foo = Foo.find(1)
+      assert_kind_of(Geos::Point, foo.the_geom_geos)
+    end
+
+    def test_wkt_accessor
+      foo = Foo.find(1)
+      assert_kind_of(String, foo.the_geom_wkt)
+      assert_match(/^POINT\s*\(0\.0+\s+0\.0+\)$/, foo.the_geom_wkt)
+    end
+
+    def test_wkb_accessor
+      foo = Foo.find(1)
+      assert_kind_of(String, foo.the_geom_wkb)
+      assert_match(/^[A-F0-9]+$/, foo.the_geom_wkb)
+    end
+
+    def test_ewkt_accessor
+      foo = Foo.find(1)
+      assert_kind_of(String, foo.the_geom_ewkt)
+      assert_match(/^SRID=\d+;POINT\s*\(0\.0+\s+0\.0+\)$/, foo.the_geom_ewkt)
+    end
+
+    def test_ewkb_accessor
+      foo = Foo.find(1)
+      assert_kind_of(String, foo.the_geom_ewkb)
+      assert(/^[A-F0-9]+$/, foo.the_geom_wkb)
+    end
+
+    def test_wkb_bin_accessor
+      foo = Foo.find(1)
+      assert_kind_of(String, foo.the_geom_wkb_bin)
+    end
+
+    def test_ewkb_bin_accessor
+      foo = Foo.find(1)
+      assert_kind_of(String, foo.the_geom_ewkb_bin)
+    end
+
+    def test_geos_create
+      foo = Foo.create!(
+        :name => 'test_geos_create',
+        :the_geom => Geos.read(POINT_WKT)
+      )
+
+      foo.reload
+      assert_saneness_of_point(foo.the_geom_geos)
+    end
+
+    def test_wkt_create
+      foo = Foo.create!(
+        :name => 'test_wkt_create',
+        :the_geom => POINT_WKT
+      )
+
+      foo.reload
+      assert_saneness_of_point(foo.the_geom_geos)
+    end
+
+    def test_wkb_create
+      foo = Foo.create!(
+        :name => 'test_wkb_create',
+        :the_geom => POINT_WKB
+      )
+
+      foo.reload
+      assert_saneness_of_point(foo.the_geom_geos)
+    end
+
+    def test_ewkt_create_with_srid_4326
+      foo = Foo.create!(
+        :name => 'test_ewkt_create_with_srid_4326',
+        :the_other_geom => POINT_EWKT
+      )
+
+      foo.reload
+      assert_saneness_of_point(foo.the_other_geom_geos)
+    end
+
+    def test_ewkt_create_with_srid_default
+      foo = Foo.create!(
+        :name => 'test_ewkt_create_with_srid_default',
+        :the_other_geom => POINT_EWKT_WITH_DEFAULT
+      )
+
+      foo.reload
+      assert_saneness_of_point(foo.the_other_geom_geos)
+      foo.the_other_geom_geos
+    end
+
+    def test_ewkb_create
+      foo = Foo.create!(
+        :name => 'test_ewkb_create',
+        :the_other_geom => POINT_EWKB
+      )
+
+      foo.reload
+      assert_saneness_of_point(foo.the_other_geom_geos)
+    end
+  end
+end

data/test/geospatial_scopes_test.rb

@@ -0,0 +1,88 @@
+
+$: << File.dirname(__FILE__)
+require 'test_helper'
+
+if ENV['TEST_ACTIVERECORD']
+  class GeospatialScopesTests < ActiveRecord::TestCase
+    include TestHelper
+    include ActiveRecord::TestFixtures
+
+    self.fixture_path = File.join(File.dirname(__FILE__), 'fixtures')
+    fixtures :foos
+
+    def tester(method, args, ids = [])
+      geoms = Foo.send(method, *Array(args)).all
+      assert_equal(ids.sort, geoms.collect(&:id).sort)
+    end
+
+    def test_contains
+      tester(:st_contains, 'POINT(3 3)', [ 3 ])
+    end
+
+    def test_containsproperly
+      tester(:st_containsproperly, 'LINESTRING(-4 -4, 4 4)', [ 3 ])
+    end
+
+    def test_covers
+      tester(:st_covers, 'LINESTRING(-4 -4, 4 4)', [ 3 ])
+    end
+
+    def test_coveredby
+      tester(:st_coveredby, 'POLYGON((-6 -6, -6 6, 6 6, 6 -6, -6 -6))', [ 1, 3 ])
+    end
+
+    def test_crosses
+      tester(:st_crosses, 'LINESTRING(-6 -6, 4 4)', [ 3 ])
+    end
+
+    def test_disjoint
+      tester(:st_disjoint, 'POINT(100 100)', [ 1, 2, 3 ])
+    end
+
+    def test_equal
+      tester(:st_equals, 'POLYGON((-5 -5, -5 5, 5 5, 5 -5, -5 -5))', [ 3 ])
+    end
+
+    def test_intersects
+      tester(:st_intersects, 'LINESTRING(-5 -5, 10 10)', [ 1, 2, 3 ])
+    end
+
+    def test_orderingequals
+      tester(:st_orderingequals, 'POLYGON((-5 -5, -5 5, 5 5, 5 -5, -5 -5))', [ 3 ])
+    end
+
+    def test_overlaps
+      tester(:st_overlaps, 'POLYGON((-6 -6, -5 0, 0 0, 0 -5, -6 -6))', [ 3 ])
+    end
+
+    def test_touches
+      tester(:st_touches, 'POLYGON((-5 -5, -5 -10, -10 -10, -10 -5, -5 -5))', [ 3 ])
+    end
+
+    def test_within
+      tester(:st_within, 'POLYGON((-5 -5, 5 10, 20 20, 10 5, -5 -5))', [ 1, 2 ])
+    end
+
+    def test_dwithin
+      tester(:st_dwithin, [ 'POINT(5 5)', 10 ], [ 1, 2, 3 ])
+    end
+
+    def test_with_column
+      assert_equal([1, 2, 3], Foo.st_disjoint('POINT(100 100)', :column => :the_other_geom).all.collect(&:id).sort)
+    end
+
+    def test_with_srid_switching
+      assert_equal([1, 2, 3], Foo.st_disjoint('SRID=4326; POINT(100 100)').all.collect(&:id).sort)
+    end
+
+    def test_with_srid_default
+      assert_equal([1, 2, 3], Foo.st_disjoint('SRID=default; POINT(100 100)').all.collect(&:id).sort)
+      assert_equal([3], Foo.st_contains('SRID=default; POINT(-3 -3)').all.collect(&:id).sort)
+    end
+
+    def test_with_srid_transform
+      assert_equal([1, 2, 3], Foo.st_disjoint('SRID=4269; POINT(100 100)', :column => :the_other_geom).all.collect(&:id).sort)
+      assert_equal([3], Foo.st_contains('SRID=4269; POINT(7 7)', :column => :the_other_geom).all.collect(&:id).sort)
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,6 +1,26 @@
 
 require 'rubygems'
 require 'test/unit'
+
+if ENV['TEST_ACTIVERECORD']
+  ACTIVERECORD_GEM_VERSION = ENV['ACTIVERECORD_GEM_VERSION'] || '~> 3.0.3'
+  gem 'activerecord', ACTIVERECORD_GEM_VERSION
+
+  POSTGIS_PATHS = [
+    ENV['POSTGIS_PATH'],
+    '/opt/local/share/postgresql*/contrib/postgis-*',
+    '/usr/share/postgresql*/contrib/postgis-*',
+    '/usr/pgsql-*/share/contrib/postgis-*',
+  ].compact
+
+  puts "Testing against ActiveRecord #{Gem.loaded_specs['activerecord'].version.to_s}"
+  require 'active_support'
+  require 'active_support/core_ext/module/aliasing'
+  require 'active_record'
+  require 'active_record/fixtures'
+  require 'logger'
+end
+
 require File.join(File.dirname(__FILE__), %w{ .. lib geos_extensions })
 
 puts "Ruby version #{RUBY_VERSION} - #{RbConfig::CONFIG['RUBY_INSTALL_NAME']}"
@@ -9,9 +29,71 @@ if defined?(Geos::FFIGeos)
   puts "Using #{Geos::FFIGeos.geos_library_paths.join(', ')}"
 end
 
+if ENV['TEST_ACTIVERECORD']
+  ActiveRecord::Base.logger = Logger.new("debug.log")
+  ActiveRecord::Base.configurations = {
+    'arunit' => {
+      :adapter => 'postgresql',
+      :database => 'geos_extensions_unit_tests',
+      :min_messages => 'warning',
+      :schema_search_path => 'public'
+    }
+  }
+
+  ActiveRecord::Base.establish_connection 'arunit'
+  ARBC = ActiveRecord::Base.connection
+
+  puts "Checking for PostGIS install"
+  2.times do
+    begin
+      if postgis_version = ARBC.query('SELECT postgis_version()').to_s
+        puts "PostGIS info from postgis_version(): #{postgis_version}"
+        break
+      end
+    rescue ActiveRecord::StatementInvalid
+      puts "Trying to install PostGIS. If this doesn't work, you'll have to do this manually!"
+
+      plpgsql = ARBC.query(%{SELECT count(*) FROM pg_language WHERE lanname = 'plpgsql'}).to_s
+      if plpgsql == '0'
+        ARBC.execute(%{CREATE LANGUAGE plpgsql})
+      end
+
+      %w{
+        postgis.sql
+        spatial_ref_sys.sql
+      }.each do |file|
+        if !(found = Dir.glob(POSTGIS_PATHS).collect { |path|
+          File.join(path, file)
+        }.first)
+          puts "ERROR: Couldn't find #{file}. Try setting the POSTGIS_PATH to give us a hint!"
+          exit
+        else
+          ARBC.execute(File.read(found))
+        end
+      end
+    end
+  end
+
+  if !ARBC.table_exists?('foos')
+    ActiveRecord::Migration.create_table(:foos) do |t|
+      t.text :name
+    end
+
+    ARBC.execute(%{SELECT AddGeometryColumn('public', 'foos', 'the_geom', -1, 'GEOMETRY', 2)})
+    ARBC.execute(%{SELECT AddGeometryColumn('public', 'foos', 'the_other_geom', 4326, 'GEOMETRY', 2)})
+  end
+
+  class Foo < ActiveRecord::Base
+    include Geos::ActiveRecord::GeometryColumns
+    include Geos::ActiveRecord::GeospatialScopes
+    create_geometry_column_accessors!
+  end
+end
+
 module TestHelper
   POINT_WKT = 'POINT(10 10.01)'
   POINT_EWKT = 'SRID=4326; POINT(10 10.01)'
+  POINT_EWKT_WITH_DEFAULT = 'SRID=default; POINT(10 10.01)'
   POINT_WKB = "0101000000000000000000244085EB51B81E052440"
   POINT_WKB_BIN = "\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x24\x40\x85\xEB\x51\xB8\x1E\x05\x24\x40"
   POINT_EWKB = "0101000020E6100000000000000000244085EB51B81E052440"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geos-extensions
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - J Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -05:00
+date: 2011-02-27 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,9 @@ files:
 - lib/geos_helper.rb
 - lib/google_maps.rb
 - lib/google_maps/polyline_encoder.rb
+- test/fixtures/foos.yml
+- test/geometry_columns_test.rb
+- test/geospatial_scopes_test.rb
 - test/reader_test.rb
 - test/test_helper.rb
 - test/writer_test.rb
@@ -79,6 +82,8 @@ 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