Merge pull request geokit#234 from rafaelpetry/master

Escape special characters in Google API components filter
wyattisimo · Oct 15, 2019 · 3ee032d · 3ee032d
2 parents 4773681 + 8ea2646
commit 3ee032d
Show file tree

Hide file tree

Showing 3 changed files with 138 additions and 2 deletions.
diff --git a/fixtures/vcr_cassettes/test_component_filtering_with_special_characters.yml b/fixtures/vcr_cassettes/test_component_filtering_with_special_characters.yml
diff --git a/lib/geokit/geocoders/google.rb b/lib/geokit/geocoders/google.rb
@@ -108,7 +108,8 @@ def self.construct_bias_string_from_options(bias)
 
       def self.construct_components_string_from_options(components={})
         unless components.empty?
-          "&components=#{components.to_a.map { |pair| pair.join(':').downcase }.join(CGI.escape('|'))}"
+          escaped_components = Geokit::Inflector.url_escape(components.to_a.map { |pair| pair.join(":").downcase }.join("|"))
+          "&components=#{escaped_components}"
         end
       end
 

diff --git a/test/test_google_geocoder.rb b/test/test_google_geocoder.rb
@@ -353,7 +353,7 @@ def test_component_filtering
     assert_equal 'TX', filtered_result.state
     assert_equal 'Austin, TX, USA', filtered_result.full_address
 
-    url = 'https://maps.google.com/maps/api/geocode/json?sensor=false&address=austin&components=administrative_area:il%7Ccountry:us'
+    url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=austin&components=administrative_area%3Ail%7Ccountry%3Aus"
     TestHelper.expects(:last_url).with(url)
     filtered_result = geocode('austin',
       :test_component_filtering_on,
@@ -368,5 +368,14 @@ def test_component_filtering
 
     assert_equal 'TX', filtered_result.state
     assert_equal 'Austin, TX, USA', filtered_result.full_address
+
+    url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=S%C3%A3o+Paulo&components=administrative_area%3As%C3%A3o+paulo%7Ccountry%3Abr"
+    TestHelper.expects(:last_url).with(url)
+    filtered_result = geocode("São Paulo",
+      :test_component_filtering_with_special_characters,
+      components: { administrative_area: "São Paulo", country: "BR" })
+
+    assert_equal "SP", filtered_result.state
+    assert_equal "São Paulo, State of São Paulo, Brazil", filtered_result.full_address
   end
 end