X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a1a5706203b80f819be25d1563008ecd3039fe6c..2d22ab10f759828e27876f138b419ff4c0913b87:/app/controllers/node_controller.rb?ds=sidebyside

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 1e34bc10d..8c57ad8f9 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,7 +1,7 @@
 # The NodeController is the RESTful interface to Node objects
 
 class NodeController < ApplicationController
-  require 'xml/libxml'
+  require "xml/libxml"
 
   skip_before_filter :verify_authenticity_token
   before_filter :authorize, :only => [:create, :update, :delete]
@@ -35,28 +35,28 @@ class NodeController < ApplicationController
       render :text => "", :status => :gone
     end
   end
-  
+
   # Update a node from given XML
   def update
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
-       
-    unless new_node and 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})")
+
+    unless new_node && new_node.id == node.id
+      fail OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
     end
     node.update_from(new_node, @user)
     render :text => node.version.to_s, :content_type => "text/plain"
   end
 
-  # Delete a node. Doesn't actually delete it, but retains its history 
+  # Delete a node. Doesn't actually delete it, but retains its history
   # in a wiki-like way. We therefore treat it like an update, so the delete
   # method returns the new version number.
   def delete
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
-    
-    unless new_node and 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})")
+
+    unless new_node && new_node.id == node.id
+      fail 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"
@@ -64,14 +64,14 @@ class NodeController < ApplicationController
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.
   def nodes
-    if not params['nodes']
-      raise OSM::APIBadUserInput.new("The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]")
+    unless params["nodes"]
+      fail OSM::APIBadUserInput.new("The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]")
     end
 
-    ids = params['nodes'].split(',').collect { |n| n.to_i }
+    ids = params["nodes"].split(",").collect(&:to_i)
 
     if ids.length == 0
-      raise OSM::APIBadUserInput.new("No nodes were given to search for")
+      fail OSM::APIBadUserInput.new("No nodes were given to search for")
     end
     doc = OSM::API.new.get_xml_doc