X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e11d734f9f965464510dd109970501861001ee5c..33790824d6b32d103e0dc69bf6877373266744fe:/app/controllers/changeset_controller.rb diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index adda8c20c..2a8fec95e 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -1,22 +1,21 @@ # The ChangesetController is the RESTful interface to Changeset objects class ChangesetController < ApplicationController - layout 'site' - require 'xml/libxml' - - skip_before_filter :verify_authenticity_token, :except => [:list] - before_filter :authorize_web, :only => [:list, :feed, :comments_feed] - before_filter :set_locale, :only => [:list, :feed, :comments_feed] - before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] - before_filter :require_moderator, :only => [:hide_comment, :unhide_comment] - before_filter :require_allow_write_api, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] - before_filter :require_public_data, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe] - before_filter :check_api_writable, :only => [:create, :update, :delete, :upload, :include, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] - before_filter :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed] - before_filter(:only => [:list, :feed, :comments_feed]) { |c| c.check_database_readable(true) } - after_filter :compress_output - around_filter :api_call_handle_error, :except => [:list, :feed, :comments_feed] - around_filter :web_timeout, :only => [:list, :feed, :comments_feed] + layout "site" + require "xml/libxml" + + skip_before_action :verify_authenticity_token, :except => [:list] + before_action :authorize_web, :only => [:list, :feed, :comments_feed] + before_action :set_locale, :only => [:list, :feed, :comments_feed] + before_action :authorize, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] + before_action :require_moderator, :only => [:hide_comment, :unhide_comment] + before_action :require_allow_write_api, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] + before_action :require_public_data, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe] + before_action :check_api_writable, :only => [:create, :update, :delete, :upload, :include, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] + before_action :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed] + before_action(:only => [:list, :feed, :comments_feed]) { |c| c.check_database_readable(true) } + around_action :api_call_handle_error, :except => [:list, :feed, :comments_feed] + around_action :web_timeout, :only => [:list, :feed, :comments_feed] # Helper methods for checking consistency include ConsistencyValidations @@ -78,15 +77,15 @@ class ChangesetController < ApplicationController check_changeset_consistency(cs, @user) # keep an array of lons and lats - lon = Array.new - lat = Array.new + lon = [] + lat = [] # the request is in pseudo-osm format... this is kind-of an # abuse, maybe should change to some other format? doc = XML::Parser.string(request.raw_post).parse doc.find("//osm/node").each do |n| - lon << n['lon'].to_f * GeoRecord::SCALE - lat << n['lat'].to_f * GeoRecord::SCALE + lon << n["lon"].to_f * GeoRecord::SCALE + lat << n["lat"].to_f * GeoRecord::SCALE end # add the existing bounding box to the lon-lat array @@ -185,14 +184,14 @@ class ChangesetController < ApplicationController created = XML::Node.new "create" created << elt.to_xml_node(changeset_cache, user_display_name_cache) else - unless elt.visible - # if the element isn't visible then it must have been deleted - deleted = XML::Node.new "delete" - deleted << elt.to_xml_node(changeset_cache, user_display_name_cache) - else + if elt.visible # must be a modify modified = XML::Node.new "modify" modified << elt.to_xml_node(changeset_cache, user_display_name_cache) + else + # if the element isn't visible then it must have been deleted + deleted = XML::Node.new "delete" + deleted << elt.to_xml_node(changeset_cache, user_display_name_cache) end end end @@ -204,19 +203,17 @@ class ChangesetController < ApplicationController # query changesets by bounding box, time, user or open/closed status. def query # find any bounding box - if params['bbox'] - bbox = BoundingBox.from_bbox_params(params) - end + bbox = BoundingBox.from_bbox_params(params) if params["bbox"] # create the conditions that the user asked for. some or all of # these may be nil. changesets = Changeset.all changesets = conditions_bbox(changesets, bbox) - changesets = conditions_user(changesets, params['user'], params['display_name']) - changesets = conditions_time(changesets, params['time']) - changesets = conditions_open(changesets, params['open']) - changesets = conditions_closed(changesets, params['closed']) - changesets = conditions_ids(changesets, params['changesets']) + changesets = conditions_user(changesets, params["user"], params["display_name"]) + changesets = conditions_time(changesets, params["time"]) + changesets = conditions_open(changesets, params["open"]) + changesets = conditions_closed(changesets, params["closed"]) + changesets = conditions_ids(changesets, params["changesets"]) # create the results document results = OSM::API.new.get_xml_doc @@ -244,21 +241,20 @@ class ChangesetController < ApplicationController changeset = Changeset.find(params[:id]) new_changeset = Changeset.from_xml(request.raw_post) - unless new_changeset.nil? + if new_changeset.nil? + render :text => "", :status => :bad_request + else check_changeset_consistency(changeset, @user) changeset.update_from(new_changeset, @user) render :text => changeset.to_xml, :mime_type => "text/xml" - else - - render :text => "", :status => :bad_request end end ## # list edits (open changesets) in reverse chronological order def list - if request.format == :atom and params[:max_id] - redirect_to params.merge({ :max_id => nil }), :status => :moved_permanently + if request.format == :atom && params[:max_id] + redirect_to params.merge(:max_id => nil), :status => :moved_permanently return end @@ -275,14 +271,14 @@ class ChangesetController < ApplicationController return end - if request.format == :html and !params[:list] + if request.format == :html && !params[:list] require_oauth render :action => :history, :layout => map_layout else changesets = conditions_nonempty(Changeset.all) if params[:display_name] - if user.data_public? or user == @user + if user.data_public? || user == @user changesets = changesets.where(:user_id => user.id) else changesets = changesets.where("false") @@ -315,8 +311,8 @@ class ChangesetController < ApplicationController # Add a comment to a changeset def comment # Check the arguments are sane - raise OSM::APIBadUserInput.new("No id was given") unless params[:id] - raise OSM::APIBadUserInput.new("No text was given") if params[:text].blank? + fail OSM::APIBadUserInput.new("No id was given") unless params[:id] + fail OSM::APIBadUserInput.new("No text was given") if params[:text].blank? # Extract the arguments id = params[:id].to_i @@ -324,24 +320,22 @@ class ChangesetController < ApplicationController # Find the changeset and check it is valid changeset = Changeset.find(id) - raise OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open? + fail OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open? # Add a comment to the changeset - comment = changeset.comments.create({ - :changeset => changeset, - :body => body, - :author => @user - }) + comment = changeset.comments.create(:changeset => changeset, + :body => body, + :author => @user) # Notify current subscribers of the new comment changeset.subscribers.each do |user| if @user != user - Notifier.changeset_comment_notification(comment, user).deliver + Notifier.changeset_comment_notification(comment, user).deliver_now end end # Add the commenter to the subscribers if necessary - changeset.subscribers << @user unless changeset.subscribers.exists?(@user) + changeset.subscribers << @user unless changeset.subscribers.exists?(@user.id) # Return a copy of the updated changeset render :text => changeset.to_xml.to_s, :content_type => "text/xml" @@ -351,15 +345,15 @@ class ChangesetController < ApplicationController # Adds a subscriber to the changeset def subscribe # Check the arguments are sane - raise OSM::APIBadUserInput.new("No id was given") unless params[:id] + fail OSM::APIBadUserInput.new("No id was given") unless params[:id] # Extract the arguments id = params[:id].to_i # Find the changeset and check it is valid changeset = Changeset.find(id) - raise OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open? - raise OSM::APIChangesetAlreadySubscribedError.new(changeset) if changeset.subscribers.exists?(@user) + fail OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open? + fail OSM::APIChangesetAlreadySubscribedError.new(changeset) if changeset.subscribers.exists?(@user.id) # Add the subscriber changeset.subscribers << @user @@ -372,15 +366,15 @@ class ChangesetController < ApplicationController # Removes a subscriber from the changeset def unsubscribe # Check the arguments are sane - raise OSM::APIBadUserInput.new("No id was given") unless params[:id] + fail OSM::APIBadUserInput.new("No id was given") unless params[:id] # Extract the arguments id = params[:id].to_i # Find the changeset and check it is valid changeset = Changeset.find(id) - raise OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open? - raise OSM::APIChangesetNotSubscribedError.new(changeset) unless changeset.subscribers.exists?(@user) + fail OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open? + fail OSM::APIChangesetNotSubscribedError.new(changeset) unless changeset.subscribers.exists?(@user.id) # Remove the subscriber changeset.subscribers.delete(@user) @@ -393,7 +387,7 @@ class ChangesetController < ApplicationController # Sets visible flag on comment to false def hide_comment # Check the arguments are sane - raise OSM::APIBadUserInput.new("No id was given") unless params[:id] + fail OSM::APIBadUserInput.new("No id was given") unless params[:id] # Extract the arguments id = params[:id].to_i @@ -412,7 +406,7 @@ class ChangesetController < ApplicationController # Sets visible flag on comment to true def unhide_comment # Check the arguments are sane - raise OSM::APIBadUserInput.new("No id was given") unless params[:id] + fail OSM::APIBadUserInput.new("No id was given") unless params[:id] # Extract the arguments id = params[:id].to_i @@ -450,7 +444,8 @@ class ChangesetController < ApplicationController end end -private + private + #------------------------------------------------------------ # utility functions below. #------------------------------------------------------------ @@ -474,21 +469,23 @@ private ## # restrict changesets to those by a particular user def conditions_user(changesets, user, name) - unless user.nil? and name.nil? + if user.nil? && name.nil? + return changesets + else # shouldn't provide both name and UID - raise OSM::APIBadUserInput.new("provide either the user ID or display name, but not both") if user and name + fail OSM::APIBadUserInput.new("provide either the user ID or display name, but not both") if user && name # use either the name or the UID to find the user which we're selecting on. u = if name.nil? # user input checking, we don't have any UIDs < 1 - raise OSM::APIBadUserInput.new("invalid user ID") if user.to_i < 1 + fail OSM::APIBadUserInput.new("invalid user ID") if user.to_i < 1 u = User.find(user.to_i) else u = User.find_by_display_name(name) end # make sure we found a user - raise OSM::APINotFoundError.new if u.nil? + fail OSM::APINotFoundError.new if u.nil? # should be able to get changesets of public users only, or # our own changesets regardless of public-ness. @@ -497,24 +494,24 @@ private # changesets if they're non-public setup_user_auth - raise OSM::APINotFoundError if @user.nil? or @user.id != u.id + fail OSM::APINotFoundError if @user.nil? || @user.id != u.id end return changesets.where(:user_id => u.id) - else - return changesets end end ## # restrict changes to those closed during a particular time period def conditions_time(changesets, time) - unless time.nil? + if time.nil? + return changesets + else # if there is a range, i.e: comma separated, then the first is # low, second is high - same as with bounding boxes. - if time.count(',') == 1 + if time.count(",") == 1 # check that we actually have 2 elements in the array times = time.split(/,/) - raise OSM::APIBadUserInput.new("bad time range") if times.size != 2 + fail OSM::APIBadUserInput.new("bad time range") if times.size != 2 from, to = times.collect { |t| DateTime.parse(t) } return changesets.where("closed_at >= ? and created_at <= ?", from, to) @@ -522,8 +519,6 @@ private # if there is no comma, assume its a lower limit on time return changesets.where("closed_at >= ?", DateTime.parse(time)) end - else - return changesets end # stupid DateTime seems to throw both of these for bad parsing, so # we have to catch both and ensure the correct code path is taken. @@ -566,9 +561,9 @@ private if ids.nil? return changesets elsif ids.empty? - raise OSM::APIBadUserInput.new("No changesets were given to search for") + fail OSM::APIBadUserInput.new("No changesets were given to search for") else - ids = ids.split(',').collect { |n| n.to_i } + ids = ids.split(",").collect(&:to_i) return changesets.where(:id => ids) end end @@ -577,17 +572,17 @@ private # eliminate empty changesets (where the bbox has not been set) # this should be applied to all changeset list displays def conditions_nonempty(changesets) - return changesets.where("num_changes > 0") + changesets.where("num_changes > 0") end ## # Get the maximum number of comments to return def comments_limit if params[:limit] - if params[:limit].to_i > 0 and params[:limit].to_i <= 10000 + if params[:limit].to_i > 0 && params[:limit].to_i <= 10000 params[:limit].to_i else - raise OSM::APIBadUserInput.new("Comments limit must be between 1 and 10000") + fail OSM::APIBadUserInput.new("Comments limit must be between 1 and 10000") end else 100