Turn session-persistence plugin into a library

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index a85a7dfecd91be7d22ee18f07c3e8c252371932a..c4781ca417e7b828b382e42b057f409c6f247809 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -455,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
@@ -517,7 +517,7 @@ module OSM
     link_count = 0
     link_size = 0
 
-    doc = Nokogiri::HTML(text)
+    doc = Nokogiri::HTML(Rinku.auto_link(text, :urls))
 
     if doc.content.length > 0
       doc.xpath("//a").each do |link|