Merge remote-tracking branch 'openstreetmap/pull/1488'

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 3291ce8b79d37bf7e79578b932642546d3814e86..c988545c717a00c7258a06c049f6e14ad83379b9 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,26 +1,22 @@
 class WayController < ApplicationController
-  require 'xml/libxml'
+  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
 
     way = Way.from_xml(request.raw_post, true)
 
-    if way
-      way.create_with_history @user
-      render :text => way.id.to_s, :content_type => "text/plain"
-    else
-      render :text => "", :status => :bad_request
-    end
+    # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
+    way.create_with_history @user
+    render :text => way.id.to_s, :content_type => "text/plain"
   end
 
   def read
@@ -39,12 +35,12 @@ class WayController < ApplicationController
     way = Way.find(params[:id])
     new_way = Way.from_xml(request.raw_post)
 
-    if new_way and new_way.id == way.id
-      way.update_from(new_way, @user)
-      render :text => way.version.to_s, :content_type => "text/plain"
-    else
-      render :text => "", :status => :bad_request
+    unless new_way && new_way.id == way.id
+      raise OSM::APIBadUserInput.new("The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})")
     end
+
+    way.update_from(new_way, @user)
+    render :text => way.version.to_s, :content_type => "text/plain"
   end
 
   # This is the API call to delete a way
@@ -52,7 +48,7 @@ class WayController < ApplicationController
     way = Way.find(params[:id])
     new_way = Way.from_xml(request.raw_post)
 
-    if new_way and new_way.id == way.id
+    if new_way && new_way.id == way.id
       way.delete_with_history!(new_way, @user)
       render :text => way.version.to_s, :content_type => "text/plain"
     else
@@ -84,13 +80,13 @@ class WayController < ApplicationController
   end
 
   def ways
-    if not params['ways']
+    unless params["ways"]
       raise OSM::APIBadUserInput.new("The parameter ways is required, and must be of the form ways=id[,id[,id...]]")
     end
 
-    ids = params['ways'].split(',').collect { |w| w.to_i }
+    ids = params["ways"].split(",").collect(&:to_i)
 
-    if ids.length == 0
+    if ids.empty?
       raise OSM::APIBadUserInput.new("No ways were given to search for")
     end