Merge branch 'master' of github.com:alexreisner/geocoder

CHANGELOG.rdoc

@@ -2,11 +2,16 @@
 
 Per-release changes to Geocoder.
 
+== 1.0.4 (2011 Sep 18)
+
+* Remove klass method from rake task, which could conflict with app methods (thanks github.com/mguterl).
+
 == 1.0.3 (2011 Sep 17)
 
-* Fix: rake assets:precompile (Rails 3.1) not working in some situations.
+* Add support for Google Premier geocoding service (thanks github.com/steveh).
 * Update Google API URL (thanks github.com/soorajb).
 * Allow rescue from timeout with FreeGeoIP (thanks github.com/lukeledet).
+* Fix: rake assets:precompile (Rails 3.1) not working in some situations.
 * Fix: stop double-adjusting units when using kilometers (thanks github.com/hairyheron).
 
 == 1.0.2 (2011 June 25)

lib/geocoder/version.rb

 module Geocoder
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

lib/tasks/geocoder.rake

-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
+    class_name = ENV['CLASS'] || ENV['class']
+    raise "Please specify a CLASS (model)" unless class_name
+    klass = Object.const_get(class_name)
+
     klass.not_geocoded.each do |obj|
       obj.geocode; obj.save
     end