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

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 132b78e9b54dc2f1fcb670ef0b1f24e52a803223..587cfce8292b6e962d3362d2eac8f18b425bbdb8 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -1,28 +1,22 @@
 class RelationController < 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
 
     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
+    # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
     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
   end
 
   def read
@@ -41,12 +35,12 @@ class RelationController < ApplicationController
     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
+    unless new_relation && new_relation.id == relation.id
+      raise OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")
     end
+
+    relation.update_from new_relation, @user
+    render :text => relation.version.to_s, :content_type => "text/plain"
   end
 
   def delete
@@ -76,9 +70,9 @@ class RelationController < ApplicationController
       # first find the ids of nodes, ways and relations referenced by this
       # relation - note that we exclude this relation just in case.
 
-      node_ids = relation.members.select { |m| m[0] == 'Node' }.map { |m| m[1] }
-      way_ids = relation.members.select { |m| m[0] == 'Way' }.map { |m| m[1] }
-      relation_ids = relation.members.select { |m| m[0] == 'Relation' && m[1] != relation.id }.map { |m| m[1] }
+      node_ids = relation.members.select { |m| m[0] == "Node" }.map { |m| m[1] }
+      way_ids = relation.members.select { |m| m[0] == "Way" }.map { |m| m[1] }
+      relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.map { |m| m[1] }
 
       # next load the relations and the ways.
 
@@ -133,14 +127,14 @@ class RelationController < ApplicationController
   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...]]")
+    unless params["relations"]
+      raise OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")
     end
 
-    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")
+    if ids.empty?
+      raise OSM::APIBadUserInput.new("No relations were given to search for")
     end
 
     doc = OSM::API.new.get_xml_doc