Allow esri token to be set at call time

lib/geocoder/lookups/esri.rb

@@ -40,7 +40,9 @@ module Geocoder::Lookup
       else
         params[:text] = query.sanitized_text
       end
-      params[:token] = token
+
+      params[:token] = token(query)
+
       if for_storage_value = for_storage(query)
         params[:forStorage] = for_storage_value
       end
@@ -56,25 +58,38 @@ module Geocoder::Lookup
       end
     end
 
-    def token
-      create_and_save_token! if !valid_token_configured? and configuration.api_key
-      configuration[:token].to_s unless configuration[:token].nil?
+    def token(query)
+      token_instance = if query.options[:token]
+                         query.options[:token]
+                       else
+                         configuration[:token]
+                       end
+
+      if !valid_token_configured?(token_instance) && configuration.api_key
+        token_instance = create_and_save_token!(query)
+      end
+
+      token_instance.to_s unless token_instance.nil?
     end
 
-    def valid_token_configured?
-      !configuration[:token].nil? and configuration[:token].active?
+    def valid_token_configured?(token_instance)
+      !token_instance.nil? && token_instance.active?
     end
 
-    def create_and_save_token!
-      save_token!(create_token)
+    def create_and_save_token!(query)
+      token_instance = create_token
+
+      if query.options[:token]
+        query.options[:token] = token_instance
+      else
+        Geocoder.merge_into_lookup_config(:esri, token: token_instance)
+      end
+
+      token_instance
     end
 
     def create_token
       Geocoder::EsriToken.generate_token(*configuration.api_key)
     end
-
-    def save_token!(token_instance)
-      Geocoder.merge_into_lookup_config(:esri, token: token_instance)
-    end
   end
 end

test/unit/lookups/esri_test.rb

@@ -34,6 +34,24 @@ class EsriTest < GeocoderTestCase
     assert_match %r{token=xxxxx}, url
   end
 
+  def test_token_from_options
+    options_token = Geocoder::EsriToken.new('options_token', Time.now + 60*60*24)
+    query = Geocoder::Query.new("Bluffton, SC", token: options_token)
+    lookup = Geocoder::Lookup.get(:esri)
+    url = lookup.query_url(query)
+    assert_match %r{token=options_token}, url
+  end
+
+  def test_token_from_options_overrides_configuration
+    config_token = Geocoder::EsriToken.new('config_token', Time.now + 60*60*24)
+    options_token = Geocoder::EsriToken.new('options_token', Time.now + 60*60*24)
+    Geocoder.configure(esri: { token: config_token })
+    query = Geocoder::Query.new("Bluffton, SC", token: options_token)
+    lookup = Geocoder::Lookup.get(:esri)
+    url = lookup.query_url(query)
+    assert_match %r{token=options_token}, url
+  end
+
   def test_query_for_geocode_with_config_for_storage_false
     Geocoder.configure(esri: {for_storage: false})