More unit tests for the parsing of the Node.from_xml. Some code clean up to ensure that a node that cannot be parsed will always throw an exception, to be handled by the arround handler.

app/controllers/node_controller.rb

@@ -16,12 +16,9 @@ class NodeController < ApplicationController
 
     node = Node.from_xml(request.raw_post, true)
 
-    if node
+    # 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 @user
-      render :text => node.id.to_s, :content_type => "text/plain"
+    render :text => node.id.to_s, :content_type => "text/plain"
-    else
-      raise OSM::APIBadXMLError.new(:node, request.raw_post)
-    end
   end
 
   # Dump the details on a node given in params[:id]
@@ -39,13 +36,12 @@ class NodeController < ApplicationController
   def update
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
-    
+       
-    if new_node and new_node.id == node.id
+    unless new_node and new_node.id == node.id
-      node.update_from(new_node, @user)
+      raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
-      render :text => node.version.to_s, :content_type => "text/plain"
-    else
-      render :nothing => true, :status => :bad_request
     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 
@@ -55,28 +51,26 @@ class NodeController < ApplicationController
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
     
-    if new_node and new_node.id == node.id
+    unless new_node and new_node.id == node.id
-      node.delete_with_history!(new_node, @user)
+      raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
-      render :text => node.version.to_s, :content_type => "text/plain"
-    else
-      render :nothing => true, :status => :bad_request
     end
+    node.delete_with_history!(new_node, @user)
+    render :text => node.version.to_s, :content_type => "text/plain"
   end
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.
   def nodes
     ids = params['nodes'].split(',').collect { |n| n.to_i }
 
-    if ids.length > 0
+    if ids.length == 0
-      doc = OSM::API.new.get_xml_doc
+      raise OSM::BadUserInput.new("No nodes were given to search for")
-
-      Node.find(ids).each do |node|
-        doc.root << node.to_xml_node
-      end 
-
-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :bad_request
     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"
   end
 end

app/models/node.rb

@@ -92,17 +92,14 @@ class Node < ActiveRecord::Base
     node.version = create ? 0 : pt['version'].to_i
 
     unless create
+      raise OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt['id'].nil?
       if pt['id'] != '0'
         node.id = pt['id'].to_i
       end
     end
 
-    # visible if it says it is, or as the default if the attribute
-    # is missing.
-    # Don't need to set the visibility, when it is set explicitly in the create/update/delete
-    #node.visible = pt['visible'].nil? or pt['visible'] == 'true'
-
     # We don't care about the time, as it is explicitly set on create/update/delete
+    # We don't care about the visibility as it is implicit based on the action
 
     tags = []
 

test/unit/node_test.rb

@@ -167,4 +167,69 @@ class NodeTest < ActiveSupport::TestCase
     #assert_equal node_template.tags, old_node.tags
     assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
   end
+  
+  def test_from_xml_no_id
+    lat = 56.7
+    lon = -2.3
+    changeset = 2
+    version = 1
+    noid = "<osm><node lat='#{lat}' lon='#{lon}' changeset='#{changeset}' version='#{version}' /></osm>"
+    # First try a create which doesn't need the id
+    assert_nothing_raised(OSM::APIBadXMLError) {
+      Node.from_xml(noid, true)
+    }
+    # Now try an update with no id, and make sure that it gives the appropriate exception
+    message = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(noid, false)
+    }
+    assert_match /ID is required when updating./, message.message
+  end
+  
+  def test_from_xml_no_lat
+    nolat = "<osm><node id='1' lon='23.3' changeset='2' version='23' /></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nolat, true)
+    }
+    assert_match /lat missing/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nolat, false)
+    }
+    assert_match /lat missing/, message_update.message
+  end
+  
+  def test_from_xml_no_lon
+    nolon = "<osm><node id='1' lat='23.1' changeset='2' version='23' /></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nolon, true)
+    }
+    assert_match /lon missing/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nolon, false)
+    }
+    assert_match /lon missing/, message_update.message
+  end
+
+  def test_from_xml_no_changeset_id
+    nocs = "<osm><node id='123' lon='23.23' lat='23.1' version='23' /></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nocs, true)
+    }
+    assert_match /changeset id missing/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nocs, false)
+    }
+    assert_match /changeset id missing/, message_update.message
+  end
+  
+  def test_from_xml_double_lat
+    nocs = "<osm><node id='123' lon='23.23' lat='23.1' lat='12' changeset='23' version='23' /></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nocs, true)
+    }
+    assert_match /Fatal error: Attribute lat redefined at/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nocs, false)
+    }
+    assert_match /Fatal error: Attribute lat redefined at/, message_update.message
+  end
 end