prevent update of any object without providing the correct/current

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 4e2a9b7f22a9f532303eecdd8098928bb36f5f19..fa6759c3b5debb59e601a7bd519d401ac352dfd9 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,16 +1,21 @@
+# The NodeController is the RESTful interface to Node objects
+
 class NodeController < ApplicationController
   require 'xml/libxml'
 
   session :off
   before_filter :authorize, :only => [:create, :update, :delete]
-  before_filter :check_availability, :only => [:create, :update, :delete]
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]
   after_filter :compress_output
 
+  # Create a node from XML.
   def create
     if request.put?
       node = Node.from_xml(request.raw_post, true)
 
       if node
+        node.version = 0
         node.user_id = @user.id
         node.visible = true
         node.save_with_history!
@@ -24,68 +29,58 @@ class NodeController < ApplicationController
     end
   end
 
+  # Dump the details on a node given in params[:id]
   def read
     begin
       node = Node.find(params[:id])
-
       if node.visible
+        response.headers['Last-Modified'] = node.timestamp.rfc822
         render :text => node.to_xml.to_s, :content_type => "text/xml"
        else
-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end
   end
 
+  # Update a node from given XML
   def update
     begin
       node = Node.find(params[:id])
-
-      if node.visible
-        new_node = Node.from_xml(request.raw_post)
-
-        if new_node and new_node.id == node.id
-          node.user_id = @user.id
-          node.latitude = new_node.latitude 
-          node.longitude = new_node.longitude
-          node.tags = new_node.tags
-          node.save_with_history!
-
-          render :nothing => true
-        else
-          render :nothing => true, :status => :bad_request
-        end
+      new_node = Node.from_xml(request.raw_post)
+      if new_node.version != node.version
+        render :text => "Version mismatch: Provided " + new_node.version.to_s + ", server had: " + node.version.to_s, :status => :bad_request
+        return
+      end  
+
+      if new_node and new_node.id == node.id
+        node.update_from(new_node, @user)
+        render :text => node.version.to_s, :content_type => "text/plain"
       else
-        render :nothing => true, :status => :gone
+        render :nothing => true, :status => :bad_request
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end
   end
 
+  # Delete a node. Doesn't actually delete it, but retains its history in a wiki-like way.
+  # FIXME remove all the fricking SQL
   def delete
     begin
       node = Node.find(params[:id])
-
-      if node.visible
-        if Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.id])
-          render :nothing => true, :status => :precondition_failed
-        else
-          node.user_id = @user.id
-          node.visible = 0
-          node.save_with_history!
-
-          render :nothing => true
-        end
-      else
-        render :nothing => true, :status => :gone
-      end
+      node.delete_with_history(@user)
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
+    rescue OSM::APIAlreadyDeletedError
+      render :text => "", :status => :gone
+    rescue OSM::APIPreconditionFailedError
+      render :text => "", :status => :precondition_failed
     end
   end
 
+  # WTF does this do?
   def nodes
     ids = params['nodes'].split(',').collect { |n| n.to_i }