rails-geocoder 0.9.1 → 0.9.2

data/CHANGELOG.rdoc

@@ -2,6 +2,10 @@
 
 Per-release changes to Geocoder.
 
+== 0.9.2 (2010 Jun 3)
+
+* Fix LIMIT clause bug in PostgreSQL (reported by kenzie).
+
 == 0.9.1 (2010 May 4)
 
 * Use scope instead of named_scope in Rails 3.

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/geocoder.rb

@@ -51,7 +51,7 @@ module Geocoder
     # 
     # +order+     :: column(s) for ORDER BY SQL clause
     # +limit+     :: number of records to return (for LIMIT SQL clause)
-    # +offset+    :: number of records to skip (for LIMIT SQL clause)
+    # +offset+    :: number of records to skip (for OFFSET SQL clause)
     #
     def near_scope_options(latitude, longitude, radius = 20, options = {})
       if ActiveRecord::Base.connection.adapter_name == "SQLite"
@@ -81,15 +81,13 @@ module Geocoder
         "COS(#{lat_attr} * PI() / 180) * " +
         "POWER(SIN((#{longitude} - #{lon_attr}) * " +
         "PI() / 180 / 2), 2) ))"
-      {
+      default_near_scope_options(latitude, longitude, radius, options).merge(
         :select => "*, #{distance} AS distance",
         :conditions => \
           ["#{lat_attr} BETWEEN ? AND ? AND #{lon_attr} BETWEEN ? AND ?"] +
           coordinate_bounds(latitude, longitude, radius),
-        :having => "#{distance} <= #{radius}",
-        :order  => options[:order],
-        :limit  => limit_clause(options)
-      }
+        :having => "#{distance} <= #{radius}"
+      )
     end
 
     ##
@@ -101,12 +99,21 @@ module Geocoder
     def approx_near_scope_options(latitude, longitude, radius, options)
       lat_attr = geocoder_options[:latitude]
       lon_attr = geocoder_options[:longitude]
-      {
+      default_near_scope_options(latitude, longitude, radius, options).merge(
         :conditions => \
           ["#{lat_attr} BETWEEN ? AND ? AND #{lon_attr} BETWEEN ? AND ?"] +
-          coordinate_bounds(latitude, longitude, radius),
+          coordinate_bounds(latitude, longitude, radius)
+      )
+    end
+    
+    ##
+    # Options used for any near-like scope.
+    #
+    def default_near_scope_options(latitude, longitude, radius, options)
+      {
         :order  => options[:order],
-        :limit  => limit_clause(options)
+        :limit  => options[:limit],
+        :offset => options[:offset]
       }
     end
     
@@ -125,16 +132,6 @@ module Geocoder
         longitude + (radius / factor)
       ]
     end
-    
-    ##
-    # Build the limit clause for a query based on the same options hash
-    # passed to the x_near_scope_options methods.
-    #
-    def limit_clause(options)
-      if options[:limit] or options[:offset]
-        "#{options[:offset].to_i},#{options[:limit].to_i}"
-      end
-    end
   end
 
   ##
@@ -335,7 +332,11 @@ module Geocoder
   # Name of the ActiveRecord scope method.
   #
   def self.scope_method_name
-    Rails.version.starts_with?("3") ? :scope : :named_scope
+    begin
+      Rails.version.starts_with?("3") ? :scope : :named_scope
+    rescue NameError
+      :named_scope
+    end
   end
 end
 

data/rails-geocoder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-geocoder}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Reisner"]
-  s.date = %q{2010-05-04}
+  s.date = %q{2010-06-03}
   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 = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Alex Reisner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 -04:00
+date: 2010-06-03 00:00:00 -04:00
 default_executable: 
 dependencies: []