Update bundle

[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 95f36df532a9ac1e69688459dd0b8a8850690c5c..ca4acd6113797ff373dc7eb503e1fd453154e561 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -2,21 +2,21 @@ module Api
   class WaysController < ApiController
     require "xml/libxml"
 
   class WaysController < ApiController
     require "xml/libxml"
 

+    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 :require_public_data, :only => [:create, :update, :delete]
     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource
 
     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
 
     around_action :api_call_handle_error, :api_call_timeout
 

-    before_action :default_format_xml
+    before_action :set_request_formats, :except => [:create, :update, :delete]

 
     def create
       assert_method :put
 
 
     def create
       assert_method :put
 

-      way = Way.from_xml(request.raw_post, true)
+      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.create_with_history current_user
 
       # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
       way.create_with_history current_user


@@ -43,9 +43,7 @@ module Api
       way = Way.find(params[:id])
       new_way = Way.from_xml(request.raw_post)
 
       way = Way.find(params[:id])
       new_way = Way.from_xml(request.raw_post)
 

-      unless new_way && new_way.id == way.id
-        raise OSM::APIBadUserInput, "The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})"
-      end
+      raise OSM::APIBadUserInput, "The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})" unless new_way && new_way.id == way.id

 
       way.update_from(new_way, current_user)
       render :plain => way.version.to_s
 
       way.update_from(new_way, current_user)
       render :plain => way.version.to_s


@@ -90,9 +88,7 @@ module Api
     end
 
     def index
     end
 
     def index

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

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