Merge pull request #798 from TrangPham/master

Force specfify ip_lookup on search, even when ip_address? fails

lib/geocoder/query.rb

@@ -32,7 +32,7 @@ module Geocoder
     # appropriate to the Query text.
     #
     def lookup
-      if ip_address?
+      if options[:ip_address] || ip_address?
         name = options[:ip_lookup] || Configuration.ip_lookup || Geocoder::Lookup.ip_services.first
       else
         name = options[:lookup] || Configuration.lookup || Geocoder::Lookup.street_services.first

test/unit/query_test.rb

@@ -49,4 +49,17 @@ class QueryTest < GeocoderTestCase
     query = Geocoder::Query.new("address", :lookup => :nominatim)
     assert_equal Geocoder::Lookup::Nominatim, query.lookup.class
   end
+
+  def test_force_specify_ip_address
+    Geocoder.configure({:ip_lookup => :google})
+    query = Geocoder::Query.new("address", {:ip_address => true})
+    assert !query.ip_address?
+    assert_equal Geocoder::Lookup::Google, query.lookup.class
+  end
+
+  def test_force_specify_ip_address_with_ip_lookup
+    query = Geocoder::Query.new("address", {:ip_address => true, :ip_lookup => :google})
+    assert !query.ip_address?
+    assert_equal Geocoder::Lookup::Google, query.lookup.class
+  end
 end