uptodate with en.yml 15663

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index fba41e3305dc16c59eec00561027f09441a9f983..19add265d02823d2ca9178bf78968feee3edd4ed 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,101 +1,69 @@
+# The NodeController is the RESTful interface to Node objects
+

 class NodeController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize, :only => [:create, :update, :delete]
 class NodeController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize, :only => [:create, :update, :delete]

-  before_filter :check_availability, :only => [:create, :update, :delete]
+  before_filter :require_public_data, :only => [:create, :update, :delete]
+  before_filter :check_api_writable, :only => [:create, :update, :delete]
+  before_filter :check_api_readable, :except => [:create, :update, :delete]

   after_filter :compress_output
   after_filter :compress_output

+  around_filter :api_call_handle_error, :api_call_timeout

 
 

+  # Create a node from XML.

   def create
   def create

-    if request.put?
-      node = Node.from_xml(request.raw_post, true)
+    assert_method :put

 
 

-      if node
-        node.user_id = @user.id
-        node.visible = true
+    node = Node.from_xml(request.raw_post, true)

 
 

-        if node.save_with_history
-          render :text => node.id.to_s, :content_type => "text/plain"
-        else
-          render :nothing => true, :status => :internal_server_error
-        end
-      else
-        render :nothing => true, :status => :bad_request
-      end
+    if node
+      node.create_with_history @user
+      render :text => node.id.to_s, :content_type => "text/plain"

     else
     else

-      render :nothing => true, :status => :method_not_allowed
+      raise OSM::APIBadXMLError.new(:node, request.raw_post)

     end
   end
 
     end
   end
 

+  # Dump the details on a node given in params[:id]

   def read
   def read

-    begin
-      node = Node.find(params[:id])
-
-      if node.visible
-        render :text => node.to_xml.to_s, :content_type => "text/xml"
-       else
-        render :nothing => true, :status => :gone
-      end
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
+    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
   end
     end
   end

-
+  
+  # Update a node from given XML

   def update
   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
-
-          if node.save_with_history
-            render :nothing => true
-          else
-            render :nothing => true, :status => :internal_server_error
-          end
-        else
-          render :nothing => true, :status => :bad_request
-        end
-      else
-        render :nothing => true, :status => :gone
-      end
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
+    node = Node.find(params[:id])
+    new_node = Node.from_xml(request.raw_post)
+    
+    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 => :bad_request

     end
   end
 
     end
   end
 

+  # 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
   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
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
+    node = Node.find(params[:id])
+    new_node = Node.from_xml(request.raw_post)
+    
+    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 => :bad_request

     end
   end
 
     end
   end
 

+  # 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 }
 
   def nodes
     ids = params['nodes'].split(',').collect { |n| n.to_i }