postgis_adapter 0.5.1 → 0.7.1

data/README.rdoc

@@ -7,6 +7,7 @@ It also provides a way to manage these columns in migrations.
 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 Manual - http://postgis.refractions.net/documentation/manual-svn
 
 *PostGIS and Rails 2+ only*.
@@ -32,6 +33,7 @@ Rails:
 
     config.gem "postgis_adapter"
 
+
 Github version:
 
 
@@ -77,20 +79,29 @@ model and the table defined above :
 
 Here are this fork additions. To use it:
 
+    acts_as_geom [column_name] => [geom_type]
+
+
+Examples:
+
+    class POI < ActiveRecord::Base
+      acts_as_geom :geom => :point
+    end
 
     class Street < ActiveRecord::Base
-      acts_as_geom :line
+      acts_as_geom :line => :line_string
     end
 
     ...
 
-    @place  =   Poi.new(    :data  =>   **Point**      )
-    @park   =   Park.new(   :area  =>  **Polygon**     )
-    @street =   Street.new( :line  => **LineString**   )
 
 
 == Play!
 
+    @place  =   Poi.new(    :geom  =>  Point.from_x_y(10,20)    )
+    @park   =   Park.new(   :area  =>  **Polygon**     )
+    @street =   Street.new( :line  => **LineString**   )
+
     @place.inside?(@park)
     => true
 
@@ -98,10 +109,9 @@ Here are this fork additions. To use it:
     => false
 
     @place.outside?(@park)
-
     @street.crosses?(@park)
-
     @area.contains?(@place)
+    ...
 
 
 === Polygons:
@@ -121,7 +131,7 @@ Supports transform (useful to transform SRID to UTM for area in Km^2)
     => Area with new SRID
 
 
-=== Line Strings:
+=== LineStrings:
 
     @street_east.intersects?(@street_west)
     => false
@@ -129,9 +139,6 @@ Supports transform (useful to transform SRID to UTM for area in Km^2)
     @street_central.length
     => 4508.53636
 
-    @street_central.length(:miles)
-    => 2.81798593
-
     @street.length_spheroid
     => 4.40853636
 
@@ -147,7 +154,7 @@ Supports transform (useful to transform SRID to UTM for area in Km^2)
     Country.contain(@point)
     => The Conutry that contains the point
 
