Permalink
Browse files

Reduce code duplication.

  • Loading branch information...
1 parent 9564097 commit 5699eeb5d751b94e2a86d375d5867cedae365d94 @alexreisner alexreisner committed Feb 24, 2014
Showing with 6 additions and 4 deletions.
  1. +6 −4 lib/geocoder/lookups/maxmind_local.rb
View
10 lib/geocoder/lookups/maxmind_local.rb
@@ -6,9 +6,10 @@ class MaxmindLocal < Base
def initialize
begin
- require (RUBY_PLATFORM == 'java' ? 'jgeoip' : 'geoip')
+ gem = RUBY_PLATFORM == 'java' ? 'jgeoip' : 'geoip'
+ require gem
rescue LoadError => e
- raise 'Could not load geoip dependency. To use MaxMind Local lookup you must add geoip gem to your Gemfile or have it installed in your system.'
+ raise 'Could not load geoip dependency. To use MaxMind Local lookup you must add the #{gem} gem to your Gemfile or have it installed in your system.'
end
super
end
@@ -31,8 +32,9 @@ def results(query)
"Geocoder.configure(:maxmind_local => {:database => ...}), "
)
end
- result = (RUBY_PLATFORM == "java" ? JGeoIP.new(configuration[:database]).city(query.to_s) : GeoIP.new(configuration[:database]).city(query.to_s))
+ geoip_class = RUBY_PLATFORM == "java" ? JGeoIP : GeoIP
+ result = geoip_class.new(configuration[:database]).city(query.to_s)
result.nil? ? [] : [result.to_hash]
end
end
-end
+end

0 comments on commit 5699eeb

Please sign in to comment.