Merge remote-tracking branch 'upstream/pull/1963'

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 8d29fd0726b21ff8d286f59d899ccc2d5ca355c6..20baf6bb4d0285575e8faa14d92ce08fc23e4bd8 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -18,8 +18,8 @@ class NodeController < ApplicationController
     node = Node.from_xml(request.raw_post, true)
 
     # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
     node = Node.from_xml(request.raw_post, true)
 
     # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml

-    node.create_with_history @user
-    render :text => node.id.to_s, :content_type => "text/plain"
+    node.create_with_history current_user
+    render :plain => node.id.to_s

   end
 
   # Dump the details on a node given in params[:id]
   end
 
   # Dump the details on a node given in params[:id]


@@ -29,9 +29,9 @@ class NodeController < ApplicationController
     response.last_modified = node.timestamp
 
     if node.visible
     response.last_modified = node.timestamp
 
     if node.visible

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

     else
     else

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

     end
   end
 
     end
   end
 


@@ -40,12 +40,10 @@ class NodeController < ApplicationController
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
 
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
 

-    unless new_node && new_node.id == node.id
-      raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
-    end
+    raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" unless new_node && new_node.id == node.id

 
 

-    node.update_from(new_node, @user)
-    render :text => node.version.to_s, :content_type => "text/plain"
+    node.update_from(new_node, current_user)
+    render :plain => node.version.to_s

   end
 
   # Delete a node. Doesn't actually delete it, but retains its history
   end
 
   # Delete a node. Doesn't actually delete it, but retains its history


@@ -55,30 +53,24 @@ class NodeController < ApplicationController
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
 
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
 

-    unless new_node && new_node.id == node.id
-      raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
-    end
-    node.delete_with_history!(new_node, @user)
-    render :text => node.version.to_s, :content_type => "text/plain"
+    raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" unless new_node && new_node.id == node.id
+    node.delete_with_history!(new_node, current_user)
+    render :plain => node.version.to_s

   end
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.
   def nodes
   end
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.
   def nodes

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

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

-    if ids.empty?
-      raise OSM::APIBadUserInput.new("No nodes were given to search for")
-    end
+    raise OSM::APIBadUserInput, "No nodes were given to search for" if ids.empty?

     doc = OSM::API.new.get_xml_doc
 
     Node.find(ids).each do |node|
       doc.root << node.to_xml_node
     end
 
     doc = OSM::API.new.get_xml_doc
 
     Node.find(ids).each do |node|
       doc.root << node.to_xml_node
     end
 

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

   end
 end
   end
 end