Add a global timeout that is applied to most API requests.

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index a392b88a825f54b5b0963b3c97437c8aaf16221b..f3a625c4eba61b90aef57ccb198a62d7fe96a959 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -185,6 +185,30 @@ module OSM
     end
   end
 
+  ##
+  # raised when an API call is made using a method not supported on that URI
+  class APIBadMethodError < APIError
+    def initialize(supported_method)
+      @supported_method = supported_method
+    end
+
+    def render_opts
+      { :text => "Only method #{@supported_method} is supported on this URI.", :status => :method_not_allowed }
+    end
+  end
+
+  ##
+  # raised when an API call takes too long
+  class APITimeoutError < APIError
+    def render_opts
+      { :text => "Request timed out", :status => :request_timeout }
+    end
+
+    def to_s
+      "Request timed out"
+    end
+  end
+
   # Helper methods for going to/from mercator and lat/lng.
   class Mercator
     include Math