Fix for the refactoring commited yesterday, based on review by Dave Stubbs

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index c5b4f279b54ee16bf80b34ba336c090643b68837..c03f3c4fbf26767135213e4e65c0d2b5de9f11fc 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,115 +1,103 @@
+# The NodeController is the RESTful interface to Node objects
+
 class NodeController < ApplicationController
   require 'xml/libxml'
 
-  before_filter :authorize
+  session :off
+  before_filter :authorize, :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 = nil
-      begin
+    begin
+      if request.put?
         node = Node.from_xml(request.raw_post, true)
-      rescue
-        render :text => "XML didn't parse", :status => 400 # if we got here the doc didnt parse
-        return
-      end
 
-      if node
-        node.user_id = @user.id
-        if node.save_with_history
-          render :text => node.id
+        if node
+          node.create_with_history @user
+          render :text => node.id.to_s, :content_type => "text/plain"
         else
-          render :nothing => true, :status => 500
+          render :nothing => true, :status => :bad_request
         end
-        return
-
       else
-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :nothing => true, :status => :method_not_allowed
       end
+    rescue OSM::APIError => ex
+      render ex.render_opts
     end
-
-    render :nothing => true, :status => 500 # something went very wrong
   end
 
-  def rest
-    unless Node.exists?(params[:id])
-      render :nothing => true, :status => 404
-      return
-    end
-
-    node = Node.find(params[:id])
-
-    case request.method
-
-    when :get
-      unless node
-        render :nothing => true, :status => 500
-        return
+  # 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
+  
+  # Update a node from given XML
+  def update
+    begin
+      node = Node.find(params[:id])
+      new_node = Node.from_xml(request.raw_post)
 
-      unless node.visible
-        render :nothing => true, :status => 410
-        return
-      end
-
-      render :text => node.to_xml.to_s
-      return
-
-    when :delete
-      if node.visible
-        node.visible = 0
-        node.save_with_history
-        render :nothing => true
+      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 => 410
+        render :nothing => true, :status => :bad_request
       end
+    rescue OSM::APIError => ex
+      render ex.render_opts
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
 
-    when :put
+  # Delete a node. Doesn't actually delete it, but retains its history 
+  # in a wiki-like way. We therefore treat it like an update, so the delete
+  # method returns the new version number.
+  def delete
+    begin
+      node = Node.find(params[:id])
       new_node = Node.from_xml(request.raw_post)
-
-      node.timestamp = Time.now
-      node.user_id = @user.id
-
-      node.latitude = new_node.latitude 
-      node.longitude = new_node.longitude
-      node.tags = new_node.tags
-
-      if node.id == new_node.id and node.save_with_history
-        render :nothing => true, :status => 200
+      
+      if new_node and new_node.id == node.id
+        node.delete_with_history!(new_node, @user)
+        render :text => node.version.to_s, :content_type => "text/plain"
       else
-        render :nothing => true, :status => 500
+        render :nothing => true, :status => :bad_request
       end
-      return
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue OSM::APIError => ex
+      render ex.render_opts
     end
-
   end
 
-  def history
-    node = Node.find(params[:id])
+  # 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 }
 
-    unless node
-      render :nothing => true, :staus => 404
-      return
-    end
+    if ids.length > 0
+      doc = OSM::API.new.get_xml_doc
 
-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Node.new 'osm'
-    root['version'] = '0.4'
-    root['generator'] = 'OpenStreetMap server'
-    doc.root = root
+      Node.find(ids).each do |node|
+        doc.root << node.to_xml_node
+      end 
 
-    node.old_nodes.each do |old_node|
-      el1 = XML::Node.new 'node'
-      el1['id'] = old_node.id.to_s
-      el1['lat'] = old_node.latitude.to_s
-      el1['lon'] = old_node.longitude.to_s
-      Node.split_tags(el1, old_node.tags)
-      el1['visible'] = old_node.visible.to_s
-      el1['timestamp'] = old_node.timestamp.xmlschema
-      root << el1
+      render :text => doc.to_s, :content_type => "text/xml"
+    else
+      render :nothing => true, :status => :bad_request
     end
-
-    render :text => doc.to_s
   end
 end