nofxx-postgis_adapter 0.5.7 → 0.7.0

data/README.rdoc

@@ -79,7 +79,7 @@ Here are this fork additions. To use it:
 
 
     class Street < ActiveRecord::Base
-      acts_as_geom :line
+      acts_as_geom :line => :line_string
     end
 
     ...
@@ -324,7 +324,7 @@ 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:
 

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.7.0

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_functions/common.rb

@@ -438,7 +438,7 @@ module PostgisFunctions
   # Return Geometry ST_Transform(geometry g1, integer srid);
   #
   def transform!(new_srid)
-    self[geo_columns.first] = postgis_calculate("Transform", self.new_record? ? self.geom : 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[geo_columns.first].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[geo_columns.first] = transform(utm)
+    self[postgis_geoms.keys.first] = transform(utm)
   end
 
   def to_utm
@@ -792,7 +792,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

@@ -22,8 +22,8 @@ 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}"
+    #rescue Exception => e
+    #raise StandardError, "#{e}"
   end
 
   def geo_columns
@@ -44,7 +44,7 @@ module PostgisFunctions
 
     tables = on_db.map do |t| {
       :name => t.class.table_name,
-      :column => t.geo_columns.first,
+      :column => t.postgis_geoms.keys[0],
       :uid =>  unique_identifier,
       :id => t[:id] }
     end

data/postgis_adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postgis_adapter}
-  s.version = "0.5.7"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Augusto"]
-  s.date = %q{2009-08-14}
+  s.date = %q{2009-08-16}
   s.description = %q{Execute PostGIS functions on Active Record}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [

data/spec/db/models_postgis.rb

@@ -41,21 +41,21 @@ 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
+  acts_as_geom :the_geom => :point
 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

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))
@@ -190,6 +191,14 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.7.0
 platform: ruby
 authors: 
 - Marcos Augusto
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-14 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: []