Use OSM::Timer (and hence SystemTimer) consistently

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 02c51df7809b599debb11810cb6350ee7048bfc8..dd62d6620c7ca4f06eb7f726ba962eb0a39e0241 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -9,6 +9,13 @@ module OSM
   require 'RMagick'
   require 'nokogiri'
 
+  if defined?(SystemTimer)
+    Timer = SystemTimer
+  else
+    require 'timeout'
+    Timer = Timeout
+  end
+
   # The base class for API Errors.
   class APIError < RuntimeError
     def status
@@ -448,7 +455,7 @@ module OSM
   end
 
   def self.IPToCountry(ip_address)
-    Timeout::timeout(4) do
+    Timer.timeout(4) do
       ipinfo = Quova::IpInfo.new(ip_address)
 
       if ipinfo.status == Quova::Success then