geo_foo 0.0.1 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/geo_foo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_foo}
-  s.version = "0.0.1"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["agnat", "hukl"]
-  s.date = %q{2010-03-12}
+  s.date = %q{2010-03-16}
   s.description = %q{Geo makes it easy to interact with Postgis without hacking too deep into AR. It is in a very early stage and should be considered experimental at most}
   s.email = %q{contact@smyck.org}
   s.extra_rdoc_files = [
@@ -30,16 +30,18 @@ Gem::Specification.new do |s|
      "lib/geo_foo/numeric.rb",
      "lib/geo_foo/scope.rb",
      "test/helper.rb",
+     "test/models/location.rb",
      "test/test_geo_foo.rb",
      "test_database.yml"
   ]
   s.homepage = %q{http://github.com/hukl/geo_foo}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{An experimental and extensible Rails/Postgis library}
   s.test_files = [
     "test/helper.rb",
+     "test/models/location.rb",
      "test/test_geo_foo.rb"
   ]
 

data/lib/geo_foo.rb

@@ -1,3 +1,4 @@
+require 'geo_foo/core'
 require 'geo_foo/scope'
 require 'geo_foo/active_record'
 require 'geo_foo/numeric'

data/lib/geo_foo/active_record.rb

@@ -2,6 +2,7 @@ module GeoFoo
   module ActiveRecord
     def self.included(base)
       base.extend ClassMethods
+      base.send(:include, InstanceMethods)
     end
   end
   
@@ -11,18 +12,38 @@ module GeoFoo
         def self.within_radius lat, lon, radius
           scoped(
             :conditions => [
-              "ST_DWithin(#{GeoFoo::Core.as_point(lat,lon)}, "\
+              "ST_DWithin(#{GeoFoo.as_point(lat,lon)}, "\
               "point, #{bbox_size(lat, radius)}) AND ST_Distance_Sphere(" \
-              "point, #{GeoFoo::Core.as_point(lat,lon)}) < #{radius}"
+              "point, #{GeoFoo.as_point(lat,lon)}) < #{radius}"
             ]
           )
         end
       end
     end
     
+    # return latitude, longitude for a given id
+    def find_coords_by_id id
+      result = connection.execute(
+        "SELECT ST_Y(point), ST_X(point) FROM #{table_name} WHERE id = #{id}")[0]
+      # Intentionally return (y,x) which corresponds to (lat,lon). See as_point().
+      [result["st_y"].to_f, result["st_x"].to_f]
+    end
+    
     # XXX handle case where lat is (close to) +-90deg (poles)
     def bbox_size latitude, radius
-      (radius.to_f / (GeoFoo::Core::EarthRadius * Math.cos(latitude.to_rad))).to_deg
+      (radius.to_f / (GeoFoo::EarthRadius * Math.cos(latitude.to_rad))).to_deg
+    end
+  end
+  
+  module InstanceMethods
+    
+    def point_to_coords
+      result = self.class.connection.execute(
+        "SELECT ST_Y(point), ST_X(point) FROM #{self.class.table_name} " \
+        "WHERE id = #{self.id}"
+      )[0]
+      
+      { :latitude => result["st_y"].to_f, :longitude => result["st_x"].to_f }
     end
   end
 end

data/lib/geo_foo/core.rb

@@ -1,23 +1,18 @@
 module GeoFoo
   
-  module Core
-    SRID = 4326 # WGS-84
-    EarthRadius = 6370986.0 # meters (as used by postgis' ST_Distance_Sphere())
-    TableName = "locations"
-  
-    # execute an SQL query on the database 
-    def self.execute query
-      ActiveRecord::Base.connection.execute( query ).to_a
-    end
-  
-    # return a postgis string representation of the given coordinates
-    def self.as_point lat, lon
-      # Intentionally use (lat,lon) and not (lon,lat), because latitude is the
-      # 'horizontal' coordinate.
-      # See: http://archives.postgresql.org/pgsql-general/2008-02/msg01393.php
-      "ST_GeomFromText('POINT(#{lon} #{lat})', #{SRID})"
-    end
+  SRID = 4326 # WGS-84
+  EarthRadius = 6370986.0 # meters (as used by postgis' ST_Distance_Sphere())
+  
+  # return a postgis string representation of the given coordinates
+  def self.as_point lat, lon
+    # Intentionally use (lat,lon) and not (lon,lat), because latitude is the
+    # 'horizontal' coordinate.
+    # See: http://archives.postgresql.org/pgsql-general/2008-02/msg01393.php
+    "ST_GeomFromText('POINT(#{lon} #{lat})', #{SRID})"
+  end
   
+  module Core
+    
     # find all locations within a radius for a given location
     def self.find_neighbours_by_coords lat, lon, radius=100.0
       # compute an appropriate bounding box size for this latitude
@@ -29,31 +24,7 @@ module GeoFoo
                "AND #{distance} < #{radius} "\
                "ORDER BY #{distance}").map { |row| row["id"].to_i }
     end
-  
-    # return latitude, longitude for a given id
-    def self.find_coords_by_id id
-      r = (execute "SELECT ST_Y(point), ST_X(point) FROM #{TableName} "\
-                   "WHERE id = #{id}")[0]
-      # Intentionally return (y,x) which corresponds to (lat,lon). See as_point().
-      [r["st_y"].to_f, r["st_x"].to_f]
-    end
-  
-    # store a point in the location table. returns the points id.
-    def self.store_location lat, lon
-      (execute "INSERT INTO #{TableName} (point) VALUES (#{as_point(lat,lon)})"\
-               "RETURNING id").first["id"].to_i
-    end
-  
-    # delete a location from the database
-    def self.delete_location id
-      execute "DELETE FROM #{TableName} WHERE id = #{id}"
-    end
-  
-    # returns the number of locations currently in the database
-    def self.location_count
-      (execute "SELECT count(*) FROM #{TableName}").first["count"].to_i
-    end
-  
+    
     # migration helper: create the database table
     def self.create_table
       execute "CREATE TABLE #{TableName} (id serial PRIMARY KEY)"

