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

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

diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb
index c4fce48d07d7badcfa86f797336ee05ed3099416..4099e16763f15554e7b33de5f35cffb7eb8885f9 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -1,9 +1,6 @@
 module Api
   class WaysController < ApiController
 module Api
   class WaysController < 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,6 +9,7 @@ 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 index
       raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]" unless params["ways"]
 
     def index
       raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]" unless params["ways"]


@@ -46,8 +44,6 @@ module Api
     end
 
     def create
     end
 
     def create

-      assert_method :put
-

       way = Way.from_xml(request.raw_post, :create => true)
 
       # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
       way = Way.from_xml(request.raw_post, :create => true)
 
       # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml