postgis_adapter 0.7.8 → 0.7.9

data/Gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+gem "pg"
+gem "nofxx-georuby"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "~> 2.3.0"
+  gem "bundler", "~> 1.0.0"
+  gem "rcov", ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,27 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    json_pure (1.4.6)
+    nofxx-georuby (1.9.0)
+      json_pure (>= 1.4.6)
+    pg (0.10.1)
+    rcov (0.9.9)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  nofxx-georuby
+  pg
+  rcov
+  rspec (~> 2.3.0)

data/README.rdoc

@@ -8,45 +8,39 @@ This fork adds handy methods to make geometrical calculations on postgis.
 Based on http://georuby.rubyforge.org Spatial Adapter
 
 RDocs - http://docs.github.com/nofxx/postgis_adapter
+Postgis Online reference - http://postgis.refractions.net
 Postgis Manual - http://postgis.refractions.net/documentation/manual-svn
 
-*PostGIS and Rails 2+ only*.
-
 
 == Install
 
 If you are using Spatial Adapter, *remove it first*.
 
+    gem install postgis_adapter
+
 
 === Dependencies
 
-- georuby
+- georuby gem
 - postgres 8.3+
 - postgis  1.3+
 
 
-=== As gem:
-
-    sudo gem install postgis-adapter
-
-Rails:
-
-    config.gem "postgis_adapter"
-
+=== Rails 3+
 
-Github version:
+Add dependency to Gemfile:
 
+    gem "postgis_adapter"
 
-    sudo gem install nofxx-postgis_adapter --source http://gems.github.com
 
-Rails:
+Or, to use latest from repository:
 
-    config.gem "nofxx-postgis_adapter", :lib => "postgis_adapter", :source => "http://gems.github.com"
+    gem "postgis_adapter", :git => 'git://github.com/nofxx/postgis_adapter.git'
 
 
-=== As plugin:
+=== Rails 2
 
-    script/plugin install git://github.com/nofxx/postgis_adapter.git
+    gem install postgis_adapter -v 0.7.8
 
 
 == How to Use
@@ -267,6 +261,34 @@ Types:
     geometry_collection
 
 
+=== PostGIS Helper Scripts
+
+Optional, this will create postgis enabled database automatically for you.
+
+Helpers to create postgis template database. At time of writing,
+postgis.sql and spatial_ref_sys.sql are used.
+
+
+==== System wide
+
+
+Find where your OS put those sql files and:
+
+    rake postgis:template path/to/sqls/folder
+
+
+==== Vendorize
+
+Place the following scripts in a folder named 'spatial' under the 'db' folder; For example:
+
+  RAILS_ROOT/db/spatial/lwpostgis.sql
+  RAILS_ROOT/db/spatial/spatial_ref_sys
+
+These will be used when creating the Test database when running the Rake Test tasks.
+These scripts should have been installed when the PostGIS libraries were installed.
+Online reference: http://postgis.refractions.net/
+
+
 === Fixtures
 
 If you use fixtures for your unit tests, at some point,
@@ -323,6 +345,17 @@ something like this :
        place.the_geom = the_geom
 
 
+== Postgis Adapter
+
+Marcos Piccinini (nofxx)
+Ying Tsen Hong (tsenying)
+Simon Tokumine (tokumine)
+Fernando Blat (ferblape)
+Shoaib Burq (sabman)
+
+(in order of appearance)
+
+
 == License
 
 Spatial Adapter for Rails is released under the MIT license.
@@ -331,7 +364,7 @@ Postgis Adapter is released under the MIT license.
 
 == Support
 
-Tested using rails 2.2.2/2.3.3 / postgresql 8.3.7 / postgis 1.3.3 / linux / osx
+Tested using activerecord 3+ / postgresql 8.5+ / postgis 1.5+ / linux / osx
 
 Any questions, enhancement proposals, bug notifications or corrections:
 

data/Rakefile

@@ -1,38 +1,36 @@
 require 'rubygems'
 require 'rake'
