nofxx-postgis_adapter 0.5.1 → 0.5.5

data/README.rdoc

@@ -237,16 +237,29 @@ geometric column in PostGIS, along with the addition of a spatial
 index on the column :
 
     ActiveRecord::Schema.define do
-          create_table :places do |t|
-        t.string :name
-        t.point  :geom, :srid => 123, :with_z => true, :null => false
+      create_table :places do |t|
+        t.string   :name
+        t.point    :geom, :srid => 4326, :with_z => true, :null => false
 
         t.timestamps
       end
-          add_index :table_points, :geom, :spatial=>true
+
+      add_index :places, :geom, :spatial => true
     end
 
 
+Types:
+
+    point
+    polygon
+    line_string
+    multi_point
+    multi_polygon
+    multi_line_string
+    geometry
+    geometry_collection
+
+
 === Fixtures
 
 If you use fixtures for your unit tests, at some point,

data/VERSION.yml

@@ -1,4 +1,4 @@
---- 
+---
 :major: 0
 :minor: 5
-:patch: 1
+:patch: 5 

data/lib/postgis_adapter.rb

@@ -145,14 +145,12 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
   # <table_name>_<column_name>_spatial_index unless
   # the key :name is present in the options hash, in which case its
   # value is taken as the name of the index.
-  def add_index(table_name,column_name,options = {})
+  def add_index(table_name, column_name, options = {})
     index_name = options[:name] || index_name(table_name,:column => Array(column_name))
     if options[:spatial]
       execute "CREATE INDEX #{index_name} ON #{table_name} USING GIST (#{Array(column_name).join(", ")} GIST_GEOMETRY_OPS)"
     else
-      index_type = options[:unique] ? "UNIQUE" : ""
-      #all together
-      execute "CREATE #{index_type} INDEX #{index_name} ON #{table_name} (#{Array(column_name).join(", ")})"
+      super
     end
   end
 

data/lib/postgis_functions/common.rb

@@ -235,7 +235,7 @@ module PostgisFunctions
 
   def simplify!(tolerance=0.1)
     #FIXME: not good..
-    self.update_attribute(get_column_name, simplify)
+    self.update_attribute(geo_columns.first, simplify)
   end
 
   #
@@ -438,7 +438,7 @@ module PostgisFunctions
   # Return Geometry ST_Transform(geometry g1, integer srid);
   #
   def transform!(new_srid)
-    self[get_column_name] = postgis_calculate("Transform", self, new_srid)
+    self[geo_columns.first] = postgis_calculate("Transform", self, new_srid)
   end
 
   def transform(new_srid)
@@ -461,7 +461,7 @@ module PostgisFunctions
   # Returns the instance`s geom srid
   #
   def srid
-    self[get_column_name].srid
+    self[geo_columns.first].srid
   end
 
   #
@@ -494,7 +494,7 @@ module PostgisFunctions
   # Return Geometry
   def to_utm!(utm=nil)
     utm ||= utm_zone
-    self[get_column_name] = transform(utm)
+    self[geo_columns.first] = transform(utm)
   end
 
   def to_utm
@@ -519,7 +519,7 @@ module PostgisFunctions
     # Returns Float
     #
     def length
-      dis = postgis_calculate(:length, self).to_f
+      postgis_calculate(:length, self).to_f
     end
 
     #
@@ -530,7 +530,7 @@ module PostgisFunctions
     # Returns Float
     #
     def length_3d
-      dis = postgis_calculate(:length3d, self).to_f
+      postgis_calculate(:length3d, self).to_f
     end
 
     #
@@ -551,7 +551,7 @@ module PostgisFunctions
     # Returns Float length_spheroid(geometry linestring, spheroid);
     #
     def length_spheroid(spheroid = EARTH_SPHEROID)
-      dis = postgis_calculate(:length_spheroid, self, spheroid).to_f
+      postgis_calculate(:length_spheroid, self, spheroid).to_f
     end
 
     #
@@ -709,7 +709,7 @@ module PostgisFunctions
     # Returns Float ST_Distance_Sphere(geometry pointlonlatA, geometry pointlonlatB);
     #
     def distance_sphere_to(other)
-      dis = postgis_calculate(:distance_sphere, [self, other]).to_f
+      postgis_calculate(:distance_sphere, [self, other]).to_f
     end
 
     #

data/lib/postgis_functions.rb

