X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/501d13e1c0936cc3ba3d9639620517bae34e5784..6e0ca57e2f8a492c29d98264e7e74b3661b87308:/app/controllers/user_preference_controller.rb?ds=inline diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb index a3face30d..16165513a 100644 --- a/app/controllers/user_preference_controller.rb +++ b/app/controllers/user_preference_controller.rb @@ -1,92 +1,87 @@ # Update and read user preferences, which are arbitrayr key/val pairs class UserPreferenceController < ApplicationController - skip_before_filter :verify_authenticity_token - before_filter :authorize - before_filter :require_allow_read_prefs, :only => [:read_one, :read] - before_filter :require_allow_write_prefs, :except => [:read_one, :read] - around_filter :api_call_handle_error + skip_before_action :verify_authenticity_token + before_action :authorize + before_action :require_allow_read_prefs, :only => [:read_one, :read] + before_action :require_allow_write_prefs, :except => [:read_one, :read] + around_action :api_call_handle_error ## # return all the preferences as an XML document def read doc = OSM::API.new.get_xml_doc - prefs = @user.preferences + prefs = current_user.preferences - el1 = XML::Node.new 'preferences' + el1 = XML::Node.new "preferences" prefs.each do |pref| - el1 << pref.to_xml_node + el1 << pref.to_xml_node end doc.root << el1 - render :text => doc.to_s, :content_type => "text/xml" + render :xml => doc.to_s end ## # return the value for a single preference def read_one - pref = UserPreference.find([@user.id, params[:preference_key]]) + pref = UserPreference.find([current_user.id, params[:preference_key]]) - render :text => pref.v.to_s, :content_type => "text/plain" + render :plain => pref.v.to_s end # update the entire set of preferences def update - old_preferences = @user.preferences.reduce({}) do |preferences,preference| + old_preferences = current_user.preferences.each_with_object({}) do |preference, preferences| preferences[preference.k] = preference - preferences end new_preferences = {} - doc = XML::Parser.string(request.raw_post).parse + doc = XML::Parser.string(request.raw_post, :options => XML::Parser::Options::NOERROR).parse - doc.find('//preferences/preference').each do |pt| + doc.find("//preferences/preference").each do |pt| if preference = old_preferences.delete(pt["k"]) preference.v = pt["v"] elsif new_preferences.include?(pt["k"]) - raise OSM::APIDuplicatePreferenceError.new(pt["k"]) + raise OSM::APIDuplicatePreferenceError, pt["k"] else - preference = @user.preferences.build(:k => pt["k"], :v => pt["v"]) + preference = current_user.preferences.build(:k => pt["k"], :v => pt["v"]) end new_preferences[preference.k] = preference end - old_preferences.each_value do |preference| - preference.delete - end + old_preferences.each_value(&:delete) - new_preferences.each_value do |preference| - preference.save! - end + new_preferences.each_value(&:save!) - render :text => "", :content_type => "text/plain" + render :plain => "" end ## # update the value of a single preference def update_one begin - pref = UserPreference.find([@user.id, params[:preference_key]]) - rescue ActiveRecord::RecordNotFound + pref = UserPreference.find([current_user.id, params[:preference_key]]) + rescue ActiveRecord::RecordNotFound pref = UserPreference.new - pref.user = @user + pref.user = current_user pref.k = params[:preference_key] end pref.v = request.raw_post.chomp pref.save! - render :text => "", :content_type => "text/plain" + render :plain => "" end ## # delete a single preference def delete_one - UserPreference.find([@user.id, params[:preference_key]]).delete + UserPreference.find([current_user.id, params[:preference_key]]).delete - render :text => "", :content_type => "text/plain" + render :plain => "" end end