From 7b044bc832b3f76b10ff20233e3c5d231f5a2618 Mon Sep 17 00:00:00 2001
From: Tamas Erdos <tamas@tamaserdos.com>
Date: Sun, 10 Apr 2016 02:56:21 -0400
Subject: [PATCH] no longer using global config hash
---
lib/geocoder/configuration.rb | 4 ----
lib/geocoder/lookups/esri.rb | 6 +++---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/lib/geocoder/configuration.rb b/lib/geocoder/configuration.rb
index 7e96e8aa..4128a01e 100644
--- a/lib/geocoder/configuration.rb
+++ b/lib/geocoder/configuration.rb
@@ -57,8 +57,6 @@ module Geocoder
:units,
:distances,
:basic_auth,
- :for_storage,
- :token,
:logger,
:kernel_logger_level
]
@@ -102,8 +100,6 @@ module Geocoder
@data[:cache] = nil # cache object (must respond to #[], #[]=, and #keys)
@data[:cache_prefix] = "geocoder:" # prefix (string) to use for all cache keys
@data[:basic_auth] = {} # user and password for basic auth ({:user => "user", :password => "password"})
- @data[:for_storage] = nil # will the result be stored for non-caching purposes (boolean)
- @data[:token] = nil # token object for authentication
@data[:logger] = :kernel # :kernel or Logger instance
@data[:kernel_logger_level] = ::Logger::WARN # log level, if kernel logger is used
diff --git a/lib/geocoder/lookups/esri.rb b/lib/geocoder/lookups/esri.rb
index 364283b7..122c8c8b 100644
--- a/lib/geocoder/lookups/esri.rb
+++ b/lib/geocoder/lookups/esri.rb
@@ -43,13 +43,13 @@ module Geocoder::Lookup
params[:text] = query.sanitized_text
end
params[:token] = token
- params[:forStorage] = configuration.for_storage if configuration.for_storage
+ params[:forStorage] = configuration[:for_storage] if configuration[:for_storage]
params.merge(super)
end
def token
- if configuration.token && configuration.token.active? # if we have a token, use it
- configuration.token.to_s
+ if configuration[:token] && configuration[:token].active? # if we have a token, use it
+ configuration[:token].to_s
elsif configuration.api_key # generate a new token if we have credentials
token_instance = EsriToken.generate_token(*configuration.api_key)
Geocoder.configure(:esri => {:token => token_instance})
--
GitLab