jakimowicz-longurl 0.0.3 → 0.0.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 0
 :minor: 0

data/lib/longurl/direct.rb

@@ -10,6 +10,8 @@ module LongURL
         dest = answer['Location']
         (dest && dest[0, 7] == 'http://' && follow_redirections(dest)) || orig
       end
+    rescue Timeout::Error, Errno::ENETUNREACH, Errno::ETIMEDOUT, SocketError
+      raise LongURL::NetworkError
     end
   end
 end

data/lib/longurl/expand.rb

@@ -20,6 +20,7 @@ module LongURL
     #
     # === Exceptions
     # * LongURL::InvalidURL : will occurs if given url is nil, empty or invalid
+    # * LongURL::NetworkError : a network (timeout, host could be reached, ...) error occurs
     # * LongURL::UnknownError : an unknown error occurs
     def expand(url, options = {})
       @@expander ||= Expander.new(:cache => options[:cache])

data/lib/longurl/expander.rb

@@ -25,6 +25,7 @@ module LongURL
   #   e.expand("http://is.gd/iUKg")                                   # => "http://fabien.jakimowicz.com"
   # === Exceptions
   # * LongURL::InvalidURL : will occurs if given url is nil, empty or invalid
+  # * LongURL::NetworkError : a network (timeout, host could be reached, ...) error occurs
   # * LongURL::UnknownError : an unknown error occurs
   class Expander
     # Initialize a new Expander.

data/lib/longurl/service.rb

@@ -22,7 +22,7 @@ module LongURL
     end
     
     def cached_query(url)
-      @@cache.get(url) || @@cache.set(url, query(url))
+      @@cache[url] ||= query(url)
     end
 
     def query(url)
@@ -30,7 +30,7 @@ module LongURL
       Net::HTTP.start(EndPoint.host, EndPoint.port) do |http|
         handle_response http.get("#{EndPoint.path}?format=json&url=#{escaped_url}")
       end
-    rescue Timeout::Error, Errno::ENETUNREACH
+    rescue Timeout::Error, Errno::ENETUNREACH, Errno::ETIMEDOUT, SocketError
       raise LongURL::NetworkError
     end
         
@@ -59,7 +59,7 @@ module LongURL
         parsed = JSON.parse(response.body)
         parsed.values.flatten
       end
-    rescue Timeout::Error, Errno::ENETUNREACH
+    rescue Timeout::Error, Errno::ENETUNREACH, Errno::ETIMEDOUT, SocketError
       raise LongURL::NetworkError
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jakimowicz-longurl
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Fabien Jakimowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-23 00:00:00 -08:00
+date: 2009-03-06 00:00:00 -08:00
 default_executable: longurl
 dependencies: 
 - !ruby/object:Gem::Dependency