From 6f4005785625e1ba9337e743c3e1a6da902656e8 Mon Sep 17 00:00:00 2001
From: James McCarthy <james2mccarthy@gmail.com>
Date: Thu, 21 Jul 2011 16:21:45 +0100
Subject: [PATCH] Removed use of eval in Geocoder::Models.
Signed-off-by: James McCarthy <james2mccarthy@gmail.com>
---
lib/geocoder/models/base.rb | 2 +-
lib/geocoder/models/mongo_base.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/geocoder/models/base.rb b/lib/geocoder/models/base.rb
index 1e944264..83623316 100644
--- a/lib/geocoder/models/base.rb
+++ b/lib/geocoder/models/base.rb
@@ -31,7 +31,7 @@ module Geocoder
unless @geocoder_options
@geocoder_options = {}
require "geocoder/stores/#{geocoder_file_name}"
- include eval("Geocoder::Store::" + geocoder_module_name)
+ include Geocoder::Store.const_get(geocoder_module_name)
end
@geocoder_options.merge! options
end
diff --git a/lib/geocoder/models/mongo_base.rb b/lib/geocoder/models/mongo_base.rb
index 393e007f..15bbbabe 100644
--- a/lib/geocoder/models/mongo_base.rb
+++ b/lib/geocoder/models/mongo_base.rb
@@ -38,14 +38,14 @@ module Geocoder
unless geocoder_initialized?
@geocoder_options = {}
require "geocoder/stores/#{geocoder_file_name}"
- include eval("Geocoder::Store::" + geocoder_module_name)
+ include Geocoder::Store.const_get(geocoder_module_name)
end
@geocoder_options.merge! options
end
def geocoder_initialized?
begin
- included_modules.include? eval("Geocoder::Store::" + geocoder_module_name)
+ included_modules.include? Geocoder::Store.const_get(geocoder_module_name)
rescue NameError
false
end
--
GitLab