@@ -26,12 +26,12 @@ module PostgisFunctions
     raise StandardError, "#{e}"
   end
 
-  private
-
-  def get_column_name
-    @geo_column ||= postgis_geoms[:columns][0]
+  def geo_columns
+    @geo_columns ||= postgis_geoms[:columns]
   end
 
+  private
+
   #
   # Construct the PostGIS SQL query
   #
@@ -44,6 +44,7 @@ module PostgisFunctions
 
     tables = on_db.map do |t| {
       :name => t.class.table_name,
+      :column => t.geo_columns.first,
       :uid =>  unique_identifier,
       :id => t[:id] }
     end
@@ -54,7 +55,7 @@ module PostgisFunctions
       options = nil
     end
 
-    fields      = tables.map { |f| "#{f[:uid]}.#{get_column_name}" }     # W1.geom
+    fields      = tables.map { |f| "#{f[:uid]}.#{f[:column]}" }     # W1.geom
     fields << not_db.map { |g| "'#{g.as_hex_ewkb}'::geometry"} unless not_db.empty?
     fields.map! { |f| "ST_Transform(#{f}, #{transform})" } if transform  # ST_Transform(W1.geom,x)
     conditions  = tables.map { |f| "#{f[:uid]}.id = #{f[:id]}" }         # W1.id = 5

