Made relations ordered. Added some tests for this. Otherwise interface is unchanged.

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index d00e9e0775d53e9e0de1a663cf406f426ddd4f13..cdd1d34d6fb459434bab7b381286634ebf1d1291 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -1,40 +1,39 @@
 class RelationController < ApplicationController
   require 'xml/libxml'
 
 class RelationController < ApplicationController
   require 'xml/libxml'
 

+  session :off

   before_filter :authorize, :only => [:create, :update, :delete]
   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
 
   def create
   after_filter :compress_output
 
   def create

-    if request.put?
-      relation = Relation.from_xml(request.raw_post, true)
+    begin
+      if request.put?
+        relation = Relation.from_xml(request.raw_post, true)

 
 

-      if relation
-        if !relation.preconditions_ok?
-          render :nothing => true, :status => :precondition_failed
+        if relation
+          relation.create_with_history @user
+          render :text => relation.id.to_s, :content_type => "text/plain"

         else
         else

-          relation.user_id = @user.id
-          relation.save_with_history!
-
-         render :text => relation.id.to_s, :content_type => "text/plain"
+          render :nothing => true, :status => :bad_request

         end
       else
         end
       else

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

       end
       end

-    else
-      render :nothing => true, :status => :method_not_allowed
+    rescue OSM::APIError => ex
+      render ex.render_opts

     end
   end
 
   def read
     begin
       relation = Relation.find(params[:id])
     end
   end
 
   def read
     begin
       relation = Relation.find(params[:id])

-
+      response.headers['Last-Modified'] = relation.timestamp.rfc822

       if relation.visible
         render :text => relation.to_xml.to_s, :content_type => "text/xml"
       else
       if relation.visible
         render :text => relation.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
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found


@@ -44,34 +43,21 @@ class RelationController < ApplicationController
   end
 
   def update
   end
 
   def update

+    logger.debug request.raw_post

     begin
       relation = Relation.find(params[:id])
     begin
       relation = Relation.find(params[:id])

+      new_relation = Relation.from_xml(request.raw_post)

 
 

-      if relation.visible
-        new_relation = Relation.from_xml(request.raw_post)
-
-        if new_relation and new_relation.id == relation.id
-          if !new_relation.preconditions_ok?
-            render :nothing => true, :status => :precondition_failed
-          else
-            relation.user_id = @user.id
-            relation.tags = new_relation.tags
-            relation.members = new_relation.members
-            relation.visible = true
-            relation.save_with_history!
-
-            render :nothing => true
-          end
-        else
-          render :nothing => true, :status => :bad_request
-        end
+      if new_relation and new_relation.id == relation.id
+        relation.update_from new_relation, @user
+        render :text => relation.version.to_s, :content_type => "text/plain"

       else
       else

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

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

-    rescue
-      render :nothing => true, :status => :internal_server_error
+    rescue OSM::APIError => ex
+      render ex.render_opts

     end
   end
 
     end
   end
 


@@ -79,26 +65,17 @@ class RelationController < ApplicationController
 #XXX check if member somewhere!
     begin
       relation = Relation.find(params[:id])
 #XXX check if member somewhere!
     begin
       relation = Relation.find(params[:id])

-
-      if relation.visible
-        if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", params[:id]])
-          render :nothing => true, :status => :precondition_failed
-        else
-          relation.user_id = @user.id
-          relation.tags = []
-          relation.members = []
-          relation.visible = false
-          relation.save_with_history!
-
-          render :nothing => true
-        end
+      new_relation = Relation.from_xml(request.raw_post)
+      if new_relation and new_relation.id == relation.id
+        relation.delete_with_history!(new_relation, @user)
+        render :text => relation.version.to_s, :content_type => "text/plain"

       else
       else

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

       end
       end

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

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

-    rescue
-      render :nothing => true, :status => :internal_server_error

     end
   end
 
     end
   end
 


@@ -140,16 +117,18 @@ class RelationController < ApplicationController
     
         # create XML.
         doc = OSM::API.new.get_xml_doc
     
         # create XML.
         doc = OSM::API.new.get_xml_doc

+        visible_nodes = {}

         user_display_name_cache = {}
 
         nodes.each do |node|
           if node.visible? # should be unnecessary if data is consistent.
             doc.root << node.to_xml_node(user_display_name_cache)
         user_display_name_cache = {}
 
         nodes.each do |node|
           if node.visible? # should be unnecessary if data is consistent.
             doc.root << node.to_xml_node(user_display_name_cache)

+            visible_nodes[node.id] = node

           end
         end
         ways.each do |way|
           if way.visible? # should be unnecessary if data is consistent.
           end
         end
         ways.each do |way|
           if way.visible? # should be unnecessary if data is consistent.

-            doc.root << way.to_xml_node(user_display_name_cache)
+            doc.root << way.to_xml_node(visible_nodes, user_display_name_cache)

           end
         end
         relations.each do |rel|
           end
         end
         relations.each do |rel|


@@ -163,7 +142,7 @@ class RelationController < ApplicationController
 
       else
 
 
       else
 

-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone

       end
 
     rescue ActiveRecord::RecordNotFound
       end
 
     rescue ActiveRecord::RecordNotFound


@@ -201,18 +180,14 @@ class RelationController < ApplicationController
   end
 
   def relations_for_object(objtype)
   end
 
   def relations_for_object(objtype)

-    relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id }.uniq
+    relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id[0] }.uniq

 
 

-    if relationids.length > 0
-      doc = OSM::API.new.get_xml_doc
+    doc = OSM::API.new.get_xml_doc

 
 

-      Relation.find(relationids).each do |relation|
-        doc.root << relation.to_xml_node
-      end
-
-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :not_found
+    Relation.find(relationids).each do |relation|
+      doc.root << relation.to_xml_node if relation.visible

     end
     end

+
+    render :text => doc.to_s, :content_type => "text/xml"

   end
 end
   end
 end