@@ -1,4 +1,4 @@ -# Though.locate :ip => '212.58.224.131' -# Though.time_zone :ip => '212.58.224.131' +# Through.locate :ip => '212.58.224.131' +# Through.time_zone :ip => '212.58.224.131' require 'through' \ No newline at end of file plugins/rails/through/init.rb @@ -12,10 +12,15 @@ module Through if time_zone time_zone['rails'] = ActiveSupport::TimeZone::MAPPING.index(time_zone['country_name']) end + time_zone end def self.request(url) - response = open(SERVER + url).read - ActiveSupport::JSON.decode response + Timeout::timeout(3) do + response = open(SERVER + url).read + ActiveSupport::JSON.decode response + end + rescue Timeout::Error + nil end end \ No newline at end of file plugins/rails/through/lib/through.rb 042b6361fc9c2a92ee5623e2e38e347a6441da81 My Name alex@helicoid.net http://github.com/alexyoung/through/commit/7327abf2f63666c0bdf9dd9853ae9a30aba4f4f5 7327abf2f63666c0bdf9dd9853ae9a30aba4f4f5 2008-10-12T04:13:16-07:00 2008-10-12T04:13:16-07:00 Typos and added timeout to Rails plugin 6cdabf9411b4f65430c60a618bd65296724d0bb2 My Name alex@helicoid.net