@@ -35,10 +35,10 @@ module Graticule #:nodoc: end def locate(address) - @controller = @options[:async] ? ParallelController.new : SerialController.new + @lookup = @options[:async] ? ParallelLookup.new : SerialLookup.new last_error = nil @geocoders.each do |geocoder| - @controller.perform do + @lookup.perform do begin result = nil Timeout.timeout(@options[:timeout]) do @@ -54,10 +54,10 @@ module Graticule #:nodoc: end end end - @controller.result || raise(last_error || AddressError.new("Couldn't find '#{address}' with any of the services")) + @lookup.result || raise(last_error || AddressError.new("Couldn't find '#{address}' with any of the services")) end - class SerialController #:nodoc: + class SerialLookup #:nodoc: def initialize @blocks = [] end @@ -75,7 +75,7 @@ module Graticule #:nodoc: end end - class ParallelController #:nodoc: + class ParallelLookup #:nodoc: def initialize @threads = [] @monitor = Monitor.new lib/graticule/geocoder/multi.rb cffd0837652a7f5aa9c59975b3346e6a26c8b127 Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/graticule/commit/329d78c0305266c33ab6e3b8a2fa475610ea2a1c 329d78c0305266c33ab6e3b8a2fa475610ea2a1c 2009-09-25T14:51:32-07:00 2009-09-25T14:51:32-07:00 Better naming for parallel/serial lookup code 3d167a548b65dce69f80c4856dcceb7b4c7906e7 Brandon Keepers brandon@collectiveidea.com