-    Areas.contains(@point)
+    Area.contains(@point)
     => [Array of areas contains the point...
 
 
@@ -183,7 +190,6 @@ Or use a (almost) PostGIS like notation:
     @area.bbox "@",  @park
 
 
-
 === Warning
 
 *To be fixed:*
@@ -194,12 +200,6 @@ implement a multi geom.
 http://nofxx.lighthouseapp.com/projects/20712/tickets/3-multiple-geoms-in-model
 
 
-=== Wiki
-
-Check out the wiki pages (http://github.com/nofxx/postgis_adapter/wikis).
-For all functions.
-
-
 === Find_by
 
 find_by_*column* has been redefined when column is of a geometric type.
@@ -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,
@@ -311,14 +324,14 @@ Postgis Adapter is released under the MIT license.
 
 == Support
 
-Tested using rails 2.2.2/2.3.0 / postgresql 8.3.5 / postgis 1.3.3 / linux / osx
+Tested using rails 2.2.2/2.3.3 / postgresql 8.3.7 / postgis 1.3.3 / linux / osx
 
 Any questions, enhancement proposals, bug notifications or corrections:
 
 
 === PostgisAdapter
 
-Project Tracker http://nofxx.lighthouseapp.com/projects/20712-postgis_adapter
+http://github.com/nofxx/postgis_adapter/issues
 
 
 === SpatialAdapter

data/Rakefile

@@ -34,11 +34,37 @@ task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  config = YAML.load(File.read('VERSION.yml'))
-  version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-
+  version = File.exist?('VERSION') ? File.read('VERSION').chomp : ""
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "postgis_adapter #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+#
+# Reek & Roodi
+#
+begin
+  require 'reek/rake_task'
+  Reek::RakeTask.new do |t|
+    t.fail_on_error = true
+    t.verbose = false
+    t.source_files = 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :reek do
+    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
+  end
+end
+
+begin
+  require 'roodi'
+  require 'roodi_task'
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  task :roodi do
+    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
+  end
+end

data/VERSION

@@ -0,0 +1 @@
+0.7.1

data/lib/postgis_adapter/acts_as_geom.rb

@@ -10,23 +10,28 @@ module PostgisFunctions
 
   module ClassMethods
 
-    # acts_as_geom :geom
-    def acts_as_geom(*columns)
+    # acts_as_geom :db_field => :geom_type
+    # Examples:
+    #
+    # acts_as_geom :data => :point
+    # acts_as_geom :geom => :line_string
+    # acts_as_geom :geom => :polygon
+    #
+    def acts_as_geom(*geom)
       cattr_accessor :postgis_geoms
-      self.postgis_geoms = {:columns => columns}
-      columns.map do |g|
-        case get_geom_type(g)
-        when :point then send :include, PointFunctions
-        when :polygon then send :include, PolygonFunctions
-        when :line_string then send :include, LineStringFunctions
-        end
-      end
+      self.postgis_geoms = geom[0] # {:columns => column
+      send :include, case geom[0].values[0]
+        when :point       then  PointFunctions
+        when :polygon     then PolygonFunctions
+        when :line_string then  LineStringFunctions
+      end unless geom[0].kind_of? Symbol
     end
 
     def get_geom_type(column)
-      self.columns.select { |c| c.name == column.to_s }[0].geometry_type
-    rescue ActiveRecord::StatementInvalid => e
-      nil
+      self.postgis_geoms.values[0] rescue nil
+    #   self.columns.select { |c| c.name == column.to_s }[0].geometry_type
+    # rescue ActiveRecord::StatementInvalid => e
+    #   nil
     end
   end
 end

data/lib/postgis_adapter/common_spatial_adapter.rb

@@ -60,8 +60,10 @@ ActiveRecord::SchemaDumper.class_eval do
         else
           tbl.print "    t.column #{column.name.inspect}, #{column.type.inspect}"
         end
-        tbl.print ", :limit => #{column.limit.inspect}" if column.limit != @types[column.type][:limit]
-        tbl.print ", :default => #{column.default.inspect}" if !column.default.nil?
+        tbl.print ", :limit => #{column.limit.inspect}" if column.limit != @types[column.type][:limit] && column.precision.blank? && column.scale.blank?
+        tbl.print ", :precision => #{column.precision.inspect}" if column.precision != @types[column.type][:precision]
+        tbl.print ", :scale => #{column.scale.inspect}" if column.scale != @types[column.type][:scale]
+        tbl.print ", :default => #{default_string(column.default)}" if !column.default.nil?
         tbl.print ", :null => false" if !column.null
         tbl.puts
       end

data/lib/postgis_adapter.rb

@@ -29,35 +29,73 @@ GeoRuby::SimpleFeatures::Geometry.class_eval do
 end
 
 ActiveRecord::Base.class_eval do
-  require 'active_record/version'
-
-    #Vit Ondruch & Tilmann Singer 's patch
-    def self.get_conditions(attrs)
-      attrs.map do |attr, value|
-        attr = attr.to_s
-        column_name = connection.quote_column_name(attr)
-        if columns_hash[attr].is_a?(SpatialColumn)
-          if value.is_a?(Array)
-            attrs[attr.to_sym]= "BOX3D(" + value[0].join(" ") + "," + value[1].join(" ") + ")"
-            "#{table_name}.#{column_name} && SetSRID(?::box3d, #{value[2] || @@default_srid || DEFAULT_SRID} ) "
-          elsif value.is_a?(Envelope)
-            attrs[attr.to_sym]= "BOX3D(" + value.lower_corner.text_representation + "," + value.upper_corner.text_representation + ")"
-            "#{table_name}.#{column_name} && SetSRID(?::box3d, #{value.srid} ) "
-          else
-            "#{table_name}.#{column_name} && ? "
-          end
+
+  #Vit Ondruch & Tilmann Singer 's patch
+  def self.get_conditions(attrs)
+    attrs.map do |attr, value|
+      attr = attr.to_s
+      column_name = connection.quote_column_name(attr)
+      if columns_hash[attr].is_a?(SpatialColumn)
+        if value.is_a?(Array)
+          attrs[attr.to_sym]= "BOX3D(" + value[0].join(" ") + "," + value[1].join(" ") + ")"
+          "#{table_name}.#{column_name} && SetSRID(?::box3d, #{value[2] || @@default_srid || DEFAULT_SRID} ) "
+        elsif value.is_a?(Envelope)
+          attrs[attr.to_sym]= "BOX3D(" + value.lower_corner.text_representation + "," + value.upper_corner.text_representation + ")"
+          "#{table_name}.#{column_name} && SetSRID(?::box3d, #{value.srid} ) "
         else
-          "#{table_name}.#{attribute_condition(column_name, value)}"
+          "#{table_name}.#{column_name} && ? "
         end
-      end.join(' AND ')
-    end
+      else
+        attribute_condition("#{table_name}.#{column_name}", value)
+      end
+    end.join(' AND ')
+  end
 
-    #For Rails >= 2
+  #For Rails >= 2
+  if method(:sanitize_sql_hash_for_conditions).arity == 1
+    # Before Rails 2.3.3, the method had only one argument
     def self.sanitize_sql_hash_for_conditions(attrs)
       conditions = get_conditions(attrs)
       replace_bind_variables(conditions, expand_range_bind_variables(attrs.values))
     end
+  elsif method(:sanitize_sql_hash_for_conditions).arity == -2
+    # After Rails 2.3.3, the method had only two args, the last one optional
+    def self.sanitize_sql_hash_for_conditions(attrs, table_name = quoted_table_name)
+      attrs = expand_hash_conditions_for_aggregates(attrs)
+
+      conditions = attrs.map do |attr, value|
+        unless value.is_a?(Hash)
+          attr = attr.to_s
+
+          # Extract table name from qualified attribute names.
+          if attr.include?('.')
+            table_name, attr = attr.split('.', 2)
+            table_name = connection.quote_table_name(table_name)
+          end
+
+          if columns_hash[attr].is_a?(SpatialColumn)
+            if value.is_a?(Array)
+              attrs[attr.to_sym]= "BOX3D(" + value[0].join(" ") + "," + value[1].join(" ") + ")"
+              "#{table_name}.#{connection.quote_column_name(attr)} && SetSRID(?::box3d, #{value[2] || DEFAULT_SRID} ) "
+            elsif value.is_a?(Envelope)
+              attrs[attr.to_sym]= "BOX3D(" + value.lower_corner.text_representation + "," + value.upper_corner.text_representation + ")"
+              "#{table_name}.#{connection.quote_column_name(attr)} && SetSRID(?::box3d, #{value.srid} ) "
+            else
+              "#{table_name}.#{connection.quote_column_name(attr)} && ? "
+            end
+          else
+            attribute_condition("#{table_name}.#{connection.quote_column_name(attr)}", value)
+          end
+        else
+          sanitize_sql_hash_for_conditions(value, connection.quote_table_name(attr.to_s))
+        end
+      end.join(' AND ')
 
+      replace_bind_variables(conditions, expand_range_bind_variables(attrs.values))
+    end
+  else
+    raise "Spatial Adapter will not work with this version of Rails"
+  end
 end
 
 ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
@@ -81,11 +119,15 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
 
   alias :original_tables :tables
   def tables(name = nil) #:nodoc:
+    original_tables(name) + views(name)
+  end
+
+  def views(name = nil) #:nodoc:
     schemas = schema_search_path.split(/,/).map { |p| quote(p.strip) }.join(',')
-    original_tables(name) + query(<<-SQL, name).map { |row| row[0] }
+    query(<<-SQL, name).map { |row| row[0] }
       SELECT viewname
-        FROM pg_views
-        WHERE schemaname IN (#{schemas})
+      FROM pg_views
+      WHERE schemaname IN (#{schemas})
     SQL
   end
 
@@ -145,14 +187,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
 
@@ -198,12 +238,12 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
       if type =~ /geometry/i
         raw_geom_info = raw_geom_infos[name]
         if raw_geom_info.nil?
-          ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.create_simplified(name,default,notnull == "f")
+          ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.create_simplified(name, default, notnull == "f")
         else
           ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.new(name, default,raw_geom_info.type, notnull == "f", raw_geom_info.srid, raw_geom_info.with_z, raw_geom_info.with_m)
         end
       else
-        ActiveRecord::ConnectionAdapters::Column.new(name, ActiveRecord::ConnectionAdapters::PostgreSQLColumn.extract_value_from_default( default), type,notnull == "f")
+        ActiveRecord::ConnectionAdapters::PostgreSQLColumn.new(name, ActiveRecord::ConnectionAdapters::PostgreSQLColumn.extract_value_from_default( default), type, notnull == "f")
       end
     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[postgis_geoms.keys[0]] = postgis_calculate("Transform", self.new_record? ? self.geom : 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[postgis_geoms.keys.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[postgis_geoms.keys.first] = transform(utm)
   end
 
   def to_utm
@@ -502,6 +502,15 @@ module PostgisFunctions
   end
 
   #
+  # Returns Geometry as GeoJSON
+  #
+  # http://geojson.org/
+  #
+  def as_geo_json
+    postgis_calculate(:AsGeoJSON, self)
+  end
+
+
   #
   #
   # LINESTRING
@@ -519,7 +528,7 @@ module PostgisFunctions
     # Returns Float
     #
     def length
-      dis = postgis_calculate(:length, self).to_f
+      postgis_calculate(:length, self).to_f
     end
 
     #
@@ -530,7 +539,7 @@ module PostgisFunctions
     # Returns Float
     #
     def length_3d
-      dis = postgis_calculate(:length3d, self).to_f
+      postgis_calculate(:length3d, self).to_f
     end
 
     #
@@ -551,7 +560,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
 
     #
@@ -594,6 +603,14 @@ module PostgisFunctions
       postgis_calculate(:crosses, [self, other])
     end
 
+    #
+    # Warning: PostGIS 1.4+
+    #
+    # Return crossing direction
+    def line_crossing_direction(other)
+      postgis_calculate(:lineCrossingDirection, [self, other])
+    end
+
     #
     # Returns a float between 0 and 1 representing the location of the closest point
     # on LineString to the given Point, as a fraction of total 2d line length.
@@ -709,7 +726,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
 
     #
@@ -792,7 +809,7 @@ module PostgisFunctions
     # use 'length'. Measurements are in the units of the spatial reference system of
     # the geometry.
     #
-    # Accepts optional parameter, the srid to transform to.
+    # Accepts optional parameter, the sridto transform to.
     #
     # Returns Float ST_Perimeter(geometry g1);
     #

data/lib/postgis_functions.rb

@@ -5,8 +5,8 @@
 # Hope you enjoy this plugin.
 #
 #
-# Post any bugs/suggestions to the lighthouse tracker:
-# http://nofxx.lighthouseapp.com/projects/20712-postgisadapter
+# Post any bugs/suggestions to GitHub issues tracker:
+# http://github.com/nofxx/postgis_adapter/issues
 #
 #
 # Some links:
@@ -21,17 +21,15 @@ module PostgisFunctions
 
   def postgis_calculate(operation, subjects, options = {})
     subjects = [subjects] unless subjects.respond_to?(:map)
-    return execute_geometrical_calculation(operation, subjects, options)
-    rescue Exception => e
-    raise StandardError, "#{e}"
+    execute_geometrical_calculation(operation, subjects, options)
   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 +42,7 @@ module PostgisFunctions
 
     tables = on_db.map do |t| {
       :name => t.class.table_name,
+      :column => t.postgis_geoms.keys[0],
       :uid =>  unique_identifier,
       :id => t[:id] }
     end
@@ -54,7 +53,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
@@ -74,10 +73,10 @@ module PostgisFunctions
       fields = fields.join(" #{options} ")
     end
 
-    sql =   "SELECT #{opcode}(#{fields}) "
-    sql <<  "FROM #{tables.join(",")} "           if tables
-    sql <<  "WHERE #{conditions.join(" AND ")}"   if conditions
-    #p sql; sql
+    sql =  "SELECT #{opcode}(#{fields}) "
+    sql << "FROM #{tables.join(",")} "         unless tables.empty?
+    sql << "WHERE #{conditions.join(" AND ")}" unless conditions.empty?
+    sql
   end
 
   #
@@ -92,11 +91,16 @@ module PostgisFunctions
   def execute_geometrical_calculation(operation, subject, options) #:nodoc:
     value = connection.select_value(construct_geometric_sql(operation, subject, options))
     return nil unless value
-    if value =~ /t|f/
+    # TODO: bench case vs if here
+    if value =~ /^[tf]$/
       {"f" => false, "t" => true}[value]
+    elsif value =~ /^\{/
+       value
     else
       GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(value) rescue value
     end
+    rescue Exception => e
+    raise StandardError, "#{e}"
   end
 
   # Get a unique ID for tables

data/postgis_adapter.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{postgis_adapter}
-  s.version = "0.5.1"
+  s.version = "0.7.1"
 
   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-10-10}
   s.description = %q{Execute PostGIS functions on Active Record}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [
@@ -16,12 +19,10 @@ Gem::Specification.new do |s|
     ".gitignore",
      "History.txt",
      "MIT-LICENSE",
-     "Manifest.txt",
      "README.rdoc",
      "Rakefile",
-     "VERSION.yml",
+     "VERSION",
      "init.rb",
-     "install.rb",
      "lib/postgis_adapter.rb",
      "lib/postgis_adapter/acts_as_geom.rb",
      "lib/postgis_adapter/common_spatial_adapter.rb",
@@ -31,10 +32,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 +42,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.5}
   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,27 +31,31 @@ 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
-  acts_as_geom :geom
+  acts_as_geom :geom => :polygon
 end
 
 class Position < ActiveRecord::Base
-  acts_as_geom :geom
+  acts_as_geom :geom => :point
 end
 
 class Street < ActiveRecord::Base
-  acts_as_geom :geom
+  acts_as_geom :geom => :line_string
 end
 
 class CommonGeo < ActiveRecord::Base
-  acts_as_geom :geom
+  acts_as_geom :geom => :point
+end
+
+class DiffName < ActiveRecord::Base
+  acts_as_geom :the_geom => :point
 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/acts_as_geom_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 class DiffColumn < ActiveRecord::Base
-  acts_as_geom :ponto
+  acts_as_geom :ponto => :point
 end
 
 class NotInDb < ActiveRecord::Base
@@ -11,7 +11,7 @@ end
 describe "ActsAsGeom" do
 
   it "should get the geom type" do
-    p City.connection.columns("cities").select { |c| c.name == "geom" }[0]
+    City.connection.columns("cities").select { |c| c.name == "geom" }[0]
     City.get_geom_type(:geom).should eql(:polygon)
   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/common_spec.rb

@@ -3,7 +3,8 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 describe "Common Functions" do
 
   before(:all) do
-    @c1 ||= City.create!(:data => "City1", :geom => Polygon.from_coordinates([[[12,45],[45,41],[4,1],[12,45]],[[2,5],[5,1],[14,1],[2,5]]],4326))
+    @poly = Polygon.from_coordinates([[[12,45],[45,41],[4,1],[12,45]],[[2,5],[5,1],[14,1],[2,5]]], 4326)
+    @c1 ||= City.create!(:data => "City1", :geom => @poly)
     @c2 ||= City.create!(:data => "City1", :geom => Polygon.from_coordinates([[[22,66],[65,65],[20,10],[22,66]],[[10,15],[15,11],[34,14],[10,15]]],4326))
     @c3 ||= City.create!(:data => "City3", :geom => Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],4326))
     @s1 ||= Street.create!(:data => "Street1", :geom => LineString.from_coordinates([[1,1],[2,2]],4326))
@@ -69,6 +70,14 @@ describe "Common Functions" do
       @p1.geom.srid.should eql(29101)
     end
 
+    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.geom.x.should be_close(1.00000000000005, 0.00001)
+      pos.geom.y.should be_close(1.00000000000005, 0.00001)
+    end
+
     it "should see in what fraction of the ls it is" do
       @p1.where_on_line(@s1).should eql(0.0)
     end
@@ -89,6 +98,13 @@ describe "Common Functions" do
       lambda { @p2.to_utm! }.should change(@p2, :srid)
     end
 
+    if PG_VERSION >= "8.4.0"
+      it "should export as GeoJSON" do
+        @p1.as_geo_json.should eql("{\"type\":\"Point\",\"coordinates\":[1,1]}")
+      end
+    end
+
+
    #  it { @p3.x.should be_close(8.0, 0.1) }
    #  it { @p3.y.should be_close(8.0, 0.1) }
    #  it { @p3.z.should be_close(0.0, 0.1) }
@@ -182,10 +198,24 @@ describe "Common Functions" do
     #   @c1.disjoint?(@p2).should be_true
     # end
 
+    it "should check overlaps" do
+      @c2.contains?(@c1).should be_false
+    end
+
+    it "should check overlaps non saved" do
+      @c2.contains?(@poly).should be_false
+    end
+
     it "should find the UTM zone" do
       @c2.utm_zone.should eql(32737)
     end
 
+    if PG_VERSION >= "8.4.0"
+      it "should export as GeoJSON" do
+        @c1.as_geo_json.should eql("{\"type\":\"Polygon\",\"coordinates\":[[[12,45],[45,41],[4,1],[12,45]],[[2,5],[5,1],[14,1],[2,5]]]}")
+      end
+    end
+
   end
 
   describe "LineString" do
@@ -203,6 +233,12 @@ describe "Common Functions" do
     it { @s1.touches?(@s2).should be_false }
     it { @s4.touches?(@s3).should be_false }
 
+    if PG_VERSION >= "8.4.0"
+      it "should calculate crossing direction" do
+        @s4.line_crossing_direction(@s3).should eql("1")
+      end
+    end
+
     it "should intersect with linestring" do
       @s4.intersects?(@s3).should be_true
     end
@@ -251,6 +287,13 @@ describe "Common Functions" do
       it { @s1.should_not be_envelopes_intersect(@s2) }
       it { @s1.boundary.should be_instance_of(MultiPoint) }
 
+
+      if PG_VERSION >= "8.4.0"
+        it "should export as GeoJSON" do
+          @s1.as_geo_json.should eql("{\"type\":\"LineString\",\"coordinates\":[[1,1],[2,2]]}")
+        end
+      end
+
     end
 
     describe "Distance" do
@@ -317,6 +360,15 @@ describe "Common Functions" do
       @s2.utm_zone.should eql(32732)
     end
 
+    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.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)
+      str.geom[1].y.should be_close(7,0.0000001)
+    end
   end
 
 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,24 @@ require 'rubygems'
 require 'spec'
 require 'pg'
 require 'activerecord'
-require 'rspec_spinner'
-
-gem 'activerecord', "=2.3.2"
-
 $:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
+gem 'activerecord', "=2.3.4"
 require 'postgis_adapter'
+
+# Monkey patch Schema.define logger
+$logger = Logger.new(StringIO.new)
+def $logger.write(d); self.info(d); end
+# $stdout = $logger
+
 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.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]
+
+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,7 @@
 --- !ruby/object:Gem::Specification 
 name: postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Marcos Augusto
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 -03:00
+date: 2009-10-10 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -25,12 +25,10 @@ files:
 - .gitignore
 - History.txt
 - MIT-LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
-- VERSION.yml
+- VERSION
 - 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: true
 homepage: http://github.com/nofxx/postgis_adapter
 licenses: []
@@ -80,18 +73,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: postgis_adapter
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 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/VERSION.yml

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

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: