Merge branch 'yandex_fix' of git://github.com/twonegatives/geocoder into pr/587

Conflicts:
	test/result_test.rb

lib/geocoder/results/yandex.rb

@@ -75,7 +75,7 @@ module Geocoder::Result
 
     def sub_state_city
       if !sub_state.empty? and address_details['AdministrativeArea']['SubAdministrativeArea'].has_key? 'Locality'
-        address_details['AdministrativeArea']['SubAdministrativeArea']['Locality']['LocalityName']
+        address_details['AdministrativeArea']['SubAdministrativeArea']['Locality']['LocalityName'] || ""
       else
         ""
       end

test/result_test.rb

@@ -40,6 +40,16 @@ class ResultTest < Test::Unit::TestCase
     end
   end
 
+  def test_yandex_result_without_locality_name
+    assert_nothing_raised do
+      Geocoder.configure(:lookup => :yandex)
+      set_api_key!(:yandex)
+      house_selector = Proc.new{|i| i.data['GeoObject']['metaDataProperty']['GeocoderMetaData']['kind'] == 'house'}
+      result = Geocoder.search("canada rue dupuis 14").select(&house_selector).last
+      assert_equal "", result.city
+    end
+  end
+
   private # ------------------------------------------------------------------
 
   def assert_result_has_required_attributes(result)