Make User#address_for_geocoding safe for blank addresses. [#2 state:r…

…esolved]

app/models/user.rb

@@ -33,7 +33,7 @@ def admin?
   end
 
   def country
-    return self.state.country
+    return self.state.nil? ? nil : self.state.country
   end
 
   def to_s

lib/geocoding_utilities.rb

@@ -1,7 +1,9 @@
 module GeocodingUtilities
   # Returns the current object's address in a form suitable for feeding to a geocoder (perhaps through coords_from_string).
   def address_for_geocoding
-    "#{street}, #{city}, #{state.code}, #{zip}, #{country.code}"
+    state_code = state.nil? ? nil : state.code
+    country_code = country.nil? ? nil : country.code
+    "#{street}, #{city}, #{state_code}, #{zip}, #{country_code}"
   end
 
   # Sends the address contained in _string_ to a geocoder, and returns a #Point object with the resulting coordinates.

spec/models/user_spec.rb

@@ -172,6 +172,15 @@
     @user.should_not_receive(:save)
     @user.coords
   end
+
+  it "should provide a valid string for address_for_geocoding, even if the user's address is invalid" do
+    lambda {@user.address_for_geocoding}.should_not raise_error
+    @user.address_for_geocoding.should be_a_kind_of(String)
+    @blank = User.new # invalid address, since it's blank!
+    lambda {@blank.address_for_geocoding}.should_not raise_error
+    @blank.address_for_geocoding.should be_a_kind_of(String)
+    @blank.address_for_geocoding.should =~ /^[\s,]*$/ # just spaces and commas
+  end
 end
 
 describe User, "(authentication structure)" do