Merge pull request #1597 from tomhughes/current-user

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 63e58819b11efe29e2106b58f6bf244107e23bf5..97e83204939c7061f68dd8d877d1cda294fa4283 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -1,193 +1,165 @@
 class RelationController < ApplicationController
 class RelationController < ApplicationController

-  require 'xml/libxml'
+  require "xml/libxml"

 
 

-  session :off
-  before_filter :authorize, :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
+  skip_before_action :verify_authenticity_token
+  before_action :authorize, :only => [:create, :update, :delete]
+  before_action :require_allow_write_api, :only => [:create, :update, :delete]
+  before_action :require_public_data, :only => [:create, :update, :delete]
+  before_action :check_api_writable, :only => [:create, :update, :delete]
+  before_action :check_api_readable, :except => [:create, :update, :delete]
+  around_action :api_call_handle_error, :api_call_timeout

 
   def create
 
   def create

-    begin
-      if request.put?
-        relation = Relation.from_xml(request.raw_post, true)
-
-        # We assume that an exception has been thrown if there was an error 
-        # generating the relation
-        #if relation
-          relation.create_with_history @user
-          render :text => relation.id.to_s, :content_type => "text/plain"
-        #else
-         # render :text => "Couldn't get turn the input into a relation.", :status => :bad_request
-        #end
-      else
-        render :nothing => true, :status => :method_not_allowed
-      end
-    rescue OSM::APIError => ex
-      render ex.render_opts
-    end
+    assert_method :put
+
+    relation = Relation.from_xml(request.raw_post, true)
+
+    # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
+    relation.create_with_history current_user
+    render :plain => relation.id.to_s

   end
 
   def read
   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
-        render :text => "", :status => :gone
-      end
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
+    relation = Relation.find(params[:id])
+    response.last_modified = relation.timestamp
+    if relation.visible
+      render :xml => relation.to_xml.to_s
+    else
+      head :gone

     end
   end
 
   def update
     logger.debug request.raw_post
     end
   end
 
   def update
     logger.debug request.raw_post

-    begin
-      relation = Relation.find(params[:id])
-      new_relation = Relation.from_xml(request.raw_post)
-
-      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
-        render :nothing => true, :status => :bad_request
-      end
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
-    rescue OSM::APIError => ex
-      render ex.render_opts
+
+    relation = Relation.find(params[:id])
+    new_relation = Relation.from_xml(request.raw_post)
+
+    unless new_relation && new_relation.id == relation.id
+      raise OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")

     end
     end

+
+    relation.update_from new_relation, current_user
+    render :plain => relation.version.to_s

   end
 
   def delete
   end
 
   def delete

-    begin
-      relation = Relation.find(params[:id])
-      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
-        render :nothing => true, :status => :bad_request
-      end
-    rescue OSM::APIError => ex
-      render ex.render_opts
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
+    relation = Relation.find(params[:id])
+    new_relation = Relation.from_xml(request.raw_post)
+    if new_relation && new_relation.id == relation.id
+      relation.delete_with_history!(new_relation, current_user)
+      render :plain => relation.version.to_s
+    else
+      head :bad_request

     end
   end
 
   # -----------------------------------------------------------------
   # full
     end
   end
 
   # -----------------------------------------------------------------
   # full

-  # 
+  #

   # input parameters: id
   #
   # returns XML representation of one relation object plus all its
   # members, plus all nodes part of member ways
   # -----------------------------------------------------------------
   def full
   # input parameters: id
   #
   # returns XML representation of one relation object plus all its
   # members, plus all nodes part of member ways
   # -----------------------------------------------------------------
   def full

