rails-geocoder 0.8.3 → 0.8.4

data/CHANGELOG.rdoc

@@ -2,6 +2,10 @@
 
 Per-release changes to Geocoder.
 
+== 0.8.4 (2009 Oct 23)
+
+* Deprecate <tt>find_near</tt> class method in favor of +near+ named scope.
+
 == 0.8.3 (2009 Oct 23)
 
 * Update Google URL query string parameter to reflect recent changes in Google's API.

data/README.rdoc

@@ -44,22 +44,22 @@ If your model has +address+, +city+, +state+, and +country+ attributes your +loc
 
 == 3. Use
 
-Assuming +Venue+ is a geocoded model:
+Assuming +Venue+ is a geocoded model, it has the following named scopes:
 
-  Venue.find_near('Omaha, NE, US', 20)  # venues within 20 miles of Omaha
-  Venue.find_near([40.71, 100.23], 20)  # venues within 20 miles of a point
-  Venue.geocoded                        # venues with coordinates
-  Venue.not_geocoded                    # venues without coordinates
+  Venue.near('Omaha, NE, US', 20)    # venues within 20 miles of Omaha
+  Venue.near([40.71, 100.23], 20)    # venues within 20 miles of a point
+  Venue.geocoded                     # venues with coordinates
+  Venue.not_geocoded                 # venues without coordinates
 
 Assuming +obj+ has a valid string for its +location+:
 
-  obj.fetch_coordinates                 # returns coordinates [lat, lon]
-  obj.fetch_coordinates!                # also writes coordinates to object
+  obj.fetch_coordinates              # returns coordinates [lat, lon]
+  obj.fetch_coordinates!             # also writes coordinates to object
 
 Assuming +obj+ is geocoded (has latitude and longitude):
 
-  obj.nearbys(30)                       # other objects within 30 miles
-  obj.distance_to(40.714, -100.234)     # distance to arbitrary point
+  obj.nearbys(30)                    # other objects within 30 miles
+  obj.distance_to(40.714, -100.234)  # distance to arbitrary point
 
 Some utility methods are also available:
 

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/lib/geocoder.rb

@@ -11,15 +11,30 @@ module Geocoder
     base.class_eval do
 
       # named scope: geocoded objects
-	    named_scope :geocoded,
-	      :conditions => "#{geocoder_options[:latitude]} IS NOT NULL " +
-	        "AND #{geocoder_options[:longitude]} IS NOT NULL"
+      named_scope :geocoded,
+        :conditions => "#{geocoder_options[:latitude]} IS NOT NULL " +
+          "AND #{geocoder_options[:longitude]} IS NOT NULL"
 
       # named scope: not-geocoded objects
-	    named_scope :not_geocoded,
-	      :conditions => "#{geocoder_options[:latitude]} IS NULL " +
-	        "OR #{geocoder_options[:longitude]} IS NULL"
-	  end
+      named_scope :not_geocoded,
+        :conditions => "#{geocoder_options[:latitude]} IS NULL " +
+          "OR #{geocoder_options[:longitude]} IS NULL"
+      
+      ##
+      # Find all objects within a radius (in miles) of the given location
+      # (address string). Location (the first argument) may be either a string
+      # to geocode or an array of coordinates (<tt>[lat,long]</tt>).
+      #
+      named_scope :near, lambda{ |location, *args|
+        latitude, longitude = location.is_a?(Array) ?
+          location : Geocoder.fetch_coordinates(location)
+        if latitude and longitude
+          find_near_options(latitude, longitude, *args)
+        else
+          {}
+        end
+      }
+    end
   end
     
   ##
@@ -28,15 +43,12 @@ module Geocoder
   module ClassMethods
 
     ##
-    # Find all objects within a radius (in miles) of the given location
-    # (address string). Location (the first argument) may be either a string
-    # to geocode or an array of coordinates (<tt>[lat,long]</tt>).
+    # DEPRECATED: Please use the +near+ method/named scope instead.
     #
     def find_near(location, radius = 20, options = {})
-      latitude, longitude = location.is_a?(Array) ?
-        location : Geocoder.fetch_coordinates(location)
-      return [] unless (latitude and longitude)
-      all(find_near_options(latitude, longitude, radius, options))
+      warn "Geocoder deprecation warning: the 'find_near' class method is " +
+        "deprecated, please use the 'near' method, which is a named scope."
+      near(location, radius, options)
     end
     
     ##

data/rails-geocoder.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-geocoder}
-  s.version = "0.8.3"
+  s.version = "0.8.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Reisner"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails-geocoder
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Alex Reisner