From b637884be59d19f8056e00d3c5958204084cd639 Mon Sep 17 00:00:00 2001
From: Justin Love <git@JustinLove.name>
Date: Tue, 3 Jan 2012 10:55:24 -0600
Subject: [PATCH] ensure all do_lookup blocks have empty list protection
---
lib/geocoder/stores/active_record.rb | 9 +++++----
lib/geocoder/stores/mongo_base.rb | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
index b459cd96..344979e9 100644
--- a/lib/geocoder/stores/active_record.rb
+++ b/lib/geocoder/stores/active_record.rb
@@ -266,11 +266,12 @@ module Geocoder::Store
#
def reverse_geocode
do_lookup(true) do |o,rs|
- r = rs.first
- unless r.address.nil?
- o.send :write_attribute, self.class.geocoder_options[:fetched_address], r.address
+ if r = rs.first
+ unless r.address.nil?
+ o.send :write_attribute, self.class.geocoder_options[:fetched_address], r.address
+ end
+ r.address
end
- r.address
end
end
diff --git a/lib/geocoder/stores/mongo_base.rb b/lib/geocoder/stores/mongo_base.rb
index fa848014..29054e48 100644
--- a/lib/geocoder/stores/mongo_base.rb
+++ b/lib/geocoder/stores/mongo_base.rb
@@ -71,11 +71,12 @@ module Geocoder::Store
#
def reverse_geocode
do_lookup(true) do |o,rs|
- r = rs.first
- unless r.address.nil?
- o.send :write_attribute, self.class.geocoder_options[:fetched_address], r.address
+ if r = rs.first
+ unless r.address.nil?
+ o.send :write_attribute, self.class.geocoder_options[:fetched_address], r.address
+ end
+ r.address
end
- r.address
end
end
end
--
GitLab