Improve consistency of text validations

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 9f6703b07688dbeb716fffb35cd47b34abb56760..84b814a34529fae1cd3c5be327b418e5c47a04b3 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -18,7 +18,7 @@ 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.create_with_history @user
+    node.create_with_history current_user
     render :plain => node.id.to_s
   end
 
@@ -40,11 +40,9 @@ class NodeController < ApplicationController
     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)
+    node.update_from(new_node, current_user)
     render :plain => node.version.to_s
   end
 
@@ -55,24 +53,20 @@ class NodeController < ApplicationController
     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)
+    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
-    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)
 
-    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|