Use Faraday in place of Net::HTTP so we can mock responses

[rails.git] / app / controllers / geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index e889228f3de8f5f6f2f778463ec0a329b554e5d9..5a59c9eeb159761486c93b14e5913530ac61acbf 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -3,12 +3,11 @@
 class GeocoderController < ApplicationController
   require "cgi"
   require "uri"
-  require "net/http"
   require "rexml/document"
 
-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :require_oauth, :only => [:search]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :require_oauth, :only => [:search]
 
   def search
     normalize_params
@@ -287,7 +286,7 @@ class GeocoderController < ApplicationController
   private
 
   def fetch_text(url)
-    Net::HTTP.get(URI.parse(url))
+    OSM.http_client.get(URI.parse(url)).body
   end
 
   def fetch_xml(url)