more testing of the api. Changing the generator so that it is a constant to come...

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 9c271607dc0160d1d7e5b2b78138dc04ed2dedf0..e9d3c946468723af7ce34ad96eada774b864838c 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
 
   # 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.
   end
 
   # Raised when an API object is not found.


@@ -18,10 +21,66 @@ module OSM
 
   # Raised when a precondition to an API action fails sanity check.
   class APIPreconditionFailedError < APIError
 
   # 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
   end
 
   # Raised when to delete an already-deleted object.
   class APIAlreadyDeletedError < APIError

+    def render_opts
+      { :text => "", :status => :gone }
+    end
+  end
+
+  # Raised when the user logged in isn't the same as the changeset
+  class APIUserChangesetMismatchError < APIError
+    def render_opts
+      { :text => "The user doesn't own that changeset", :status => :conflict }
+    end
+  end
+
+  # Raised when the changeset provided is already closed
+  class APIChangesetAlreadyClosedError < APIError
+    def render_opts
+      { :text => "The supplied changeset has already been closed", :status => :conflict }
+    end
+  end
+  
+  # Raised when a change is expecting a changeset, but the changeset doesn't exist
+  class APIChangesetMissingError < APIError
+    def render_opts
+      { :text => "You need to supply a changeset to be able to make a change", :status => :conflict }
+    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 => :conflict }
+    end
+  end
+
+  # raised when a two tags have a duplicate key string in an element.
+  # this is now forbidden by the API.
+  class APIDuplicateTagsError < APIError
+    def initialize(type, id, tag_key)
+      @type, @id, @tag_key = type, id, tag_key
+    end
+
+    attr_reader :type, :id, :tag_key
+
+    def render_opts
+      { :text => "Element #{@type}/#{@id} has duplicate tags with key #{@tag_key}.",
+        :status => :bad_request }
+    end

   end
 
   # Helper methods for going to/from mercator and lat/lng.
   end
 
   # Helper methods for going to/from mercator and lat/lng.


@@ -190,7 +249,7 @@ module OSM
       doc.encoding = 'UTF-8' 
       root = XML::Node.new 'osm'
       root['version'] = API_VERSION
       doc.encoding = 'UTF-8' 
       root = XML::Node.new 'osm'
       root['version'] = API_VERSION

-      root['generator'] = 'OpenStreetMap server'
+      root['generator'] = GENERATOR

       doc.root = root
       return doc
     end
       doc.root = root
       return doc
     end