Merge pull request #214 from Empact/method-rescue

Move to method-level rescue where appropriate

lib/geocoder/lookups/base.rb

@@ -106,7 +106,6 @@ 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."
@@ -114,13 +113,11 @@ module Geocoder
         raise_error(err) or warn "Geocoding API not responding fast enough " +
           "(see Geocoder::Configuration.timeout to set limit)."
       end
-      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
@@ -129,7 +126,6 @@ module Geocoder
       rescue
         warn "Geocoding API's response was not valid JSON."
       end
-      end
 
       ##
       # Protocol to use for communication with geocoding services.

lib/geocoder/models/mongo_base.rb

@@ -44,7 +44,6 @@ module Geocoder
       end
 
       def geocoder_initialized?
-        begin
         included_modules.include? Geocoder::Store.const_get(geocoder_module_name)
       rescue NameError
         false
@@ -52,4 +51,3 @@ module Geocoder
     end
   end
 end
-end