Changing if not to unless to make code more readable.

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 62987cf9433b35d0d8b8c3b770615e6758465cbc..70bf597345c27044a3282c105c02f0c796dfce43 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,3 +1,5 @@
+# The NodeController is the RESTful interface to Node objects
+
 class NodeController < ApplicationController
   require 'xml/libxml'
 
@@ -7,11 +9,13 @@ class NodeController < ApplicationController
   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!
@@ -25,13 +29,29 @@ 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 :text => "", :status => :gone
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
+  
+  # Dump a specific version of the node based on the given params[:id] and params[:version]
+  def version
+    begin
+      node = Node.find(:first, :conditions => { :id => params[:id], :version => params[:version] } )
+      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
       end
     rescue ActiveRecord::RecordNotFound
@@ -39,56 +59,42 @@ class NodeController < ApplicationController
     end
   end
 
+  # Update a node from given XML
   def update
     begin
       node = Node.find(params[:id])
+      new_node = Node.from_xml(request.raw_post)
 
-      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
+      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 OSM::APIVersionMismatchError => ex
+      render :text => "Version mismatch: Provided " + ex.provided.to_s +
+       ", server had: " + ex.latest.to_s, :status => :bad_request
     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])
+      node.delete_with_history(@user)
 
-      if node.visible
-        if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", node.id ])
-          render :nothing => true, :status => :precondition_failed
-        elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", params[: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
+      render :nothing => true
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
+    rescue OSM::APIError => ex
+      render ex.render_opts
     end
   end
 
+  # WTF does this do?
   def nodes
     ids = params['nodes'].split(',').collect { |n| n.to_i }