data/test/helper.rb

@@ -5,12 +5,11 @@ require 'active_support'
 require 'active_support/test_case'
 
 config_file = File.join(File.dirname(__FILE__), '..', 'test_database.yml')
-database_config = YAML.load_file config_file
-database_config[:adapter] = 'postgresql'
-ActiveRecord::Base.establish_connection database_config
+ActiveRecord::Base.establish_connection( YAML.load_file config_file )
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'geo_foo'
 
 class ActiveSupport::TestCase
@@ -27,5 +26,8 @@ class ActiveSupport::TestCase
     query(sql).first.first
   end
   
+  def point_for lat, lon
+    execute("SELECT #{GeoFoo.as_point(lat, lon)}")[0]["st_geomfromtext"]
+  end
   
 end

data/test/models/location.rb

@@ -0,0 +1,5 @@
+class Location < ActiveRecord::Base
+  
+  add_geo_foo
+  
+end

data/test/test_geo_foo.rb

@@ -1,25 +1,82 @@
-require 'geo_foo/core'
 require 'helper'
+require 'models/location'
 
 class TestGeoFoo < ActiveSupport::TestCase
-
-  test "database connection" do
-    # perform a query first to 'wake-up' the connection
-    assert_equal(query_scalar("SELECT 5").to_i, 5)
-    assert ActiveRecord::Base.connected?, "database connection esteblished"
+  
+  def setup
+    query = [
+      "CREATE TABLE locations ( id serial PRIMARY KEY );",
+      "SELECT AddGeometryColumn('locations', 'point', 4326, 'POINT', 2);",
+      "CREATE INDEX locations_point_index ON locations USING GIST (point);"
+    ].join
+    
+    ActiveRecord::Base.connection.execute(query)
   end
-
+  
+  def teardown
+    query = [
+      "DROP TABLE locations;",
+      "DELETE FROM geometry_columns WHERE f_table_name = 'locations';"
+    ].join
+    ActiveRecord::Base.connection.execute(query)
+  end
+  
   test "postgis database is present" do
-    assert(query('SELECT count(*) FROM geometry_columns'))
+    assert(query('SELECT postgis_full_version()'), 'postgis functions present')
+    assert(query('SELECT count(*) FROM geometry_columns'), 'postgis tables present')
+    assert(query('SELECT count(*) FROM spatial_ref_sys'), 'postgis tables present')
   end
 
   test "as_point" do
     latitude = 5
     longitude = 42
-    point = GeoFoo::Core.as_point latitude, longitude
+    point = GeoFoo.as_point latitude, longitude
     assert(query("SELECT #{point}"))
     assert_equal(query_scalar("SELECT ST_X(#{point})").to_i, 42)
     assert_equal(query_scalar("SELECT ST_Y(#{point})").to_i, 5)
   end
   
+  test "setup of Location model" do
+    assert_not_nil Location
+  end
+    
+  test "creating a location" do
+    assert_not_nil Location.create :point => point_for( 53.0, 13.0 )
+  end
+  
+  test "within_radius is defined" do
+    assert defined?(Location.within_radius), '#within_radius is not defined'
+  end
+  
+  test "as_point is defined" do
+    assert defined?(GeoFoo.as_point), '#as_point is not defined'
+  end
+  
+  test "find locations within radius" do
+    Location.create :point => point_for( 53.0000001, 13.0000001 )
+    Location.create :point => point_for( 53.0000002, 13.0000002 )
+    
+    assert_equal 2, Location.within_radius(53.0000001, 13.0000001, 100.0).size
+  end
+  
+  test "find no locations within radius" do
+    Location.create :point => point_for( 53.0000001, 13.0000001 )
+    Location.create :point => point_for( 53.0000002, 13.0000002 )
+    
+    assert_equal 0, Location.within_radius(54.0, 14.0, 100.0).size
+  end
+  
+  test "point to coords" do
+    location = Location.create :point => point_for( 53.1, 13.1 )
+    
+    assert (53.09...53.11).include?( location.point_to_coords[:latitude] )
+    assert (13.09...13.11).include?( location.point_to_coords[:longitude] )
+  end
+  
+  test "find_coords_by_id" do
+    Location.create :point => point_for( 53.1, 13.1 )
+    assert (53.09...53.11).include?( Location.find_coords_by_id(Location.last.id)[0])
+    assert (13.09...13.11).include?( Location.find_coords_by_id(Location.last.id)[1])
+  end
+  
 end

data/test_database.yml

@@ -1,3 +1,7 @@
 # always use adapter: postgresql
+adapter: postgresql
+encoding: unicode
 username: postgres
 database: geo_foo_test
+template: template_postgis
+min_messages: PANIC

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: geo_foo
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - agnat
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 +01:00
+date: 2010-03-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +42,7 @@ files:
 - lib/geo_foo/numeric.rb
 - lib/geo_foo/scope.rb
 - test/helper.rb
+- test/models/location.rb
 - test/test_geo_foo.rb
 - test_database.yml
 has_rdoc: true
@@ -52,21 +58,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: An experimental and extensible Rails/Postgis library
 test_files: 
 - test/helper.rb
+- test/models/location.rb
 - test/test_geo_foo.rb