Merge branch 'pull/4793'

[rails.git] / app / controllers / api / relations_controller.rb

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index 69b145268323deac475e1d46efb85d0d7d97206b..5fb99dbd18a390e1e234308bcf78b90f05a36939 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -1,9 +1,6 @@
 module Api
   class RelationsController < ApiController
 module Api
   class RelationsController < ApiController

-    require "xml/libxml"
-

     before_action :check_api_writable, :only => [:create, :update, :delete]
     before_action :check_api_writable, :only => [:create, :update, :delete]

-    before_action :check_api_readable, :except => [:create, :update, :delete]

     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource
     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource


@@ -12,15 +9,22 @@ module Api
     around_action :api_call_handle_error, :api_call_timeout
 
     before_action :set_request_formats, :except => [:create, :update, :delete]
     around_action :api_call_handle_error, :api_call_timeout
 
     before_action :set_request_formats, :except => [:create, :update, :delete]

+    before_action :check_rate_limit, :only => [:create, :update, :delete]

 
 

-    def create
-      assert_method :put
+    def index
+      raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"]

 
 

-      relation = Relation.from_xml(request.raw_post, :create => true)
+      ids = params["relations"].split(",").collect(&:to_i)

 
 

-      # 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
+      raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty?
+
+      @relations = Relation.find(ids)
+
+      # Render the result
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
 
     def show
     end
 
     def show


@@ -37,6 +41,14 @@ module Api
       end
     end
 
       end
     end
 

+    def create
+      relation = Relation.from_xml(request.raw_post, :create => 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 update
       logger.debug request.raw_post
 
     def update
       logger.debug request.raw_post
 


@@ -131,22 +143,6 @@ module Api
       end
     end
 
       end
     end
 

-    def index
-      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)
-
-      raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty?
-
-      @relations = Relation.find(ids)
-
-      # Render the result
-      respond_to do |format|
-        format.xml
-        format.json
-      end
-    end
-

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