data/postgis_adapter.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postgis_adapter}
-  s.version = "0.5.1"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Augusto"]
-  s.date = %q{2009-05-21}
+  s.date = %q{2009-06-14}
   s.description = %q{Execute PostGIS functions on Active Record}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [
@@ -16,12 +16,10 @@ Gem::Specification.new do |s|
     ".gitignore",
      "History.txt",
      "MIT-LICENSE",
-     "Manifest.txt",
      "README.rdoc",
      "Rakefile",
      "VERSION.yml",
      "init.rb",
-     "install.rb",
      "lib/postgis_adapter.rb",
      "lib/postgis_adapter/acts_as_geom.rb",
      "lib/postgis_adapter/common_spatial_adapter.rb",
@@ -31,10 +29,6 @@ Gem::Specification.new do |s|
      "lib/postgis_functions/common.rb",
      "postgis_adapter.gemspec",
      "rails/init.rb",
-     "script/console",
-     "script/destroy",
-     "script/generate",
-     "spec/db/database_postgis.yml",
      "spec/db/models_postgis.rb",
      "spec/db/schema_postgis.rb",
      "spec/postgis_adapter/acts_as_geom_spec.rb",
@@ -45,26 +39,25 @@ Gem::Specification.new do |s|
      "spec/postgis_functions/common_spec.rb",
      "spec/postgis_functions_spec.rb",
      "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "uninstall.rb"
+     "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.3}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{PostGIS Adapter for Active Record}
   s.test_files = [
-    "spec/postgis_functions_spec.rb",
-     "spec/postgis_functions/class_spec.rb",
-     "spec/postgis_functions/bbox_spec.rb",
-     "spec/postgis_functions/common_spec.rb",
-     "spec/db/models_postgis.rb",
+    "spec/db/models_postgis.rb",
      "spec/db/schema_postgis.rb",
-     "spec/postgis_adapter_spec.rb",
-     "spec/postgis_adapter/common_spatial_adapter_spec.rb",
      "spec/postgis_adapter/acts_as_geom_spec.rb",
-     "spec/spec_helper.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"
   ]
 
   if s.respond_to? :specification_version then

data/spec/db/models_postgis.rb

@@ -31,13 +31,13 @@ end
 class Table3dmPoint < ActiveRecord::Base
 end
 
-class  Table4dPoint < ActiveRecord::Base
+class Table4dPoint < ActiveRecord::Base
 end
 
-class  TableSridLineString < ActiveRecord::Base
+class TableSridLineString < ActiveRecord::Base
 end
 
-class  TableSrid4dPolygon < ActiveRecord::Base
+class TableSrid4dPolygon < ActiveRecord::Base
 end
 
 class City < ActiveRecord::Base
@@ -55,3 +55,7 @@ end
 class CommonGeo < ActiveRecord::Base
   acts_as_geom :geom
 end
+
+class DiffName < ActiveRecord::Base
+  acts_as_geom :the_geom
+end

data/spec/db/schema_postgis.rb

@@ -1,4 +1,3 @@
-
 #add some postgis specific tables
 ActiveRecord::Schema.define() do
 
@@ -62,27 +61,32 @@ ActiveRecord::Schema.define() do
   end
 
   create_table :cities, :force => true do |t|
-    t.string :data, :limit => 100
-    t.integer :value
-    t.polygon  :geom,:null=>false,:srid=>4326
+    t.string        :data, :limit => 100
+    t.integer       :value
+    t.polygon       :geom, :null => false, :srid => 4326
   end
 
   create_table :positions, :force => true do |t|
-    t.string :data, :limit => 100
-    t.integer :value
-    t.point  :geom,:null=>false,:srid=>4326
+    t.string        :data, :limit => 100
+    t.integer       :value
+    t.point         :geom, :null => false, :srid => 4326
   end
 
   create_table :streets, :force => true do |t|
-    t.string :data, :limit => 100
-    t.integer :value
-    t.line_string  :geom,:null=>false,:srid=>4326
+    t.string        :data, :limit => 100
+    t.integer       :value
+    t.line_string   :geom, :null => false, :srid => 4326
   end
 
   create_table :common_geos, :force => true do |t|
-    t.string :data, :limit => 100
-    t.integer :value
-    t.point  :geom,:null=>false,:srid=>4326
+    t.string        :data, :limit => 100
+    t.integer       :value
+    t.point         :geom, :null => false, :srid => 4326
+  end
+
+  create_table :diff_names, :force => true do |t|
+    t.string        :data
+    t.point         :the_geom, :null => false, :srid => 4326
   end
 
 end

data/spec/postgis_adapter/common_spatial_adapter_spec.rb

@@ -13,7 +13,7 @@ describe "CommonSpatialAdapter" do
         create_table "parks", :force => true do |t|
           t.string "data",  :limit => 100
           t.integer "value"
-          t.polygon "geom", :null=>false, :srid => 4326 , :with_z => true,:with_m => true
+          t.polygon "geom", :null => false, :srid => 4326 , :with_z => true, :with_m => true
         end
       end
     end
@@ -180,8 +180,8 @@ describe "CommonSpatialAdapter" do
 
     after(:all) do
       ActiveRecord::Base.connection.execute('DROP VIEW viewparks')
-    end  end
-
+    end
+  end
 
   describe "Dump" do
     before(:all) do

data/spec/postgis_adapter_spec.rb

@@ -129,25 +129,25 @@ describe "PostgisAdapter" do
   describe "Find" do
 
     ActiveRecord::Schema.define() do
-      create_table "parks", :force => true do |t|
-        t.column "data" , :string, :limit => 100
-        t.column "value", :integer
-        t.column "geom", :point,:null=>false,:srid=>4326
+      create_table :areas, :force => true do |t|
+        t.string :data, :limit => 100
+        t.integer :value
+        t.point :geom, :null => false, :srid => 4326
       end
-      add_index "parks","geom",:spatial=>true,:name => "example_spatial_index"
+      add_index :areas, :geom, :spatial => true, :name => "areas_spatial_index"
     end
 
-    class Park < ActiveRecord::Base
+    class Area < ActiveRecord::Base
     end
 
     it "should create some points" do
-      Park.create!(:data => "Point1", :geom => Point.from_x_y(1.2,0.75,4326))
-      Park.create!(:data => "Point2",:geom => Point.from_x_y(0.6,1.3,4326))
-      Park.create!(:data => "Point3", :geom => Point.from_x_y(2.5,2,4326))
+      Area.create!(:data => "Point1", :geom => Point.from_x_y(1.2,0.75,4326))
+      Area.create!(:data => "Point2",:geom => Point.from_x_y(0.6,1.3,4326))
+      Area.create!(:data => "Point3", :geom => Point.from_x_y(2.5,2,4326))
     end
 
     it "should find by geom" do
-      pts = Park.find_all_by_geom(LineString.from_coordinates([[0,0],[2,2]],4326))
+      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/
@@ -155,12 +155,12 @@ describe "PostgisAdapter" do
     end
 
     it "should find by geom again" do
-      pts = Park.find_all_by_geom(LineString.from_coordinates([[2.49,1.99],[2.51,2.01]],4326))
+      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
-      pts = Park.find_all_by_geom([[0,0],[2,2],4326])
+      pts = Area.find_all_by_geom([[0,0],[2,2],4326])
       pts.should be_instance_of(Array)
       pts.length.should eql(2)
       pts[0].data.should match /Point/
@@ -168,7 +168,7 @@ describe "PostgisAdapter" do
     end
 
     it "should not mess with rails finder" do
-      pts = Park.find_all_by_data "Point1"
+      pts = Area.find_all_by_data "Point1"
       pts.should have(1).park
     end
 

data/spec/postgis_functions_spec.rb

@@ -6,6 +6,7 @@ describe "PostgisFunctions" do
     @s1 ||= Street.create!(:data => "Street1", :geom => LineString.from_coordinates([[-43,-20],[-42,-28]],4326))
     @p1 ||= Position.create!(:data => "Point1", :geom => Point.from_x_y(-43,-22,4326))
     @cg ||= CommonGeo.create!(:data => "Point1", :geom => Point.from_x_y(-43,-22,4326))
+    @px = DiffName.create!(:data => "Hey", :the_geom => Point.from_x_y(10,20, 4326))
   end
 
   describe "Common Mix" do
@@ -40,6 +41,13 @@ describe "PostgisFunctions" do
 
     it { @s1.length_spheroid.should be_close(891883.597963462,0.0001) }
 
-  end
+    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)
+    end
 
