From 884d5111b58389982e2bc3ed9e1e6784cb005c76 Mon Sep 17 00:00:00 2001
From: Ben Woosley <ben.woosley@gmail.com>
Date: Mon, 9 Apr 2012 13:46:39 -0700
Subject: [PATCH] Move to method-level rescue where appropriate
---
lib/geocoder/lookups/base.rb | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/lib/geocoder/lookups/base.rb b/lib/geocoder/lookups/base.rb
index 62f91207..5dfd3569 100644
--- a/lib/geocoder/lookups/base.rb
+++ b/lib/geocoder/lookups/base.rb
@@ -106,29 +106,25 @@ module Geocoder
# Returns a parsed search result (Ruby hash).
#
def fetch_data(query, reverse = false)
- begin
- parse_raw_data fetch_raw_data(query, reverse)
- rescue SocketError => err
- raise_error(err) or warn "Geocoding API connection cannot be established."
- rescue TimeoutError => err
- raise_error(err) or warn "Geocoding API not responding fast enough " +
- "(see Geocoder::Configuration.timeout to set limit)."
- end
+ parse_raw_data fetch_raw_data(query, reverse)
+ rescue SocketError => err
+ raise_error(err) or warn "Geocoding API connection cannot be established."
+ rescue TimeoutError => err
+ raise_error(err) or warn "Geocoding API not responding fast enough " +
+ "(see Geocoder::Configuration.timeout to set limit)."
end
##
# Parses a raw search result (returns hash or array).
#
def parse_raw_data(raw_data)
- begin
- if defined?(ActiveSupport::JSON)
- ActiveSupport::JSON.decode(raw_data)
- else
- JSON.parse(raw_data)
- end
- rescue
- warn "Geocoding API's response was not valid JSON."
+ if defined?(ActiveSupport::JSON)
+ ActiveSupport::JSON.decode(raw_data)
+ else
+ JSON.parse(raw_data)
end
+ rescue
+ warn "Geocoding API's response was not valid JSON."
end
##
--
GitLab