Skip to content
Snippets Groups Projects
Commit a48e5f17 authored by James McCarthy's avatar James McCarthy
Browse files

Simplified Gecoder#get_lookup and removed use of eval in Geocoder#spawn_lookup.


Signed-off-by: default avatarJames McCarthy <james2mccarthy@gmail.com>
parent 89d02171
No related branches found
No related tags found
No related merge requests found
...@@ -91,12 +91,8 @@ module Geocoder ...@@ -91,12 +91,8 @@ module Geocoder
# Retrieve a Lookup object from the store. # Retrieve a Lookup object from the store.
# #
def get_lookup(name) def get_lookup(name)
unless defined?(@lookups) @lookups = {} unless defined?(@lookups)
@lookups = {} @lookups[name] = spawn_lookup(name) unless @lookups.include?(name)
end
unless @lookups.include?(name)
@lookups[name] = spawn_lookup(name)
end
@lookups[name] @lookups[name]
end end
...@@ -108,9 +104,9 @@ module Geocoder ...@@ -108,9 +104,9 @@ module Geocoder
name = name.to_s name = name.to_s
require "geocoder/lookups/#{name}" require "geocoder/lookups/#{name}"
klass = name.split("_").map{ |i| i[0...1].upcase + i[1..-1] }.join klass = name.split("_").map{ |i| i[0...1].upcase + i[1..-1] }.join
eval("Geocoder::Lookup::#{klass}.new") Geocoder::Lookup.const_get(klass).new
else else
valids = valid_lookups.map{ |l| ":#{l}" }.join(", ") valids = valid_lookups.join(", ")
raise ConfigurationError, "Please specify a valid lookup for Geocoder " + raise ConfigurationError, "Please specify a valid lookup for Geocoder " +
"(#{name.inspect} is not one of: #{valids})." "(#{name.inspect} is not one of: #{valids})."
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment