From 76c8b13dbb2bb72b100087a5c5a6e7cd35b8efa5 Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Thu, 17 Mar 2011 22:48:36 -0400
Subject: [PATCH] Refactor: define config methods dynamically.
---
lib/geocoder/configuration.rb | 82 ++++++++++++++++++-----------------
test/geocoder_test.rb | 12 +++--
2 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/lib/geocoder/configuration.rb b/lib/geocoder/configuration.rb
index 38b3bdfa..e7bc208b 100644
--- a/lib/geocoder/configuration.rb
+++ b/lib/geocoder/configuration.rb
@@ -1,45 +1,49 @@
module Geocoder
class Configuration
- # geocoding service timeout (secs)
- def self.timeout; @@timeout; end
- def self.timeout=(obj); @@timeout = obj; end
-
- # name of geocoding service (symbol)
- def self.lookup; @@lookup; end
- def self.lookup=(obj); @@lookup = obj; end
-
- # ISO-639 language code
- def self.language; @@language; end
- def self.language=(obj); @@language = obj; end
-
- # app id (if using Yahoo geocoding service)
- def self.yahoo_appid; @@yahoo_appid; end
- def self.yahoo_appid=(obj); @@yahoo_appid = obj; end
-
- # API key (if using Google geocoding service)
- def self.google_api_key; @@google_api_key; end
- def self.google_api_key=(obj); @@google_api_key = obj; end
-
- # cache object (must respond to #[], #[]=, and #keys
- def self.cache; @@cache; end
- def self.cache=(obj); @@cache = obj; end
-
- # cache object (must respond to #[], #[]=, and #keys
- def self.cache_prefix; @@cache_prefix; end
- def self.cache_prefix=(obj); @@cache_prefix = obj; end
-
- # use HTTPS for lookup requests? (true or false)
- def self.use_https; @@use_https; end
- def self.use_https=(obj); @@use_https = obj; end
+ def self.options_and_defaults
+ [
+ # geocoding service timeout (secs)
+ [:timeout, 3],
+
+ # name of geocoding service (symbol)
+ [:lookup, :google],
+
+ # ISO-639 language code
+ [:language, :en],
+
+ # use HTTPS for lookup requests? (if supported)
+ [:use_https, false],
+
+ # app id (if using Yahoo geocoding service)
+ [:yahoo_appid, nil],
+
+ # API key (if using Google geocoding service)
+ [:google_api_key, nil],
+
+ # cache object (must respond to #[], #[]=, and #keys)
+ [:cache, nil],
+
+ # prefix (string) to use for all cache keys
+ [:cache_prefix, "geocoder:"]
+ ]
+ end
+
+ # define getters and setters for all configuration settings
+ self.options_and_defaults.each do |o,d|
+ eval("def self.#{o}; @@#{o}; end")
+ eval("def self.#{o}=(obj); @@#{o} = obj; end")
+ end
+
+ ##
+ # Set all values to default.
+ #
+ def self.set_defaults
+ self.options_and_defaults.each do |o,d|
+ self.send("#{o}=", d)
+ end
+ end
end
end
-Geocoder::Configuration.timeout = 3
-Geocoder::Configuration.lookup = :google
-Geocoder::Configuration.language = :en
-Geocoder::Configuration.yahoo_appid = nil
-Geocoder::Configuration.google_api_key = nil
-Geocoder::Configuration.cache = nil
-Geocoder::Configuration.cache_prefix = "geocoder:"
-Geocoder::Configuration.use_https = false
+Geocoder::Configuration.set_defaults
diff --git a/test/geocoder_test.rb b/test/geocoder_test.rb
index 10a45a46..78c7874b 100644
--- a/test/geocoder_test.rb
+++ b/test/geocoder_test.rb
@@ -3,8 +3,7 @@ require 'test_helper'
class GeocoderTest < Test::Unit::TestCase
def setup
- Geocoder::Configuration.lookup = :google
- Geocoder::Configuration.use_https = false
+ Geocoder::Configuration.set_defaults
end
@@ -232,12 +231,11 @@ class GeocoderTest < Test::Unit::TestCase
assert_equal "a=1&b=2", g.send(:hash_to_query, {:a => 1, :b => 2})
end
- def test_has_to_query_with_google_api_key
- Geocoder::Configuration.google_api_key = "MY_KEY"
+ def test_google_api_key
+ Geocoder::Configuration.google_api_key = "MY_KEY"
g = Geocoder::Lookup::Google.new
- assert_match "key=MY_KEY", g.send(:query_url, {:a => 1, :b => 2})
- Geocoder::Configuration.google_api_key = nil
- end
+ assert_match "key=MY_KEY", g.send(:query_url, "Madison Square Garden, New York, NY 10001, United States")
+ end
private # ------------------------------------------------------------------
--
GitLab