Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 9c271607dc0160d1d7e5b2b78138dc04ed2dedf0..a64aa8c4870afc4ee2331ef49769682f318467d3 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -10,6 +10,9 @@ 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 +21,30 @@ 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.
+  class APIVersionMismatchError < APIError
+    def initialize(provided, latest)
+      @provided, @latest = provided, latest
+    end
+
+    attr_reader :provided, :latest
+
+    def render_opts
+      { :text => "Version mismatch: Provided " + provided.to_s +
+       ", server had: " + latest.to_s, :status => :bad_request }
+    end
   end
 
   # Helper methods for going to/from mercator and lat/lng.