Added tests for changeset upload code. Refactored diff reading code and put it into...

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 585821a558bd0f353faf3b73ed904aa1434810a0..a24f61e2838e9278e65f81184706d2e6ede11579 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -2,6 +2,7 @@
 
 class ChangesetController < ApplicationController
   require 'xml/libxml'
+  require 'diff_reader'
 
   before_filter :authorize, :only => [:create, :update, :delete, :upload]
   before_filter :check_write_availability, :only => [:create, :update, :delete, :upload]
@@ -45,63 +46,63 @@ class ChangesetController < ApplicationController
       map { |memb| [memb[0], ids[memb[0]][memb[1].to_i] || memb[1], memb[2]] }
     return r
   end
+  
+  def read
+    begin
+      changeset = Changeset.find(params[:id])
+      render :text => changeset.to_xml.to_s, :content_type => "text/xml"
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
+  
+  def close 
+    begin
+      unless request.put?
+        render :nothing => true, :status => :method_not_allowed
+        return
+      end
+      changeset = Changeset.find(params[:id])
+      changeset.open = false
+      changeset.save!
+      render :nothing => true
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
 
+  ##
+  # Upload a diff in a single transaction.
+  #
+  # This means that each change within the diff must succeed, i.e: that
+  # each version number mentioned is still current. Otherwise the entire
+  # transaction *must* be rolled back.
+  #
+  # Furthermore, each element in the diff can only reference the current
+  # changeset.
+  #
+  # Returns: ??? the new document? updated diffs?
   def upload
-    if not request.put?
+    # only allow POST requests, as the upload method is most definitely
+    # not idempotent, as several uploads with placeholder IDs will have
+    # different side-effects.
+    # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.1.2
+    unless request.post?
       render :nothing => true, :status => :method_not_allowed
       return
     end
 
-    # FIXME: this should really be done without loading the whole XML file
-    # into memory.
-    p = XML::Parser.new
-    p.string  = request.raw_post
-    doc = p.parse
-
-    node_ids, way_ids, rel_ids = {}, {}, {}
-    ids = {"node"=>node_ids, "way"=>way_ids, "relation"=>rel_ids}
-
+    changeset = Changeset.find(params[:id])
+    
+    diff_reader = DiffReader.new(request.raw_post, changeset)
     Changeset.transaction do
-      doc.find('//osm/create/node').each do |nd|
-       create_prim node_ids, Node.from_xml_node(nd, true), nd
-      end
-      doc.find('//osm/create/way').each do |nd|
-       way = Way.from_xml_node(nd, true)
-       fix_way(way, node_ids)
-       raise OSM::APIPreconditionFailedError.new if !way.preconditions_ok?
-       create_prim way_ids, way, nd
-      end
-      doc.find('//osm/create/relation').each do |nd|
-       relation = Relation.from_xml_node(nd, true)
-       fix_rel(relation, ids)
-       raise OSM::APIPreconditionFailedError.new if !relation.preconditions_ok?
-       create_prim rel_ids, relation, nd
-      end
-
-      doc.find('//osm/modify/relation').each do |nd|
-       new_relation = Relation.from_xml_node(nd)
-       Relation.find(new_relation.id).update_from new_relation, @user
-      end
-      doc.find('//osm/modify/way').each do |nd|
-       new_way = Way.from_xml_node(nd)
-       Way.find(new_way.id).update_from new_way, @user
-      end
-      doc.find('//osm/modify/node').each do |nd|
-       new_node = Node.from_xml_node(nd)
-       Node.find(new_node.id).update_from new_node, @user
-      end
-
-      doc.find('//osm/delete/relation').each do |nd|
-       Relation.find(nd['id']).delete_with_history(@user)
-      end
-      doc.find('//osm/delete/way').each do |nd|
-       Way.find(nd['id']).delete_with_relations_and_history(@user)
-      end
-      doc.find('//osm/delete/node').each do |nd|
-       Node.find(nd['id']).delete_with_history(@user)
-      end
+      result = diff_reader.commit
+      render :text => result.to_s, :content_type => "text/xml"
     end
-
-    render :text => "Ok, Fine. Upload worked without errors.\n", :status => 200
+    
+  rescue ActiveRecord::RecordNotFound
+    render :nothing => true, :status => :not_found
+  rescue OSM::APIError => ex
+    render ex.render_opts
   end
 end