From b082bccdea154b880d2c471c602e9709c1482414 Mon Sep 17 00:00:00 2001
From: robdiciuccio <rob@definitionstudio.com>
Date: Mon, 25 Feb 2013 16:00:40 -0800
Subject: [PATCH] Geocoder::Lookup "cache" method now public; Geocoder.cache
method calls cache method instead of configuration key.
---
lib/geocoder.rb | 2 +-
lib/geocoder/lookups/base.rb | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/geocoder.rb b/lib/geocoder.rb
index b3bae2bf..53e9860b 100644
--- a/lib/geocoder.rb
+++ b/lib/geocoder.rb
@@ -44,7 +44,7 @@ module Geocoder
#
def cache
warn "WARNING: Calling Geocoder.cache is DEPRECATED. The #cache method now belongs to the Geocoder::Lookup object."
- Geocoder::Lookup.get(Geocoder.config.lookup).send(:configuration).cache
+ Geocoder::Lookup.get(Geocoder.config.lookup).cache
end
end
diff --git a/lib/geocoder/lookups/base.rb b/lib/geocoder/lookups/base.rb
index 4120fc70..28ad577b 100644
--- a/lib/geocoder/lookups/base.rb
+++ b/lib/geocoder/lookups/base.rb
@@ -72,6 +72,16 @@ module Geocoder
def query_url(query)
fail
end
+
+ ##
+ # The working Cache object.
+ #
+ def cache
+ if @cache.nil? and store = configuration.cache
+ @cache = Cache.new(store, configuration.cache_prefix)
+ end
+ @cache
+ end
private # -------------------------------------------------------------
@@ -225,16 +235,6 @@ module Geocoder
end
end
- ##
- # The working Cache object.
- #
- def cache
- if @cache.nil? and store = configuration.cache
- @cache = Cache.new(store, configuration.cache_prefix)
- end
- @cache
- end
-
##
# Simulate ActiveSupport's Object#to_query.
# Removes any keys with nil value.
--
GitLab