+require 'rake/clean'
+require 'rake/rdoctask'
+#require 'spec/rake/spectask'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "postgis_adapter"
-    gem.summary = "PostGIS Adapter for Active Record"
-    gem.description = "Execute PostGIS functions on Active Record"
-    gem.email = "x@nofxx.com"
-    gem.homepage = "http://github.com/nofxx/postgis_adapter"
-    gem.authors = ["Marcos Piccinini"]
-    gem.rubyforge_project = "postgis_adapter"
-    # TODO: better way for this.....
-    #    gem.add_dependency 'geo_ruby'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+CLEAN.include('**/*.gem')
+
+namespace :gem do
+  desc "Create the postgis_adapter gem"
+  task :create => [:clean] do
+    spec = eval(IO.read('postgis_adapter.gemspec'))
+    Gem::Builder.new(spec).build
   end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+  desc "Install the postgis_adapter gem"
+  task :install => [:create] do
+    file = Dir['*.gem'].first
+    sh "gem install #{file}"
+  end
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-task :default => :spec
+# Spec::Rake::SpecTask.new(:spec) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.spec_files = FileList['spec/**/*_spec.rb']
+# end
+
+# Spec::Rake::SpecTask.new(:rcov) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.pattern = 'spec/**/*_spec.rb'
+#   spec.rcov = true
+# end
 
-require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION').chomp : ""
   rdoc.rdoc_dir = 'rdoc'
@@ -41,6 +39,8 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+task :default => :spec
+
 #
 # Reek & Roodi
 #

data/VERSION

@@ -1 +1 @@
-0.7.8
+0.7.9

data/lib/postgis_adapter.rb

@@ -5,21 +5,21 @@
 # Code from
 # http://georuby.rubyforge.org Spatial Adapter
 #
-require 'activerecord'
+require 'active_record'
 require 'active_record/connection_adapters/postgresql_adapter'
 require 'geo_ruby'
 require 'postgis_adapter/common_spatial_adapter'
-require 'postgis_functions'
-require 'postgis_functions/common'
-require 'postgis_functions/class'
-require 'postgis_functions/bbox'
+require 'postgis_adapter/functions'
+require 'postgis_adapter/functions/common'
+require 'postgis_adapter/functions/class'
+require 'postgis_adapter/functions/bbox'
 require 'postgis_adapter/acts_as_geom'
 
 include GeoRuby::SimpleFeatures
 include SpatialAdapter
 
 #tables to ignore in migration : relative to PostGIS management of geometric columns
-ActiveRecord::SchemaDumper.ignore_tables << "spatial_ref_sys" << "geometry_columns"
+ActiveRecord::SchemaDumper.ignore_tables.concat %w{ spatial_ref_sys geometry_columns geography_columns }
 
 #add a method to_yaml to the Geometry class which will transform a geometry in a form suitable to be used in a YAML file (such as in a fixture)
 GeoRuby::SimpleFeatures::Geometry.class_eval do
@@ -102,6 +102,25 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
 
   include SpatialAdapter
 
+  # SCHEMA STATEMENTS ========================================
+
+  alias :original_recreate_database :recreate_database
+  def recreate_database(configuration, enc_option)
+    `dropdb -U "#{configuration["test"]["username"]}" #{configuration["test"]["database"]}`
+    `createdb #{enc_option} -U "#{configuration["test"]["username"]}" #{configuration["test"]["database"]}`
+    `createlang -U "#{configuration["test"]["username"]}" plpgsql #{configuration["test"]["database"]}`
+    `psql -d #{configuration["test"]["database"]} -f db/spatial/postgis.sql`
+    `psql -d #{configuration["test"]["database"]} -f db/spatial/spatial_ref_sys.sql`
+  end
+
+  alias :original_create_database :create_database
+  def create_database(name, options = {})
+    original_create_database(name, options = {})
+    `createlang plpgsql #{name}`
+    `psql -d #{name} -f db/spatial/postgis.sql`
+    `psql -d #{name} -f db/spatial/spatial_ref_sys.sql`
+  end
+
   alias :original_native_database_types :native_database_types
   def native_database_types
     original_native_database_types.update(geometry_data_types)
@@ -248,16 +267,16 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
     end
   end
 
-#  # For version of Rails where exists disable_referential_integrity
+ # For version of Rails where exists disable_referential_integrity
  if self.instance_methods.include? "disable_referential_integrity"
    #Pete Deffendol's patch
    alias :original_disable_referential_integrity :disable_referential_integrity
    def disable_referential_integrity(&block) #:nodoc:
