Merge branch 'master' into moderation

[rails.git] / app / controllers / relation_controller.rb

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 2f8a477d9e4da06030d2a835b5ccb9318fa2651b..846d623f29dc7dd2ed0531280cba4dbc1abc2fb2 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -16,16 +16,16 @@ class RelationController < ApplicationController
 
     # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
     relation.create_with_history @user
 
     # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
     relation.create_with_history @user

-    render :text => relation.id.to_s, :content_type => "text/plain"
+    render :plain => relation.id.to_s

   end
 
   def read
     relation = Relation.find(params[:id])
     response.last_modified = relation.timestamp
     if relation.visible
   end
 
   def read
     relation = Relation.find(params[:id])
     response.last_modified = relation.timestamp
     if relation.visible

-      render :text => relation.to_xml.to_s, :content_type => "text/xml"
+      render :xml => relation.to_xml.to_s

     else
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
     end
   end
 


@@ -36,11 +36,11 @@ class RelationController < ApplicationController
     new_relation = Relation.from_xml(request.raw_post)
 
     unless new_relation && new_relation.id == relation.id
     new_relation = Relation.from_xml(request.raw_post)
 
     unless new_relation && new_relation.id == relation.id

-      fail OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")
+      raise OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")

     end
 
     relation.update_from new_relation, @user
     end
 
     relation.update_from new_relation, @user

-    render :text => relation.version.to_s, :content_type => "text/plain"
+    render :plain => relation.version.to_s

   end
 
   def delete
   end
 
   def delete


@@ -48,9 +48,9 @@ class RelationController < ApplicationController
     new_relation = Relation.from_xml(request.raw_post)
     if new_relation && new_relation.id == relation.id
       relation.delete_with_history!(new_relation, @user)
     new_relation = Relation.from_xml(request.raw_post)
     if new_relation && new_relation.id == relation.id
       relation.delete_with_history!(new_relation, @user)

-      render :text => relation.version.to_s, :content_type => "text/plain"
+      render :plain => relation.version.to_s

     else
     else

-      render :text => "", :status => :bad_request
+      head :bad_request

     end
   end
 
     end
   end
 


@@ -119,22 +119,22 @@ class RelationController < ApplicationController
 
       # finally add self and output
       doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache)
 
       # finally add self and output
       doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache)

-      render :text => doc.to_s, :content_type => "text/xml"
+      render :xml => doc.to_s

 
     else
 
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
   def relations
     unless params["relations"]
     end
   end
 
   def relations
     unless params["relations"]

-      fail OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")
+      raise OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")

     end
 
     ids = params["relations"].split(",").collect(&:to_i)
 
     end
 
     ids = params["relations"].split(",").collect(&:to_i)
 

-    if ids.length == 0
-      fail OSM::APIBadUserInput.new("No relations were given to search for")
+    if ids.empty?
+      raise OSM::APIBadUserInput.new("No relations were given to search for")

     end
 
     doc = OSM::API.new.get_xml_doc
     end
 
     doc = OSM::API.new.get_xml_doc


@@ -143,7 +143,7 @@ class RelationController < ApplicationController
       doc.root << relation.to_xml_node
     end
 
       doc.root << relation.to_xml_node
     end
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   def relations_for_way
   end
 
   def relations_for_way


@@ -167,6 +167,6 @@ class RelationController < ApplicationController
       doc.root << relation.to_xml_node if relation.visible
     end
 
       doc.root << relation.to_xml_node if relation.visible
     end
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 end
   end
 end