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

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

diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb
index 7d6fc8e236a1b35215084acef64a523b471a4b92..78ab45308e874a9d7e56cad7efab1c6d63ca32c4 100644 (file)
--- a/app/controllers/user_preference_controller.rb
+++ b/app/controllers/user_preference_controller.rb
@@ -1,10 +1,10 @@
 # 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
@@ -13,10 +13,10 @@ class UserPreferenceController < ApplicationController
 
     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
@@ -33,16 +33,15 @@ class UserPreferenceController < ApplicationController
 
   # update the entire set of preferences
   def update
-    old_preferences = @user.preferences.reduce({}) do |preferences,preference|
+    old_preferences = @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.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"])
@@ -54,13 +53,9 @@ class UserPreferenceController < ApplicationController
       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"
   end