-     ignore_tables = %w{ geometry_columns spatial_ref_sys geography_columns }
-     execute(tables.select { |name| !ignore_tables.include?(name) }.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
+     ignore_tables = %w{ geometry_columns spatial_ref_sys } # geography_columns + views
+     execute(tables.select { |name| !ignore_tables.include?(name) }.map { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
      yield
    ensure
-     execute(tables.select { |name| !ignore_tables.include?(name)}.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
+     execute(tables.select { |name| !ignore_tables.include?(name)}.map { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
    end
  end
 
@@ -289,8 +308,8 @@ SELECT * FROM geometry_columns WHERE f_table_name = '#{table_name}'
     end
 
     raw_geom_infos
-    rescue => e
-      nil
+  rescue => e
+    nil
   end
 
 end

data/lib/postgis_adapter/acts_as_geom.rb

@@ -3,7 +3,8 @@
 #
 # http://github.com/nofxx/postgis_adapter
 #
-module PostgisFunctions
+module PostgisAdapter
+module Functions
   def self.included(base)
     base.send :extend, ClassMethods
   end
@@ -24,6 +25,7 @@ module PostgisFunctions
         when :point       then  PointFunctions
         when :polygon     then PolygonFunctions
         when :line_string, :multi_line_string then  LineStringFunctions
+        when :multi_polygon then MultiPolygonFunctions
       end unless geom[0].kind_of? Symbol
     end
     alias :acts_as_geom :has_geom
@@ -36,5 +38,6 @@ module PostgisFunctions
     end
   end
 end
+end
 
-ActiveRecord::Base.send :include, PostgisFunctions
+ActiveRecord::Base.send :include, PostgisAdapter::Functions

data/lib/postgis_adapter/common_spatial_adapter.rb

@@ -49,7 +49,7 @@ ActiveRecord::SchemaDumper.class_eval do
 
       columns.each do |column|
 
-        raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" if @types[column.type].nil?
+        raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}' in table '#{table}'" if @types[column.type].nil?
         next if column.name == pk
         #need to use less_simplified_type  here or have each specific geometry type be simplified to a specific simplified type in Column and each one treated separately in the Column methods
         if column.is_a?(SpatialColumn)

data/lib/{postgis_functions.rb → postgis_adapter/functions.rb}

@@ -15,7 +15,8 @@
 # Earth Spheroid - http://en.wikipedia.org/wiki/Figure_of_the_Earth
 #
 
-module PostgisFunctions
+module PostgisAdapter
+module Functions
   # WGS84 Spheroid
   EARTH_SPHEROID = "'SPHEROID[\"GRS-80\",6378137,298.257222101]'" # SRID => 4326
 
@@ -114,7 +115,7 @@ module PostgisFunctions
   end
 
 end
-
+end
 #
 # POINT(0 0)
 # LINESTRING(0 0,1 1,1 2)

data/lib/{postgis_functions → postgis_adapter/functions}/bbox.rb

@@ -4,7 +4,8 @@
 # BBox
 #
 #
-module PostgisFunctions
+module PostgisAdapter
+module Functions
 
   #
   # These operators utilize indexes. They compare geometries by bounding boxes.
@@ -126,3 +127,4 @@ module PostgisFunctions
     bbox("=", other)
   end
 end
+end

data/lib/{postgis_functions → postgis_adapter/functions}/class.rb

@@ -1,4 +1,5 @@
-module PostgisFunctions
+module PostgisAdapter
+module Functions
 
     #
     # Class Methods
@@ -47,17 +48,20 @@ module PostgisFunctions
         find(:all, :order => "ST_Perimeter(geom) #{sort}" )
       end
 
-      def all_within(other, margin=1)
-  #      find(:all, :conditions => "ST_DWithin(geom, ST_GeomFromEWKB(E'#{other.as_ewkt}'), #{margin})")
+      def all_dwithin(other, margin=1)
+        # find(:all, :conditions => "ST_DWithin(geom, ST_GeomFromEWKB(E'#{other.as_ewkt}'), #{margin})")
         find(:all, :conditions => "ST_DWithin(geom, ST_GeomFromEWKT(E'#{other.as_hex_ewkb}'), #{margin})")
       end
 
+      def all_within(other)
+        find(:all, :conditions => "ST_Within(geom, ST_GeomFromEWKT(E'#{other.as_hex_ewkb}'))")
+      end
+
       def by_boundaries sort='asc'
         find(:all, :order => "ST_Boundary(geom) #{sort}" )
       end
 
     end
 
-
-
+end
 end

data/lib/{postgis_functions → postgis_adapter/functions}/common.rb

@@ -6,7 +6,15 @@
 # The methods here can be used by all geoms.
 #
 
-module PostgisFunctions
+module PostgisAdapter
+module Functions
+
+  #
+  # Test if a geometry is well formed.
+  #
+  def valid_geom?
+    postgis_calculate(:isvalid, self)
+  end
 
   #
   # True if the given geometries represent the same geometry.
@@ -232,12 +240,17 @@ module PostgisFunctions
     postgis_calculate(:simplify, self, tolerance)
   end
 
-
   def simplify!(tolerance=0.1)
     #FIXME: not good..
     self.update_attribute(geo_columns.first, simplify)
   end
 
+  #
+  #
+  def buffer(width=0.1)
+    postgis_calculate(:buffer, self, width)
+  end
+
   #
   # Returns a "simplified" version of the given geometry using the Douglas-Peuker
   # algorithm. Will avoid creating derived geometries (polygons in particular) that
@@ -509,10 +522,18 @@ module PostgisFunctions
   #
   # http://geojson.org/
   #
-  def as_geo_json(precision=15, bbox=0)
+  def as_geo_json(precision=15, bbox = 0)
     postgis_calculate(:AsGeoJSON, self, [precision, bbox])
   end
 
+  #
+  # ST_PointOnSurface — Returns a POINT guaranteed to lie on the surface.
+  #
+  # geometry ST_PointOnSurface(geometry g1);eometry A, geometry B);
+  #
+  def point_on_surface
+    postgis_calculate(:pointonsurface, self)
+  end
 
   #
   #
@@ -875,8 +896,20 @@ module PostgisFunctions
 
   end
 
-end
+  #
+  #
+  #
+  #
+  # MultiPolygon
+  #
+  #
+  #
+  #
+  module MultiPolygonFunctions
+  end
 
+end
+end
 # NEW
 #ST_OrderingEquals — Returns true if the given geometries represent the same geometry and points are in the same directional order.
 #boolean ST_OrderingEquals(g

data/lib/postgis_adapter/railtie.rb

@@ -0,0 +1,7 @@
+module PostgisAdapter
+  class Railtie < Rails::Railtie
+    initializer "postgis adapter" do
+      require "postgis_adapter"
+    end
+  end
+end

data/postgis_adapter.gemspec

@@ -1,76 +1,19 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+Gem::Specification.new do |spec|
+  spec.name     = 'postgis_adapter'
+  spec.version  = '0.7.9'
+  spec.authors  = ['Marcos Piccinini']
+  spec.summary  = 'PostGIS Adapter for Active Record'
+  spec.email    = 'x@nofxx.com'
+  spec.homepage = 'http://github.com/nofxx/postgis_adapter'
 
-Gem::Specification.new do |s|
-  s.name = %q{postgis_adapter}
-  s.version = "0.7.8"
+  spec.rdoc_options = ['--charset=UTF-8']
+  spec.rubyforge_project = 'postgis_adapter'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-02-26}
-  s.description = %q{Execute PostGIS functions on Active Record}
-  s.email = %q{x@nofxx.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "History.txt",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "init.rb",
-     "lib/postgis_adapter.rb",
-     "lib/postgis_adapter/acts_as_geom.rb",
-     "lib/postgis_adapter/common_spatial_adapter.rb",
-     "lib/postgis_functions.rb",
-     "lib/postgis_functions/bbox.rb",
-     "lib/postgis_functions/class.rb",
-     "lib/postgis_functions/common.rb",
-     "postgis_adapter.gemspec",
-     "rails/init.rb",
-     "spec/db/models_postgis.rb",
-     "spec/db/schema_postgis.rb",
-     "spec/postgis_adapter/acts_as_geom_spec.rb",
-     "spec/postgis_adapter/common_spatial_adapter_spec.rb",
-     "spec/postgis_adapter_spec.rb",
-     "spec/postgis_functions/bbox_spec.rb",
-     "spec/postgis_functions/class_spec.rb",
-     "spec/postgis_functions/common_spec.rb",
-     "spec/postgis_functions_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/nofxx/postgis_adapter}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{postgis_adapter}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{PostGIS Adapter for Active Record}
-  s.test_files = [
-    "spec/db/models_postgis.rb",
-     "spec/db/schema_postgis.rb",
-     "spec/postgis_adapter/acts_as_geom_spec.rb",
-     "spec/postgis_adapter/common_spatial_adapter_spec.rb",
-     "spec/postgis_functions_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/postgis_adapter_spec.rb",
-     "spec/postgis_functions/class_spec.rb",
-     "spec/postgis_functions/common_spec.rb",
-     "spec/postgis_functions/bbox_spec.rb"
-  ]
+  spec.files = Dir['**/*'].reject{ |f| f.include?('git') }
+  spec.test_files = Dir['spec/**/*.rb']
+  spec.extra_rdoc_files  = ['README.rdoc']
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  spec.add_dependency 'GeoRuby'
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  spec.description = 'Execute PostGIS functions on Active Record'
 end
-

data/rails/init.rb

@@ -1,9 +1,28 @@
+# Patch Arel to support geometry type.
+module Arel
+  module Attributes
+    class << self
+      alias original_for for
+
+      def for(column)
+        case column.type
+        when :geometry then String
+        else
+          original_for(column)
+        end
+      end
+    end
+  end
+end
+
 class SpatialAdapterNotCompatibleError < StandardError
 end
 
-unless ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-  raise SpatialAdapterNotCompatibleError.
-    new("Database config file not set or it does not map to PostgreSQL\n" +
-        "Only PostgreSQL with PostGIS is supported by postgis_adapter.")
+unless ActiveRecord::Base.connection.adapter_name.downcase == 'postgresql'
+  error_message = "Database config file not set or it does not map to "
+  error_message << "PostgreSQL.\nOnly PostgreSQL with PostGIS is supported "
+  error_message << "by postgis_adapter.")
+  raise SpatialAdapterNotCompatibleError.new(error_message)
 end
+
 require 'postgis_adapter'

data/spec/{postgis_functions → postgis_adapter/functions}/bbox_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 describe "Point" do
 

data/spec/{postgis_functions → postgis_adapter/functions}/class_spec.rb

@@ -1,12 +1,18 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 describe "ClassMethods" do
   before(:all) do
     @c1 ||= City.create!(:data => "CityClass", :geom => Polygon.from_coordinates([[[12,45],[45,41],[4,1],[12,45]],[[2,5],[5,1],[14,1],[2,5]]],4326))
+    @c2 ||= City.create!(:data => "CityClass", :geom => Polygon.from_coordinates([[[10,10],[10,50],[50,50],[10,10]],[[2,5],[5,1],[14,1],[2,5]]],4326))
     @s1 ||= Street.create!(:data => "StreetClass", :geom => LineString.from_coordinates([[1,1],[99,88]],4326))
     @s2 ||= Street.create!(:data => "StreetClassTiny", :geom => LineString.from_coordinates([[1,1],[1.1,1.1]],4326))
     @p1 ||= Position.create!(:data => "PointClass", :geom => Point.from_x_y(99,99,4326))
     @p2 ||= Position.create!(:data => "PointClassClose", :geom => Point.from_x_y(99.9,99.9,4326))
+    @p3 ||= Position.create!(:data => "PointInsideCity", :geom => Point.from_x_y(15.0,15.0,4326))
+  end
+
+  after(:all) do
+    [City, Street, Position].each { |m| m.delete_all }
   end
 
   it "should find the closest other point" do
@@ -54,8 +60,16 @@ describe "ClassMethods" do
     City.by_area.should be_instance_of(Array)
   end
 
-  it "should sort by all within" do
-    City.all_within(@s1.geom).should be_instance_of(Array)
+  it "should sort by all dwithin" do
+    City.all_dwithin(@s1.geom).should eql([@c1, @c2])
+  end
+
+  it "should find all within polygon" do
+    Position.all_within(@c1.geom).should eql([@p3])#Array)
+  end
+
+  it "should find all within polygon 2" do
+    Position.all_within(@c2.geom).should eql([])#Array)
   end
 
   it "should sort by all within" do

data/spec/{postgis_functions → postgis_adapter/functions}/common_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 describe "Common Functions" do
 
@@ -77,7 +77,7 @@ describe "Common Functions" do
     it "should transform non saved srid geoms" do
       pt = Point.from_x_y(11121381.4586196,10161852.0494475, 29101)
       pos = Position.new(:geom => pt)
-      pos.transform(4326)
+      pos.transform!(4326)
       pos.geom.x.should be_close(1.00000000000005, 0.00001)
       pos.geom.y.should be_close(1.00000000000005, 0.00001)
     end
@@ -126,6 +126,8 @@ describe "Common Functions" do
 
   describe "Polygon" do
 
+    it { City.first.data.should eql("City1") }
+
     it "sort by area size" do
       City.by_area.first.data.should == "City1" #[@c1, @c2, @c3]
     end
@@ -156,7 +158,7 @@ describe "Common Functions" do
 
     it { @c1.covers?(@p1).should be_false }
     it { @c1.covers?(@p4).should be_true }
-    it { @c1.should_not be_within(@c2) }
+    it { @c1.within?(@c2).should be_false }
 
     it "city overlaps point?" do
       lambda { @c3.overlaps?(@c2) }.should raise_error # WHY??
@@ -268,6 +270,10 @@ describe "Common Functions" do
       @s1.intersection(@p2).should be_instance_of(GeometryCollection)
     end
 
+    it "have a point on surface" do
+      @s3.point_on_surface.should be_a GeoRuby::SimpleFeatures::Point
+    end
+
     describe "Self" do
 
       it do
@@ -380,7 +386,7 @@ describe "Common Functions" do
     it "should transform non saved" do
       ls = LineString.from_coordinates([[11435579.3992231,10669620.8116516],[11721337.4281638,11210714.9524106]],29101)
       str = Street.new(:geom => ls)
-      str.transform(4326)
+      str.transform!(4326)
       str.geom[0].x.should be_close(4,0.0000001)
       str.geom[0].y.should be_close(4,0.0000001)
       str.geom[1].x.should be_close(7,0.0000001)

data/spec/{postgis_functions_spec.rb → postgis_adapter/functions_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe "PostgisFunctions" do
   before(:all) do
@@ -12,11 +12,11 @@ describe "PostgisFunctions" do
   describe "Common Mix" do
 
     it "should calculate distance point to line" do
-      @p1.distance_to(@s1).should be_close(0.248069469178417, 0.00000001)
+      @p1.distance_to(@s1).should be_within(0.00000001).of(0.248069469178417)
     end
 
     it "should calculate distance point to line" do
-      @cg.distance_to(@s1).should be_close(0.248069469178417, 0.00000001)
+      @cg.distance_to(@s1).should be_within(0.00000001).of(0.248069469178417)
     end
 
      it "should calculate distance point to line" do
@@ -28,33 +28,33 @@ describe "PostgisFunctions" do
     end
 
     it "should find the distance from a unsaved point" do
-       @p1.distance_to(Point.from_x_y(5,5,4326)).should be_close(55.0726792520575, 0.001)
+       @p1.distance_to(Point.from_x_y(5,5,4326)).should be_within(0.00001).of(55.0726792520575)
     end
 
     it "should work with unsaved objects" do
       ss = Street.new(:data => "Street1", :geom => LineString.from_coordinates([[-44,-21],[-43,-29]],4326))
-      ss.length_spheroid.should be_close(891908.39, 0.01)
+      ss.length_spheroid.should be_within(0.01).of(891908.39)
     end
 
-    it { @c1.area(32640).should be_close(9165235788987.37, 0.01) }
+    it { @c1.area(32640).should be_within(0.01).of(9165235788987.37) }
 
-    it { @c1.area.should be_close(720.0, 0.1) }
+    it { @c1.area.should be_within(0.1).of(720.0) }
 
     it "should be strictly left of city" do
       @p1.should be_strictly_left_of(@c1)
     end
 
-    it { @s1.length.should be_close(8.06225774829855, 0.001) }
+    it { @s1.length.should be_within(0.0001).of(8.06225774829855) }
 
-    it { @s1.length_spheroid.should be_close(891883.597963462,0.0001) }
+    it { @s1.length_spheroid.should be_within(0.0001).of(891883.597963462) }
 
     it "should work with a diff column name" do
       px2 = DiffName.create!(:data => "Hey 2", :the_geom => Point.from_x_y(20,20, 4326))
-      @px.distance_to(px2).should be_close(10.0, 0.1)
+      @px.distance_to(px2).should be_within(0.01).of(10.0)
     end
 
     it "should work with mixed column names" do
-      @px.distance_to(@s1).should be_close(66.4,1)
+      @px.distance_to(@s1).should be_within(0.1).of(66.4)
     end
   end
 end

data/spec/postgis_adapter_spec.rb

@@ -151,8 +151,8 @@ describe "PostgisAdapter" do
     end
 
     it "should find by geom" do
-      pts = Area.find_all_by_geom(LineString.
-                                  from_coordinates([[0,0],[2,2]],4326))
+      pending
+      pts = Area.find_all_by_geom(LineString.from_coordinates([[0,0],[2,2]],4326))
       pts.should be_instance_of(Array)
       pts.length.should eql(2)
       pts[0].data.should match(/Point/)
@@ -160,12 +160,13 @@ describe "PostgisAdapter" do
     end
 
     it "should find by geom again" do
-      pts = Area.find_all_by_geom(LineString.
-                          from_coordinates([[2.49,1.99],[2.51,2.01]],4326))
+      pending
+      pts = Area.find_all_by_geom(LineString.from_coordinates([[2.49,1.99],[2.51,2.01]],4326))
       pts[0].data.should eql("Point3")
     end
 
     it "should find by geom column bbox condition" do
+      pending
       pts = Area.find_all_by_geom([[0,0],[2,2],4326])
       pts.should be_instance_of(Array)
       pts.length.should eql(2)
@@ -220,8 +221,8 @@ describe "PostgisAdapter" do
       bar.data.should eql("")
 
       if BinaryDefault.connection.encoding == "UTF8"
-        foo.value.should eql("f\xf4o")
-        bar.value.should eql("b\xe5r")
+        foo.value.encode("UTF-8", "ISO-8859-1").should eql("fôo")
+        bar.value.encode("UTF-8", "ISO-8859-1").should eql("bår")
       end
     end
 

data/spec/spec_helper.rb

@@ -1,11 +1,20 @@
+SPEC_DB = {
+  :adapter => "postgresql",
+  :database => "postgis_adapter",
+  :username => "postgres",
+  :password => ""
+}
+
 require 'rubygems'
-require 'spec'
 require 'pg'
-require 'activerecord'
 $:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
-gem 'activerecord', "=2.3.5"
+
+require "rspec"
+require "active_record"
+
 gem 'nofxx-georuby'
 require 'postgis_adapter'
+require 'logger'
 # GeoRuby::SimpleFeatures::DEFAULT_SRID = -1
 
 # Monkey patch Schema.define logger
@@ -13,17 +22,24 @@ $logger = Logger.new(StringIO.new)
 def $logger.write(d); self.info(d); end
 # $stdout = $logger
 
-
 ActiveRecord::Base.logger = $logger
-ActiveRecord::Base.establish_connection({ :adapter => "postgresql",
-                                          :database => "postgis_adapter",
-                                          :username => "postgres",
-                                          :password => "" })
 
-PG_VERSION = ActiveRecord::Base.connection.select_value("SELECT version()").scan(/PostgreSQL ([\d\.]*)/)[0][0]
+begin
+  ActiveRecord::Base.establish_connection(SPEC_DB)
+  ActiveRecord::Migration.verbose = false
+  PG_VERSION = ActiveRecord::Base.connection.select_value("SELECT version()").scan(/PostgreSQL ([\d\.]*)/)[0][0]
+
+  puts "Running against PostgreSQL #{PG_VERSION}"
+
+  require File.dirname(__FILE__) + '/db/schema_postgis.rb'
+  require File.dirname(__FILE__) + '/db/models_postgis.rb'
+
+rescue PGError
+  puts "Test DB not found, creating one for you..."
+  `createdb -U #{SPEC_DB[:username]} #{SPEC_DB[:database]} -T template_postgis`
+  puts "Done. Please run spec again."
+  exit
+end
 
-puts "Running against PostgreSQL #{PG_VERSION}"
 
-require File.dirname(__FILE__) + '/db/schema_postgis.rb'
-require File.dirname(__FILE__) + '/db/models_postgis.rb'
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.7.8
+  prerelease: 
+  version: 0.7.9
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -9,10 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 -03:00
+date: 2011-03-05 00:00:00 -03:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: GeoRuby
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Execute PostGIS functions on Active Record
 email: x@nofxx.com
 executables: []
@@ -22,33 +33,34 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
-- History.txt
-- MIT-LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- init.rb
-- lib/postgis_adapter.rb
-- lib/postgis_adapter/acts_as_geom.rb
 - lib/postgis_adapter/common_spatial_adapter.rb
-- lib/postgis_functions.rb
-- lib/postgis_functions/bbox.rb
-- lib/postgis_functions/class.rb
-- lib/postgis_functions/common.rb
-- postgis_adapter.gemspec
-- rails/init.rb
+- lib/postgis_adapter/functions.rb
+- lib/postgis_adapter/acts_as_geom.rb
+- lib/postgis_adapter/railtie.rb
+- lib/postgis_adapter/functions/common.rb
+- lib/postgis_adapter/functions/bbox.rb
+- lib/postgis_adapter/functions/class.rb
+- lib/postgis_adapter.rb
 - spec/db/models_postgis.rb
 - spec/db/schema_postgis.rb
 - spec/postgis_adapter/acts_as_geom_spec.rb
+- spec/postgis_adapter/functions/class_spec.rb
+- spec/postgis_adapter/functions/common_spec.rb
+- spec/postgis_adapter/functions/bbox_spec.rb
 - spec/postgis_adapter/common_spatial_adapter_spec.rb
-- spec/postgis_adapter_spec.rb
-- spec/postgis_functions/bbox_spec.rb
-- spec/postgis_functions/class_spec.rb
-- spec/postgis_functions/common_spec.rb
-- spec/postgis_functions_spec.rb
-- spec/spec.opts
+- spec/postgis_adapter/functions_spec.rb
 - spec/spec_helper.rb
+- spec/postgis_adapter_spec.rb
+- Gemfile.lock
+- postgis_adapter.gemspec
+- MIT-LICENSE
+- rails/init.rb
+- Rakefile
+- VERSION
+- README.rdoc
+- Gemfile
+- init.rb
+- History.txt
 has_rdoc: true
 homepage: http://github.com/nofxx/postgis_adapter
 licenses: []
@@ -59,21 +71,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: postgis_adapter
-rubygems_version: 1.3.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: PostGIS Adapter for Active Record
@@ -81,10 +93,10 @@ test_files:
 - spec/db/models_postgis.rb
 - spec/db/schema_postgis.rb
 - spec/postgis_adapter/acts_as_geom_spec.rb
+- spec/postgis_adapter/functions/class_spec.rb
+- spec/postgis_adapter/functions/common_spec.rb
+- spec/postgis_adapter/functions/bbox_spec.rb
 - spec/postgis_adapter/common_spatial_adapter_spec.rb
-- spec/postgis_functions_spec.rb
+- spec/postgis_adapter/functions_spec.rb
 - spec/spec_helper.rb
 - spec/postgis_adapter_spec.rb
-- spec/postgis_functions/class_spec.rb
-- spec/postgis_functions/common_spec.rb
-- spec/postgis_functions/bbox_spec.rb

data/.gitignore

@@ -1,7 +0,0 @@
-.DS_Store
-doc/*
-rdoc/*
-coverage/*
-spec/debug.log
-pkg/*
-*flymake.rb

data/spec/spec.opts

@@ -1,4 +0,0 @@
---colour
---format profile
---timeout 20
---diff