-    begin
-      relation = Relation.find(params[:id])
-
-      if relation.visible
-
-        # first find the ids of nodes, ways and relations referenced by this
-        # relation - note that we exclude this relation just in case.
-
-        node_ids = relation.members.select { |m| m[0] == 'Node' }.map { |m| m[1] }
-        way_ids = relation.members.select { |m| m[0] == 'Way' }.map { |m| m[1] }
-        relation_ids = relation.members.select { |m| m[0] == 'Relation' and m[1] != relation.id }.map { |m| m[1] }
-
-        # next load the relations and the ways.
-
-        relations = Relation.find(relation_ids, :include => [:relation_tags])
-        ways = Way.find(way_ids, :include => [:way_nodes, :way_tags])
-
-        # now additionally collect nodes referenced by ways. Note how we 
-        # recursively evaluate ways but NOT relations.
-
-        way_node_ids = ways.collect { |way|
-           way.way_nodes.collect { |way_node| way_node.node_id }
-        }
-        node_ids += way_node_ids.flatten
-        nodes = Node.find(node_ids.uniq, :include => :node_tags)
-    
-        # create XML.
-        doc = OSM::API.new.get_xml_doc
-        visible_nodes = {}
-        visible_members = { "Node" => [], "Way" => [], "Relation" => [] }
-        changeset_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(changeset_cache, user_display_name_cache)
-            visible_nodes[node.id] = node
-            visible_members["Node"][node.id] = true
-          end
-        end
-        ways.each do |way|
-          if way.visible? # should be unnecessary if data is consistent.
-            doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
-            visible_members["Way"][way.id] = true
-          end
-        end
-        relations.each do |rel|
-          if rel.visible? # should be unnecessary if data is consistent.
-            doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
-            visible_members["Relation"][rel.id] = true
-          end
-        end
-        # finally add self and output
-        doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache)
-        render :text => doc.to_s, :content_type => "text/xml"
-
-      else
-        render :nothing => true, :status => :gone
+    relation = Relation.find(params[:id])
+
+    if relation.visible
+
+      # first find the ids of nodes, ways and relations referenced by this
+      # relation - note that we exclude this relation just in case.
+
+      node_ids = relation.members.select { |m| m[0] == "Node" }.map { |m| m[1] }
+      way_ids = relation.members.select { |m| m[0] == "Way" }.map { |m| m[1] }
+      relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.map { |m| m[1] }
+
+      # next load the relations and the ways.
+
+      relations = Relation.where(:id => relation_ids).includes(:relation_tags)
+      ways = Way.where(:id => way_ids).includes(:way_nodes, :way_tags)
+
+      # now additionally collect nodes referenced by ways. Note how we
+      # recursively evaluate ways but NOT relations.
+
+      way_node_ids = ways.collect do |way|
+        way.way_nodes.collect(&:node_id)
+      end
+      node_ids += way_node_ids.flatten
+      nodes = Node.where(:id => node_ids.uniq).includes(:node_tags)
+
+      # create XML.
+      doc = OSM::API.new.get_xml_doc
+      visible_nodes = {}
+      visible_members = { "Node" => {}, "Way" => {}, "Relation" => {} }
+      changeset_cache = {}
+      user_display_name_cache = {}
+
+      nodes.each do |node|
+        next unless node.visible? # should be unnecessary if data is consistent.
+
+        doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+        visible_nodes[node.id] = node
+        visible_members["Node"][node.id] = true

       end
 
       end
 

-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
+      ways.each do |way|
+        next unless way.visible? # should be unnecessary if data is consistent.
+
+        doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
+        visible_members["Way"][way.id] = true
+      end

 
 

-    rescue
-      render :nothing => true, :status => :internal_server_error
+      relations.each do |rel|
+        next unless rel.visible? # should be unnecessary if data is consistent.
+
+        doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
+        visible_members["Relation"][rel.id] = true
+      end
+
+      # finally add self and output
+      doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache)
+      render :xml => doc.to_s
+
+    else
+      head :gone

     end
   end
 
   def relations
     end
   end
 
   def relations

-    ids = params['relations'].split(',').collect { |w| w.to_i }
+    unless params["relations"]
+      raise OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")
+    end

 
 

-    if ids.length > 0
-      doc = OSM::API.new.get_xml_doc
+    ids = params["relations"].split(",").collect(&:to_i)

 
 

-      Relation.find(ids).each do |relation|
-        doc.root << relation.to_xml_node
-      end
+    if ids.empty?
+      raise OSM::APIBadUserInput.new("No relations were given to search for")
+    end

 
 

-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :text => "You need to supply a comma separated list of ids.", :status => :bad_request
+    doc = OSM::API.new.get_xml_doc
+
+    Relation.find(ids).each do |relation|
+      doc.root << relation.to_xml_node

     end
     end

-  rescue ActiveRecord::RecordNotFound
-    render :text => "Could not find one of the relations", :status => :not_found
+
+    render :xml => doc.to_s

   end
 
   def relations_for_way
     relations_for_object("Way")
   end
   end
 
   def relations_for_way
     relations_for_object("Way")
   end

+

   def relations_for_node
     relations_for_object("Node")
   end
   def relations_for_node
     relations_for_object("Node")
   end

+

   def relations_for_relation
     relations_for_object("Relation")
   end
 
   def relations_for_object(objtype)
   def relations_for_relation
     relations_for_object("Relation")
   end
 
   def relations_for_object(objtype)

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

 
     doc = OSM::API.new.get_xml_doc
 
 
     doc = OSM::API.new.get_xml_doc
 


@@ -195,6 +167,6 @@ class RelationController < ApplicationController
       doc.root << relation.to_xml_node if relation.visible
     end
 
       doc.root << relation.to_xml_node if relation.visible
     end
 

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

   end
 end
   end
 end