+    it "should work with mixed column names" do
+      @px.distance_to(@s1).should be_close(66.4,1)
+    end
+  end
 end

data/spec/spec.opts

@@ -1,5 +1,4 @@
 --colour
---format RspecSpinner::Spinner
---timeout
-20
+--format profile
+--timeout 20
 --diff

data/spec/spec_helper.rb

@@ -2,15 +2,16 @@ require 'rubygems'
 require 'spec'
 require 'pg'
 require 'activerecord'
-require 'rspec_spinner'
+# require 'rspec_spinner'
 
 gem 'activerecord', "=2.3.2"
 
 $:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
 require 'postgis_adapter'
 GeoRuby::SimpleFeatures.srid = -1
-config = YAML.load_file(File.dirname(__FILE__) + '/db/database_postgis.yml')
+
 # ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config)
-#require File.dirname(__FILE__) + '/db/schema_postgis.rb'
+ActiveRecord::Base.establish_connection({ :adapter => "postgresql", :database => "postgis_plugin",
+                                          :username => "postgres", :password => "" })
+require File.dirname(__FILE__) + '/db/schema_postgis.rb'
 require File.dirname(__FILE__) + '/db/models_postgis.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.5
 platform: ruby
 authors: 
 - Marcos Augusto
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 -07:00
+date: 2009-06-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,12 +25,10 @@ files:
 - .gitignore
 - History.txt
 - MIT-LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - VERSION.yml
 - init.rb
-- install.rb
 - lib/postgis_adapter.rb
 - lib/postgis_adapter/acts_as_geom.rb
 - lib/postgis_adapter/common_spatial_adapter.rb
@@ -40,10 +38,6 @@ files:
 - lib/postgis_functions/common.rb
 - postgis_adapter.gemspec
 - rails/init.rb
-- script/console
-- script/destroy
-- script/generate
-- spec/db/database_postgis.yml
 - spec/db/models_postgis.rb
 - spec/db/schema_postgis.rb
 - spec/postgis_adapter/acts_as_geom_spec.rb
@@ -55,7 +49,6 @@ files:
 - spec/postgis_functions_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- uninstall.rb
 has_rdoc: false
 homepage: http://github.com/nofxx/postgis_adapter
 post_install_message: 
@@ -83,13 +76,13 @@ signing_key:
 specification_version: 3
 summary: PostGIS Adapter for Active Record
 test_files: 
-- spec/postgis_functions_spec.rb
-- spec/postgis_functions/class_spec.rb
-- spec/postgis_functions/bbox_spec.rb
-- spec/postgis_functions/common_spec.rb
 - spec/db/models_postgis.rb
 - spec/db/schema_postgis.rb
-- spec/postgis_adapter_spec.rb
-- spec/postgis_adapter/common_spatial_adapter_spec.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

data/Manifest.txt

@@ -1,32 +0,0 @@
-History.txt
-MIT-LICENSE
-Manifest.txt
-README.rdoc
-Rakefile
-init.rb
-install.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
-script/console
-script/destroy
-script/generate
-spec/db/database_postgis.yml
-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
-uninstall.rb

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/postgis_adapter.rb'}"
-puts "Loading postgis_adapter gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)

data/spec/db/database_postgis.yml

@@ -1,4 +0,0 @@
-adapter: postgresql
-database: postgis_plugin
-username: postgres
-password: