api06: simplify exception handling and add exception handling to the diff

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index a8cb103d2f829540bf06f69ae0437f3c3029b11e..8798866e5dc918ab5fc63d94bbf217924cc5effd 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -10,6 +10,7 @@ module OSM
 
   # The base class for API Errors.
   class APIError < RuntimeError
+    def render_opts { :text => "", :status => :internal_server_error } end
   end
 
   # Raised when an API object is not found.
@@ -18,10 +19,12 @@ module OSM
 
   # Raised when a precondition to an API action fails sanity check.
   class APIPreconditionFailedError < APIError
+    def render_opts { :text => "", :status => :precondition_failed } end
   end
 
   # Raised when to delete an already-deleted object.
   class APIAlreadyDeletedError < APIError
+    def render_opts { :text => "", :status => :gone } end
   end
 
   # Raised when the provided version is not equal to the latest in the db.
@@ -31,6 +34,11 @@ module OSM
     end
 
     attr_reader :provided, :latest
+
+    def render_opts
+      { :text => "Version mismatch: Provided " + ex.provided.to_s +
+       ", server had: " + ex.latest.to_s, :status => :bad_request }
+    end
   end
 
   # Helper methods for going to/from mercator and lat/lng.