From a1db1b8d85281e1e801b4015d2fe83f5716d6539 Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Sun, 22 Apr 2012 10:36:50 -0400
Subject: [PATCH] Rename configuration option.
Change :request_headers to :http_headers (for consistency).
---
lib/geocoder/configuration.rb | 4 ++--
lib/geocoder/lookups/base.rb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/geocoder/configuration.rb b/lib/geocoder/configuration.rb
index 0535a0b6..b0d4d6a5 100644
--- a/lib/geocoder/configuration.rb
+++ b/lib/geocoder/configuration.rb
@@ -48,7 +48,7 @@ module Geocoder
:timeout,
:lookup,
:language,
- :request_headers,
+ :http_headers,
:use_https,
:http_proxy,
:https_proxy,
@@ -71,7 +71,7 @@ module Geocoder
@timeout = 3 # geocoding service timeout (secs)
@lookup = :google # name of geocoding service (symbol)
@language = :en # ISO-639 language code
- @request_headers = {} # HTTP headers for lookup
+ @http_headers = {} # HTTP headers for lookup
@use_https = false # use HTTPS for lookup requests? (if supported)
@http_proxy = nil # HTTP proxy server (user:pass@host:port)
@https_proxy = nil # HTTPS proxy server (user:pass@host:port)
diff --git a/lib/geocoder/lookups/base.rb b/lib/geocoder/lookups/base.rb
index 8e58c451..5fa89ff7 100644
--- a/lib/geocoder/lookups/base.rb
+++ b/lib/geocoder/lookups/base.rb
@@ -149,7 +149,7 @@ module Geocoder
unless cache and body = cache[url]
client = http_client.new(uri.host, uri.port)
client.use_ssl = true if Geocoder::Configuration.use_https
- response = client.get(uri.request_uri, Geocoder::Configuration.request_headers)
+ response = client.get(uri.request_uri, Geocoder::Configuration.http_headers)
body = response.body
if cache and (200..399).include?(response.code.to_i)
cache[url] = body
--
GitLab