rails-geocoder 0.9.5 → 0.9.6

data/CHANGELOG.rdoc

@@ -2,6 +2,11 @@
 
 Per-release changes to Geocoder.
 
+== 0.9.6 (2011 Jan 19)
+
+* Fix incompatibility with will_paginate gem.
+* Include table names in GROUP BY clause of nearby scope to avoid ambiguity in joins.
+
 == 0.9.5 (2010 Oct 15)
 
 * Fix broken PostgreSQL compatibility (now 100% compatible).

data/README.rdoc

@@ -105,6 +105,8 @@ Please see the code for more methods and detailed information about arguments (e
 
 SQLite's lack of trigonometric functions requires an alternate implementation of the +near+ method (scope). When using SQLite, Geocoder will automatically use a less accurate algorithm for finding objects near a given point. Results of this algorithm should not be trusted too much as it will return objects that are outside the given radius.
 
+It is also not possible to calculate distances between points without the trig functions so you cannot sort results by "nearness."
+
 
 === Discussion
 

data/lib/geocoder.rb

@@ -74,7 +74,6 @@ module Geocoder
     # http://www.scribd.com/doc/2569355/Geo-Distance-Search-with-MySQL
     #
     def full_near_scope_options(latitude, longitude, radius, options)
-      options[:order] ||= 'distance ASC'
       lat_attr = geocoder_options[:latitude]
       lon_attr = geocoder_options[:longitude]
       distance = "3956 * 2 * ASIN(SQRT(" +
@@ -83,6 +82,7 @@ module Geocoder
         "COS(#{lat_attr} * PI() / 180) * " +
         "POWER(SIN((#{longitude} - #{lon_attr}) * " +
         "PI() / 180 / 2), 2) ))"
+      options[:order] ||= "#{distance} ASC"
       default_near_scope_options(latitude, longitude, radius, options).merge(
         :select => "#{options[:select] || '*'}, #{distance} AS distance",
         :having => "#{distance} <= #{radius}"
@@ -115,7 +115,7 @@ module Geocoder
         conditions << obj.id
       end
       {
-        :group  => columns.map{ |c| c.name}.join(','),
+        :group  => columns.map{ |c| "#{table_name}.#{c.name}" }.join(','),
         :order  => options[:order],
         :limit  => options[:limit],
         :offset => options[:offset],

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails-geocoder
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Alex Reisner
@@ -15,41 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 -04:00
+date: 2011-01-18 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Geocoder adds object geocoding and database-agnostic distance calculations to Ruby on Rails. It does not rely on proprietary database functions so finding geocoded objects in a given area is easily done using out-of-the-box MySQL or even SQLite.
-email: alex@alexreisner.com
+description: Geocoder adds object geocoding and distance calculations to ActiveRecord models. It does not rely on proprietary database functions so finding geocoded objects in a given area is easily done using out-of-the-box MySQL, PostgreSQL, or SQLite.
+email: 
+- alex@alexreisner.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
-- .gitignore
-- CHANGELOG.rdoc
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- init.rb
 - lib/geocoder.rb
-- lib/tasks/geocoder_tasks.rake
-- rails-geocoder.gemspec
-- test/fixtures/madison_square_garden.json
-- test/geocoder_test.rb
 - test/test_helper.rb
+- test/geocoder_test.rb
+- CHANGELOG.rdoc
+- Rakefile
+- README.rdoc
+- LICENSE
 has_rdoc: true
 homepage: http://github.com/alexreisner/geocoder
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -76,7 +69,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Add geocoding functionality to Rails models.
-test_files: 
-- test/test_helper.rb
-- test/geocoder_test.rb
+summary: Simple, database-agnostic geocoding and distance calculations for Rails.
+test_files: []
+

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,5 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg

data/VERSION

@@ -1 +0,0 @@
-0.9.5

data/init.rb

@@ -1 +0,0 @@
-require 'geocoder'

data/lib/tasks/geocoder_tasks.rake

@@ -1,15 +0,0 @@
-def klass
-  class_name = ENV['CLASS'] || ENV['class']
-  raise "Please specify a CLASS (model)" unless class_name
-  Object.const_get(class_name)
-end
-
-namespace :geocode do
-
-  desc "Geocode all objects without coordinates."
-  task :all => :environment do
-    klass.not_geocoded.each do |obj|
-      obj.fetch_coordinates!
-    end
-  end
-end

data/rails-geocoder.gemspec

@@ -1,55 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rails-geocoder}
-  s.version = "0.9.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alex Reisner"]
-  s.date = %q{2010-10-15}
-  s.description = %q{Geocoder adds object geocoding and database-agnostic distance calculations to Ruby on Rails. It does not rely on proprietary database functions so finding geocoded objects in a given area is easily done using out-of-the-box MySQL or even SQLite.}
-  s.email = %q{alex@alexreisner.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "CHANGELOG.rdoc",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "init.rb",
-     "lib/geocoder.rb",
-     "lib/tasks/geocoder_tasks.rake",
-     "rails-geocoder.gemspec",
-     "test/fixtures/madison_square_garden.json",
-     "test/geocoder_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/alexreisner/geocoder}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Add geocoding functionality to Rails models.}
-  s.test_files = [
-    "test/test_helper.rb",
-     "test/geocoder_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-

data/test/fixtures/madison_square_garden.json

@@ -1,57 +0,0 @@
-{
-  "status": "OK",
-  "results": [ {
-    "types": [ "street_address" ],
-    "formatted_address": "4 Penn Plaza, New York, NY 10001, USA",
-    "address_components": [ {
-      "long_name": "4",
-      "short_name": "4",
-      "types": [ "street_number" ]
-    }, {
-      "long_name": "Penn Plaza",
-      "short_name": "Penn Plaza",
-      "types": [ "route" ]
-    }, {
-      "long_name": "Manhattan",
-      "short_name": "Manhattan",
-      "types": [ "sublocality", "political" ]
-    }, {
-      "long_name": "New York",
-      "short_name": "New York",
-      "types": [ "locality", "political" ]
-    }, {
-      "long_name": "New York",
-      "short_name": "New York",
-      "types": [ "administrative_area_level_2", "political" ]
-    }, {
-      "long_name": "New York",
-      "short_name": "NY",
-      "types": [ "administrative_area_level_1", "political" ]
-    }, {
-      "long_name": "United States",
-      "short_name": "US",
-      "types": [ "country", "political" ]
-    }, {
-      "long_name": "10001",
-      "short_name": "10001",
-      "types": [ "postal_code" ]
-    } ],
-    "geometry": {
-      "location": {
-        "lat": 40.7503540,
-        "lng": -73.9933710
-      },
-      "location_type": "ROOFTOP",
-      "viewport": {
-        "southwest": {
-          "lat": 40.7473324,
-          "lng": -73.9965316
-        },
-        "northeast": {
-          "lat": 40.7536276,
-          "lng": -73.9902364
-        }
-      }
-    }
-  } ]
-}