.gitignore @@ -1,3 +1,6 @@ +0.2.1 - 2008-8-8 +* Results are now WillPaginate compatible + 0.2.0 - 2007-10-27 * Added validates_as_geocodable (Mark Van Holstyn) * Allow address mapping to be a single field (Mark Van Holstyn) CHANGELOG @@ -91,7 +91,20 @@ module CollectiveIdea #:nodoc: end end - # Acts like find(), except doesn't add the distance alias to the select + # Extends ActiveRecord's count method to be geo-aware. + # + # Model.count(:within => 10, :origin => "Chicago, IL") + # + # == Options + # + # * <tt>:origin</tt>: A Geocode, String, or geocodable model that specifies + # the origin + # * <tt>:within</tt>: Limit to results within this radius of the origin + # * <tt>:beyond</tt>: Limit to results outside of this radius from the origin + # * <tt>:units</tt>: Units to use for <tt>:within</tt> or <tt>:beyond</tt>. + # Default is <tt>:miles</tt> unless specified otherwise in the +acts_as_geocodable+ + # declaration. + # def count(*args) options = args.extract_options! origin = location_to_geocode options.delete(:origin) lib/acts_as_geocodable.rb @@ -247,8 +247,8 @@ class ActsAsGeocodableTest < Test::Unit::TestCase end def test_count_within - spots = Vacation.count(:all, :origin => "49406", :within => 3) - assert_equal 1, spots + spots_count = Vacation.count(:origin => "49406", :within => 3) + assert_equal 1, spots_count end def test_within_kilometers @@ -263,6 +263,11 @@ class ActsAsGeocodableTest < Test::Unit::TestCase assert_equal vacations(:whitehouse), spots.first end + def test_count_beyond + spots = Vacation.count(:origin => "49406", :beyond => 3) + assert_equal 1, spots + end + def test_find_beyond_in_kilometers whitehouse = Vacation.find(:first, :beyond => 3, :units => :kilometers, :origin => "49406") assert_equal vacations(:whitehouse), whitehouse test/acts_as_geocodable_test.rb 23874f7b5c13390aff2bca30daf07f56f55b83f7 Andrew Donaldson andrew@tictocfamily.com http://github.com/collectiveidea/acts_as_geocodable/commit/6d9cbe020031defdd57f8d24de657199486f90a5 6d9cbe020031defdd57f8d24de657199486f90a5 2008-08-08T01:50:51-07:00 2008-08-08T01:50:51-07:00 Added further documentation and tests - Added CHANGELOG entry (requires correct version set) - Added documentation to the acts_as_geocodable #count method - Added another test to cover :beyond calls - Added .gitignore for debug.log c86c8fa33ac1d3989aba2e1afe7fdfaa9f7e5234 Andrew Donaldson andrew@tictocfamily.com