Fix most auto-correctable rubocop issues

[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..03cb8f191036e76ed62ddf6067ca330cf52231d6 100644 (file)
--- a/app/controllers/user_preference_controller.rb
+++ b/app/controllers/user_preference_controller.rb
@@ -33,7 +33,7 @@ class UserPreferenceController < ApplicationController
 
   # update the entire set of preferences
   def update
 
   # update the entire set of preferences
   def update

-    old_preferences = @user.preferences.reduce({}) do |preferences,preference|
+    old_preferences = @user.preferences.reduce({}) do |preferences, preference|

       preferences[preference.k] = preference
       preferences
     end
       preferences[preference.k] = preference
       preferences
     end


@@ -46,7 +46,7 @@ class UserPreferenceController < ApplicationController
       if preference = old_preferences.delete(pt["k"])
         preference.v = pt["v"]
       elsif new_preferences.include?(pt["k"])
       if preference = old_preferences.delete(pt["k"])
         preference.v = pt["v"]
       elsif new_preferences.include?(pt["k"])

-        raise OSM::APIDuplicatePreferenceError.new(pt["k"])
+        fail OSM::APIDuplicatePreferenceError.new(pt["k"])

       else
         preference = @user.preferences.build(:k => pt["k"], :v => pt["v"])
       end
       else
         preference = @user.preferences.build(:k => pt["k"], :v => pt["v"])
       end


@@ -54,13 +54,9 @@ class UserPreferenceController < ApplicationController
       new_preferences[preference.k] = preference
     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"
   end
 
     render :text => "", :content_type => "text/plain"
   end