X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fa3c97d6a69ae9937a49eb38fce434e122a6678c..62346c7e88901df3ca21afc142cab00f6fb6ae38:/app/controllers/user_preference_controller.rb?ds=sidebyside

diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb
index 3a48ee65e..bf9bab213 100644
--- a/app/controllers/user_preference_controller.rb
+++ b/app/controllers/user_preference_controller.rb
@@ -1,99 +1,87 @@
 # Update and read user preferences, which are arbitrayr key/val pairs
 class UserPreferenceController < ApplicationController
-  before_filter :authorize
-
-  def read_one
-    pref = UserPreference.find(@user.id, params[:preference_key])
-
-    if pref
-      render :text => pref.v.to_s
-    else
-      render :text => 'OH NOES! PREF NOT FOUND!', :status => 404
-    end
-  end
-
-  def update_one
-    begin
-      pref = UserPreference.find(@user.id, params[:preference_key])
-      pref.v = request.raw_post.chomp
-      pref.save
-    rescue ActiveRecord::RecordNotFound 
-      pref = UserPreference.new
-      pref.user = @user
-      pref.k = params[:preference_key]
-      pref.v = request.raw_post.chomp
-      pref.save
-    end
-
-    render :nothing => true
-  end
-
-  def delete_one
-    UserPreference.delete(@user.id, params[:preference_key])
-
-    render :nothing => true
-  end
-
-  # print out all the preferences as a big xml block
+  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
 
-    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"
   end
 
+  ##
+  # return the value for a single preference
+  def read_one
+    pref = UserPreference.find([@user.id, params[:preference_key]])
+
+    render :text => pref.v.to_s, :content_type => "text/plain"
+  end
+
   # update the entire set of preferences
   def update
-    begin
-      p = XML::Parser.string(request.raw_post)
-      doc = p.parse
+    old_preferences = @user.preferences.each_with_object({}) do |preference, preferences|
+      preferences[preference.k] = preference
+    end
+
+    new_preferences = {}
 
-      prefs = []
+    doc = XML::Parser.string(request.raw_post, :options => XML::Parser::Options::NOERROR).parse
 
-      keyhash = {}
+    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"])
+      else
+        preference = @user.preferences.build(:k => pt["k"], :v => pt["v"])
+      end
 
-      doc.find('//preferences/preference').each do |pt|
-        pref = UserPreference.new
+      new_preferences[preference.k] = preference
+    end
 
-        unless keyhash[pt['k']].nil? # already have that key
-          render :text => 'OH NOES! CAN HAS UNIQUE KEYS?', :status => :not_acceptable
-          return
-        end
+    old_preferences.each_value(&:delete)
 
-        keyhash[pt['k']] = 1
+    new_preferences.each_value(&:save!)
 
-        pref.k = pt['k']
-        pref.v = pt['v']
-        pref.user_id = @user.id
-        prefs << pref
-      end
+    render :text => "", :content_type => "text/plain"
+  end
 
-      if prefs.size > 150
-        render :text => 'Too many preferences', :status => :request_entity_too_large
-        return
-      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.new
+      pref.user = @user
+      pref.k = params[:preference_key]
+    end
 
-      # kill the existing ones
-      UserPreference.delete_all(['user_id = ?', @user.id])
+    pref.v = request.raw_post.chomp
+    pref.save!
 
-      # save the new ones
-      prefs.each do |pref|
-        pref.save!
-      end
+    render :text => "", :content_type => "text/plain"
+  end
 
-    rescue Exception => ex
-      render :text => 'OH NOES! FAIL!: ' + ex.to_s, :status => :internal_server_error
-      return
-    end
+  ##
+  # delete a single preference
+  def delete_one
+    UserPreference.find([@user.id, params[:preference_key]]).delete
 
-    render :nothing => true
+    render :text => "", :content_type => "text/plain"
   end
 end