Cleanup the Relation.from_xml to come in line with the Way and Node versions. Includes tests. Bug fix for the previous tests.

app/models/relation.rb

@@ -41,25 +41,23 @@ class Relation < ActiveRecord::Base
   def self.from_xml_node(pt, create=false)
     relation = Relation.new
 
-    if !create and pt['id'] != '0'
+    raise OSM::APIBadXMLError.new("relation", pt, "Version is required when updating") unless create or not pt['version'].nil?
-      relation.id = pt['id'].to_i
+    relation.version = pt['version']
-    end
+    raise OSM::APIBadXMLError.new("relation", pt, "Changeset id is missing") if pt['changeset'].nil?
-
-    raise OSM::APIBadXMLError.new("relation", pt, "You are missing the required changeset in the relation") if pt['changeset'].nil?
     relation.changeset_id = pt['changeset']
-
+    
-    # The follow block does not need to be executed because they are dealt with 
+    unless create
-    # in create_with_history, update_from and delete_with_history
+      raise OSM::APIBadXMLError.new("relation", pt, "ID is required when updating") if pt['id'].nil?
-    if create
+      relation.id = pt['id'].to_i
-      relation.timestamp = Time.now.getutc
+      # .to_i will return 0 if there is no number that can be parsed. 
-      relation.visible = true
+      # We want to make sure that there is no id with zero anyway
-      relation.version = 0
+      raise OSM::APIBadUserInput.new("ID of relation cannot be zero when updating.") if relation.id == 0
-    else
-      if pt['timestamp']
-        relation.timestamp = Time.parse(pt['timestamp'])
-      end
-      relation.version = pt['version']
     end
+    
+    # We don't care about the timestamp nor the visibility as these are either
+    # set explicitly or implicit in the action. The visibility is set to true, 
+    # and manually set to false before the actual delete.
+    relation.visible = true
 
     pt.find('tag').each do |tag|
       relation.add_tag_keyval(tag['k'], tag['v'])

test/functional/relation_controller_test.rb

@@ -433,10 +433,10 @@ class RelationControllerTest < ActionController::TestCase
     assert_response :bad_request
 
     # try to delete without specifying a changeset
-    content "<osm><relation id='#{current_relations(:visible_relation).id}'/></osm>"
+    content "<osm><relation id='#{current_relations(:visible_relation).id}' version='#{current_relations(:visible_relation).version}' /></osm>"
     delete :delete, :id => current_relations(:visible_relation).id
     assert_response :bad_request
-    assert_match(/You are missing the required changeset in the relation/, @response.body)
+    assert_match(/Changeset id is missing/, @response.body)
 
     # try to delete with an invalid (closed) changeset
     content update_changeset(current_relations(:visible_relation).to_xml,

test/unit/node_test.rb

@@ -267,6 +267,6 @@ class NodeTest < ActiveSupport::TestCase
     message_update = assert_raise(OSM::APIBadXMLError) {
       Node.from_xml(no_text, false)
     }
-    assert_match /Must specify a string with one or more characters/, message_create.message
+    assert_match /Must specify a string with one or more characters/, message_update.message
   end
 end

test/unit/relation_test.rb

@@ -7,4 +7,63 @@ class RelationTest < ActiveSupport::TestCase
     assert_equal 6, Relation.count
   end
   
+  def test_from_xml_no_id
+    noid = "<osm><relation version='12' changeset='23' /></osm>"
+    assert_nothing_raised(OSM::APIBadXMLError) {
+      Relation.from_xml(noid, true)
+    }
+    message = assert_raise(OSM::APIBadXMLError) {
+      Relation.from_xml(noid, false)
+    }
+    assert_match /ID is required when updating/, message.message
+  end
+  
+  def test_from_xml_no_changeset_id
+    nocs = "<osm><relation id='123' version='12' /></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Relation.from_xml(nocs, true)
+    }
+    assert_match /Changeset id is missing/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Relation.from_xml(nocs, false)
+    }
+    assert_match /Changeset id is missing/, message_update.message
+  end
+  
+  def test_from_xml_no_version
+    no_version = "<osm><relation id='123' changeset='23' /></osm>"
+    assert_nothing_raised(OSM::APIBadXMLError) {
+      Relation.from_xml(no_version, true)
+    }
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Relation.from_xml(no_version, false)
+    }
+    assert_match /Version is required when updating/, message_update.message
+  end
+  
+  def test_from_xml_id_zero
+    id_list = ["", "0", "00", "0.0", "a"]
+    id_list.each do |id|
+      zero_id = "<osm><relation id='#{id}' changeset='332' version='23' /></osm>"
+      assert_nothing_raised(OSM::APIBadUserInput) {
+        Relation.from_xml(zero_id, true)
+      }
+      message_update = assert_raise(OSM::APIBadUserInput) {
+        Relation.from_xml(zero_id, false)
+      }
+      assert_match /ID of relation cannot be zero when updating/, message_update.message
+    end
+  end
+  
+  def test_from_xml_no_text
+    no_text = ""
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Relation.from_xml(no_text, true)
+    }
+    assert_match /Must specify a string with one or more characters/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Relation.from_xml(no_text, false)
+    }
+    assert_match /Must specify a string with one or more characters/, message_update.message
+  end
 end

test/unit/way_test.rb

@@ -94,6 +94,6 @@ class WayTest < ActiveSupport::TestCase
     message_update = assert_raise(OSM::APIBadXMLError) {
       Way.from_xml(no_text, false)
     }
-    assert_match /Must specify a string with one or more characters/, message_create.message
+    assert_match /Must specify a string with one or more characters/, message_update.message
   end
 end