From 0609b275fd35b9c1942177fc7f0f868ee9488ed6 Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Fri, 21 Dec 2012 16:14:30 -0500
Subject: [PATCH] Also accept Google components as a string.
---
lib/geocoder/lookups/google.rb | 2 +-
test/services_test.rb | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/lib/geocoder/lookups/google.rb b/lib/geocoder/lookups/google.rb
index 6ed7fa62..5f5e8fe6 100644
--- a/lib/geocoder/lookups/google.rb
+++ b/lib/geocoder/lookups/google.rb
@@ -44,7 +44,7 @@ module Geocoder::Lookup
params[:region] = region
end
unless (components = query.options[:components]).nil?
- params[:components] = components.join("|")
+ params[:components] = components.is_a?(Array) ? components.join("|") : components
end
params
end
diff --git a/test/services_test.rb b/test/services_test.rb
index 6f2a86dd..2f537b6f 100644
--- a/test/services_test.rb
+++ b/test/services_test.rb
@@ -65,7 +65,17 @@ class ServicesTest < Test::Unit::TestCase
assert_match /region=gb/, url
end
- def test_google_query_url_contains_properly_formatted_components
+ def test_google_query_url_contains_components_when_given_as_string
+ lookup = Geocoder::Lookup::Google.new
+ url = lookup.send(:query_url, Geocoder::Query.new(
+ "Some Intersection",
+ :components => "locality:ES"
+ ))
+ formatted = "components=" + CGI.escape("locality:ES")
+ assert url.include?(formatted), "Expected #{formatted} to be included in #{url}"
+ end
+
+ def test_google_query_url_contains_components_when_given_as_array
lookup = Geocoder::Lookup::Google.new
url = lookup.send(:query_url, Geocoder::Query.new(
"Some Intersection",
--
GitLab