nofxx-postgis_adapter 0.3.3 → 0.3.4

data/lib/postgis_adapter.rb

@@ -19,7 +19,7 @@ include GeoRuby::SimpleFeatures
 include SpatialAdapter
 
 module PostgisAdapter
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end
 
 #tables to ignore in migration : relative to PostGIS management of geometric columns
@@ -386,10 +386,6 @@ module ActiveRecord
         new(name,default,"geometry",null,nil,nil,nil)
       end
 
-      def as_kml
-
-      end
-
     end
   end
 end

data/lib/postgis_functions/class.rb

@@ -1,31 +1,30 @@
 module PostgisFunctions
-  
-  
-    ###
-    ##
+
     #
     # Class Methods
     #
-    # Falling back to AR here.
-    #
     module ClassMethods
 
       #
-      # Returns the closest record 
-      #
-      def closest_to(p, srid=4326)
-        find(:first, :order => "ST_Distance(geom, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))" )
+      # Returns the closest record
+      def closest_to(p, opts = {})
+        srid = opts.delete(:srid) || 4326
+        opts.merge!(:order => "ST_Distance(geom, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))")
+        find(:first, opts)
       end
 
-      def close_to(p, srid=4326)
-        find(:all, :order => "ST_Distance(geom, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))" )
+      #
+      # Order by distance
+      def close_to(p, opts = {})
+        srid = opts.delete(:srid) || 4326
+        opts.merge!(:order => "ST_Distance(geom, GeomFromText('POINT(#{p.x} #{p.y})', #{srid}))")
+        find(:all, opts)
       end
 
-      #
-      #
-      #
-      def by_length sort='asc'
-        find(:all, :order => "ST_length(geom) #{sort}" )
+      def by_length opts = {}
+        sort = opts.delete(:sort) || 'asc'
+        opts.merge!(:order => "ST_length(geom) #{sort}")
+        find(:all, opts)
       end
 
       def longest
@@ -58,7 +57,7 @@ module PostgisFunctions
       end
 
     end
-  
-  
-  
-end
+
+
+
+end

data/postgis_adapter.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postgis_adapter}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2009-03-14}
+  s.date = %q{2009-04-13}
   s.description = %q{Postgis Adapter for Activer Record}
   s.email = ["x@nofxx.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
@@ -25,16 +25,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 2.0.2"])
-      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<activerecord>, [">= 2.0.2"])
-      s.add_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 2.0.2"])
-    s.add_dependency(%q<newgem>, [">= 1.2.3"])
+    s.add_dependency(%q<newgem>, [">= 1.3.0"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/spec/postgis_functions/class_spec.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe "Class 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))
+    @s1 ||= Street.create!(:data => "Street1", :geom => LineString.from_coordinates([[1,1],[88,88]],4326))
+    @p1 ||= Position.create!(:data => "Point1", :geom => Point.from_x_y(1,1,4326))
+  end
+
+  it "should find the closest other point" do
+    Position.close_to(@p1.geom, :srid => 4326)[0].data.should == @p1.data
+  end
+
+  it "should find the closest other point and limit" do
+    Position.close_to(@p1.geom, :limit => 10).should have(10).positions
+  end
+
+  it "should find the closest other point" do
+    Position.closest_to(@p1.geom).data.should == @p1.data
+  end
+
+  it "should sort by linestring length" do
+    Street.by_length.should be_instance_of(Array)
+  end
+
+  it "should sort by linestring length" do
+    Street.by_length(:limit => 10).should have(10).streets
+  end
+
+  it "should find the longest" do
+    Street.longest.should be_instance_of(Street)
+  end
+
+  it "should find all dwithin one" do
+    Position.all_within(@s1.geom).should be_instance_of(Array)
+  end
+
+  it "should find all dwithin one" do
+    City.by_perimeter.should be_instance_of(Array)
+  end
+
+  it "should sort by polygon area" 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)
+  end
+
+  it "should sort by all within" do
+    City.by_boundaries.should be_instance_of(Array)
+  end
+
+end

data/spec/postgis_functions/common_spec.rb

@@ -20,11 +20,11 @@ describe "Common Functions" do
   describe "Point" do
 
     it "should find the closest other point" do
-      Position.close_to(@p1.geom,4326)[0].data.should == @p1.data
+      Position.close_to(@p1.geom)[0].data.should == @p1.data
     end
 
     it "should find the closest other point" do
-      Position.closest_to(@p1.geom,4326).data.should == @p1.data
+      Position.closest_to(@p1.geom).data.should == @p1.data
     end
 
     it { @p1.distance_to(@s2).should be_close(4.24264068711928, 0.0001) }

data/spec/postgis_functions_spec.rb

@@ -20,7 +20,7 @@ describe "PostgisFunctions" do
     end
 
      it "should calculate distance point to line" do
-      @p1.geom.as_kml.should be_close(0.248069469178417, 0.00000001)
+      @p1.geom.as_kml.should eql("<Point>\n<coordinates>-43,-22</coordinates>\n</Point>\n")
     end
 
     it "should calculate inside a city" do
@@ -39,29 +39,4 @@ describe "PostgisFunctions" do
 
   end
 
-  #TODO is sorted rspec helper
-  describe "Class methods" do
-
-    it "should find all dwithin one" do
-      Position.all_within(@s1.geom).should be_instance_of(Array)
-    end
-
-    it "should find all dwithin one" do
-      City.by_perimeter.should be_instance_of(Array)
-    end
-
-    it "should sort by polygon area" 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)
-    end
-
-    it "should sort by all within" do
-      City.by_boundaries.should be_instance_of(Array)
-    end
-
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-14 00:00:00 -07:00
+date: 2009-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe