Merge remote-tracking branch 'upstream/pull/1986'

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 22a8d2831b7b7833e06619769d5c1dfa79fcbe8a..059fb8d7e5bc32a7dca26128a705b800c4b0c16d 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -1,37 +1,31 @@
 class RelationController < ApplicationController
   require "xml/libxml"
 
 class RelationController < ApplicationController
   require "xml/libxml"
 

-  skip_before_filter :verify_authenticity_token
-  before_filter :authorize, :only => [:create, :update, :delete]
-  before_filter :require_allow_write_api, :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
-  around_filter :api_call_handle_error, :api_call_timeout
+  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
     assert_method :put
 
     relation = Relation.from_xml(request.raw_post, true)
 
 
   def create
     assert_method :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
+    # 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
     relation = Relation.find(params[:id])
     response.last_modified = relation.timestamp
     if relation.visible
   end
 
   def read
     relation = Relation.find(params[:id])
     response.last_modified = relation.timestamp
     if relation.visible

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

     else
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
     end
   end
 


@@ -41,22 +35,20 @@ class RelationController < ApplicationController
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
 
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
 

-    if new_relation && new_relation.id == relation.id
-      relation.update_from new_relation, @user
-      render :text => relation.version.to_s, :content_type => "text/plain"
-    else
-      render :text => "", :status => :bad_request
-    end
+    raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})" unless new_relation && new_relation.id == relation.id
+
+    relation.update_from new_relation, current_user
+    render :plain => relation.version.to_s

   end
 
   def delete
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
     if new_relation && new_relation.id == relation.id
   end
 
   def delete
     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, @user)
-      render :text => relation.version.to_s, :content_type => "text/plain"
+      relation.delete_with_history!(new_relation, current_user)
+      render :plain => relation.version.to_s

     else
     else

-      render :text => "", :status => :bad_request
+      head :bad_request

     end
   end
 
     end
   end
 


@@ -97,7 +89,6 @@ class RelationController < ApplicationController
       # create XML.
       doc = OSM::API.new.get_xml_doc
       visible_nodes = {}
       # create XML.
       doc = OSM::API.new.get_xml_doc
       visible_nodes = {}

-      visible_members = { "Node" => {}, "Way" => {}, "Relation" => {} }

       changeset_cache = {}
       user_display_name_cache = {}
 
       changeset_cache = {}
       user_display_name_cache = {}
 


@@ -106,42 +97,35 @@ class RelationController < ApplicationController
 
         doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
         visible_nodes[node.id] = node
 
         doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
         visible_nodes[node.id] = node

-        visible_members["Node"][node.id] = true

       end
 
       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)
       end
 
       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
 
       relations.each do |rel|
         next unless rel.visible? # should be unnecessary if data is consistent.
 
       end
 
       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
+        doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache)

       end
 
       # finally add self and output
       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"
+      doc.root << relation.to_xml_node(changeset_cache, user_display_name_cache)
+      render :xml => doc.to_s

 
     else
 
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
   def relations
     end
   end
 
   def relations

-    unless params["relations"]
-      fail OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")
-    end
+    raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"]

 
     ids = params["relations"].split(",").collect(&:to_i)
 
 
     ids = params["relations"].split(",").collect(&:to_i)
 

-    if ids.length == 0
-      fail OSM::APIBadUserInput.new("No relations were given to search for")
-    end
+    raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty?

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


@@ -149,7 +133,7 @@ class RelationController < ApplicationController
       doc.root << relation.to_xml_node
     end
 
       doc.root << relation.to_xml_node
     end
 

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

   end
 
   def relations_for_way
   end
 
   def relations_for_way


@@ -173,6 +157,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