lib/addressfinder.rb in addressfinder-1.5.2 vs lib/addressfinder.rb in addressfinder-1.6.0

@@ -1,6 +1,5 @@
-require 'net/http'
 require 'multi_json'
 require 'addressfinder/version'
 require 'addressfinder/configuration'
 require 'addressfinder/cleanse'
 require 'addressfinder/location_info'
@@ -8,10 +7,11 @@
 require 'addressfinder/address_info'
 require 'addressfinder/address_search'
 require 'addressfinder/bulk'
 require 'addressfinder/errors'
 require 'addressfinder/util'
+require 'addressfinder/http'
 
 module AddressFinder
   class << self
     def configure(config_hash=nil)
       if config_hash
@@ -26,43 +26,29 @@
     def configuration
       @configuration ||= AddressFinder::Configuration.new
     end
 
     def cleanse(args={})
-      AddressFinder::Cleanse.new(args.merge(http: configure_http)).perform.result
+      AddressFinder::Cleanse.new(args.merge(http: AddressFinder::HTTP.new(configuration))).perform.result
     end
 
     def location_search(args={})
-      AddressFinder::LocationSearch.new(params: args, http: configure_http).perform.results
+      AddressFinder::LocationSearch.new(params: args, http: AddressFinder::HTTP.new(configuration)).perform.results
     end
 
     def location_info(args={})
-      AddressFinder::LocationInfo.new(params: args, http: configure_http).perform.result
+      AddressFinder::LocationInfo.new(params: args, http: AddressFinder::HTTP.new(configuration)).perform.result
     end
 
     def address_search(args={})
-      AddressFinder::AddressSearch.new(params: args, http: configure_http).perform.results
+      AddressFinder::AddressSearch.new(params: args, http: AddressFinder::HTTP.new(configuration)).perform.results
     end
 
     def address_info(args={})
-      AddressFinder::AddressInfo.new(params: args, http: configure_http).perform.result
+      AddressFinder::AddressInfo.new(params: args, http: AddressFinder::HTTP.new(configuration)).perform.result
     end
 
     def bulk(&block)
-      # TODO include parameter http: configure_http
-      AddressFinder::Bulk.new(&block).perform
-    end
-
-    private
-
-    def configure_http
-      http = Net::HTTP.new(configuration.hostname, configuration.port,
-                           configuration.proxy_host, configuration.proxy_port,
-                           configuration.proxy_user, configuration.proxy_password)
-      http.open_timeout = configuration.timeout
-      http.read_timeout = configuration.timeout
-      http.use_ssl = true
-
-      http
+      AddressFinder::Bulk.new(http: AddressFinder::HTTP.new(configuration), &block).perform
     end
   end
 end