geos-extensions 0.0.4 → 0.0.5

data/Rakefile

@@ -12,7 +12,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "geos-extensions"
-    gem.version = "0.0.4"
+    gem.version = "0.0.5"
     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.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["J Smith"]
-  s.date = %q{2011-02-27}
+  s.date = %q{2011-03-15}
   s.description = %q{Extensions for the GEOS library.}
   s.email = %q{code@zoocasa.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
     "lib/geos_helper.rb",
     "lib/google_maps.rb",
     "lib/google_maps/polyline_encoder.rb",
+    "rails/railtie.rb",
+    "rails/tasks/test.rake",
     "test/fixtures/foos.yml",
     "test/geometry_columns_test.rb",
     "test/geospatial_scopes_test.rb",
@@ -38,7 +40,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/zoocasa/geos-extensions}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Extensions for the GEOS library.}
   s.test_files = [
     "test/geometry_columns_test.rb",

data/lib/active_record_extensions/geometry_columns.rb

@@ -62,6 +62,12 @@ module Geos
             @geometry_columns
           end
 
+          # Force a reload of available geometry columns.
+          def geometry_columns!
+            @geometry_columns = nil
+            geometry_columns
+          end
+
           # Grabs a geometry column based on name.
           def geometry_column_by_name(name)
             @geometry_column_by_name ||= self.geometry_columns.inject(HashWithIndifferentAccess.new) do |memo, obj|
@@ -117,12 +123,12 @@ module Geos
               src, line = <<-EOF, __LINE__ + 1
                 def #{k.name}=(geom)
                   geos = case geom
-                    when /^SRID=default;/
-                      if #{k.srid.inspect}
-                        geom = geom.sub(/default/, #{k.srid.inspect}.to_s)
+                    when /^SRID=default;/i
+                      if srid = self.class.srid_for(#{k.name.inspect})
+                        geom = geom.sub(/default/i, srid.to_s)
                         Geos.from_wkt(geom)
                       else
-                        raise SRIDNotFound.new(self.table_name, #{k.name})
+                        raise SRIDNotFound.new(self.class.table_name, #{k.name.inspect})
                       end
                     else
                       Geos.read(geom)

data/lib/geos-extensions.rb

@@ -6,3 +6,8 @@ if defined?(ActiveRecord)
   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
+
+if defined?(Rails)
+  require File.join(File.dirname(__FILE__), %w{ .. rails railtie })
+end
+

data/lib/geos_extensions.rb

@@ -198,7 +198,7 @@ module Geos
       writer = WktWriter.new
       ret = ''
       ret << "SRID=#{self.srid};" if options[:include_srid]
-      ret << writer.write(self)
+      ret << writer.write(self, options)
       ret
     end
 

data/rails/railtie.rb

@@ -0,0 +1,11 @@
+
+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
+

data/rails/tasks/test.rake

@@ -0,0 +1,42 @@
+
+namespace :test do
+  desc "Dumps data from the geometry_columns and spatial_ref_sys tables."
+  task :postgis_dump do
+    abcs = ActiveRecord::Base.configurations
+    ENV['PGHOST']     = abcs[Rails.env]["host"] if abcs[Rails.env]["host"]
+    ENV['PGPORT']     = abcs[Rails.env]["port"].to_s if abcs[Rails.env]["port"]
+    ENV['PGPASSWORD'] = abcs[Rails.env]["password"].to_s if abcs[Rails.env]["password"]
+    search_path = abcs[Rails.env]["schema_search_path"]
+    unless search_path.blank?
+      search_path = search_path.split(",").map{|search_path| "--schema=#{search_path.strip}" }.join(" ")
+    end
+
+    tables = %w{ geometry_columns spatial_ref_sys }.select do |table|
+      ActiveRecord::Base.connection.table_exists?(table)
+    end
+
+    unless tables.empty?
+      `pg_dump -i -U "#{abcs[Rails.env]["username"]}" --data-only -t #{tables.join(' -t ')} -x -O -f db/#{Rails.env}_postgis_tables.sql #{search_path} #{abcs[Rails.env]["database"]}`
+    else
+      File.open("db/#{Rails.env}_postgis_tables.sql", 'w') do |fp|
+        fp.puts "-- empty, do geometry_columns and spatial_ref_sys tables exist?"
+      end
+    end
+  end
+
+  desc "Loads the geometry_columns and spatial_ref_sys tables."
+  task :postgis_load do
+    abcs = ActiveRecord::Base.configurations
+    ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
+    ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
+    ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
+
+    `psql -U "#{abcs["test"]["username"]}" -f #{Rails.root}/db/#{Rails.env}_postgis_tables.sql #{abcs["test"]["database"]}`
+  end
+
+  desc "Dumps and loads the geometry_columns and spatial_ref_sys_tables."
+  task :postgis_clone => [ :postgis_dump, :postgis_load ]
+end
+
+Rake::Task['test:prepare'].enhance(['test:postgis_clone'])
+

data/test/geospatial_scopes_test.rb

@@ -10,61 +10,61 @@ if ENV['TEST_ACTIVERECORD']
     self.fixture_path = File.join(File.dirname(__FILE__), 'fixtures')
     fixtures :foos
 
-    def tester(method, args, ids = [])
+    def ids_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 ])
+      ids_tester(:st_contains, 'POINT(3 3)', [ 3 ])
     end
 
     def test_containsproperly
-      tester(:st_containsproperly, 'LINESTRING(-4 -4, 4 4)', [ 3 ])
+      ids_tester(:st_containsproperly, 'LINESTRING(-4 -4, 4 4)', [ 3 ])
     end
 
     def test_covers
-      tester(:st_covers, 'LINESTRING(-4 -4, 4 4)', [ 3 ])
+      ids_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 ])
+      ids_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 ])
+      ids_tester(:st_crosses, 'LINESTRING(-6 -6, 4 4)', [ 3 ])
     end
 
     def test_disjoint
-      tester(:st_disjoint, 'POINT(100 100)', [ 1, 2, 3 ])
+      ids_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 ])
+      ids_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 ])
+      ids_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 ])
+      ids_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 ])
+      ids_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 ])
+      ids_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 ])
+      ids_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 ])
+      ids_tester(:st_dwithin, [ 'POINT(5 5)', 10 ], [ 1, 2, 3 ])
     end
 
     def test_with_column

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geos-extensions
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - J Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 -05:00
+date: 2011-03-15 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,8 @@ files:
 - lib/geos_helper.rb
 - lib/google_maps.rb
 - lib/google_maps/polyline_encoder.rb
+- rails/railtie.rb
+- rails/tasks/test.rake
 - test/fixtures/foos.yml
 - test/geometry_columns_test.rb
 - test/geospatial_scopes_test.rb
@@ -77,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Extensions for the GEOS library.