Added a bunch more tests on the API 0.6. Fixed node/way/relation from_xml code to...

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 97d551776b92809f8ac91e22fde49bce31acd690..f1023e78fd2de7669193b4ddb0911cbf9b6f3e63 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,75 +1,122 @@
+# The NodeController is the RESTful interface to Node objects
+

 class NodeController < ApplicationController
   require 'xml/libxml'
 
 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
   def create

-    if request.put?
-      node = Node.from_xml(request.raw_post, true)
-
-      if node
-        node.user_id = @user.id
-        if node.save_with_history
+    begin
+      if request.put?
+        node = Node.from_xml(request.raw_post, true)

 
 

-          render :text => node.id
+        if node
+          node.create_with_history @user
+          render :text => node.id.to_s, :content_type => "text/plain"

         else
         else

-          render :text => 'truesrgtsrtfgsar', :status => 500
-#          render :nothing => true, :status => 500
+          render :nothing => true, :status => :bad_request

         end
         end

-        return
-

       else
       else

-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :nothing => true, :status => :method_not_allowed

       end
       end

+    rescue OSM::APIError => ex
+      render ex.render_opts

     end
     end

-
-          render :text => 'FFFFFFFFFF ', :status => 500
-#    render :nothing => true, :status => 500 # something went very wrong

   end
 
   end
 

-  def rest
-    unless Node.exists?(params[:id])
-      render :nothing => true, :status => 400
-      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

-
-    node = Node.find(params[:id])
-
-    case request.method
-
-    when :get
-      render :text => node.to_xml.to_s
-      return
-
-    when :delete
-
+  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
       if node.visible

-        node.visible = 0
-
-        node.save_with_history
-
-        render :nothing => true
+        response.headers['Last-Modified'] = node.timestamp.rfc822
+        render :text => node.to_xml.to_s, :content_type => "text/xml"

       else
       else

-        render :nothing => true, :status => 410
+        render :nothing => true, :status => :gone

       end
       end

+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end

 
 

-    when :put
-
+  # Update a node from given XML
+  def update
+    begin
+      node = Node.find(params[:id])

       new_node = Node.from_xml(request.raw_post)
 
       new_node = Node.from_xml(request.raw_post)
 

-      new_node.timestamp = Time.now
-      new_node.user_id = @user.id
-
-      if node.id == new_node.id and new_node.save_with_history
-        render :text => node.id
+      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
       else

-        render :nothing => true, :status => 500
+        render :nothing => true, :status => :bad_request

       end
       end

-      return
+    rescue OSM::APIError => ex
+      render ex.render_opts
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found

     end
     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])
+      new_node = Node.from_xml(request.raw_post)
+      # FIXME we no longer care about the user, (or maybe we want to check
+      # that the user of the changeset is the same user as is making this
+      # little change?) we really care about the 
+      # changeset which must be open, and that the version that we have been
+      # given is the one that is currently stored in the database
+      
+      if new_node and new_node.id == node.id
+        node.delete_with_history(new_node, @user)
+        render :nothing => true
+      else
+        render :nothing => true, :status => :bad_request
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue OSM::APIError => ex
+      render ex.render_opts
+    end

   end
 
   end
 

+  # WTF does this do?
+  def nodes
+    ids = params['nodes'].split(',').collect { |n| n.to_i }
+
+    if ids.length > 0
+      doc = OSM::API.new.get_xml_doc

 
 

+      Node.find(ids).each do |node|
+        doc.root << node.to_xml_node
+      end 
+
+      render :text => doc.to_s, :content_type => "text/xml"
+    else
+      render :nothing => true, :status => :bad_request
+    end
+  end

 end
 end