Cleaned up HTML

[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 377e78313ef3dde90ba92a69d174ce32afa9fc4f..bf9bab213296f1ad4bc3324b480ad89f9a4895cd 100644 (file)
--- a/app/controllers/user_preference_controller.rb
+++ b/app/controllers/user_preference_controller.rb
@@ -1,100 +1,87 @@
 # Update and read user preferences, which are arbitrayr key/val pairs
 class UserPreferenceController < ApplicationController
 # 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]
-
-  def read_one
-    pref = UserPreference.find(@user.id, params[:preference_key])
-
-    render :text => pref.v.to_s
-  rescue ActiveRecord::RecordNotFound => ex
-    render :text => 'OH NOES! PREF NOT FOUND!', :status => :not_found
-  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
-  rescue ActiveRecord::RecordNotFound => ex
-    render :text => "param: #{params[:preference_key]} not found", :status => :not_found
-  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
 
   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|
 
     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
 
     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
   # update the entire set of preferences
   def update

-    begin
-      p = XML::Parser.string(request.raw_post)
-    rescue LibXML::XML::Error, ArgumentError => ex
-      raise OSM::APIBadXMLError.new("preferences", xml, ex.message)
+    old_preferences = @user.preferences.each_with_object({}) do |preference, preferences|
+      preferences[preference.k] = preference

     end
     end

-    doc = p.parse

 
 

-    prefs = []
+    new_preferences = {}

 
 

-    keyhash = {}
-
-    doc.find('//preferences/preference').each do |pt|
-      pref = UserPreference.new
+    doc = XML::Parser.string(request.raw_post, :options => XML::Parser::Options::NOERROR).parse

 
 

-      unless keyhash[pt['k']].nil? # already have that key
-        render :text => 'OH NOES! CAN HAS UNIQUE KEYS?', :status => :not_acceptable
+    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
 
       end
 

-      keyhash[pt['k']] = 1
-
-      pref.k = pt['k']
-      pref.v = pt['v']
-      pref.user_id = @user.id
-      prefs << pref
+      new_preferences[preference.k] = preference

     end
 
     end
 

-    if prefs.size > 150
-      render :text => 'Too many preferences', :status => :request_entity_too_large
-    end
+    old_preferences.each_value(&:delete)

 
 

-    # kill the existing ones
-    UserPreference.delete_all(['user_id = ?', @user.id])
+    new_preferences.each_value(&:save!)

 
 

-    # save the new ones
-    prefs.each do |pref|
-      pref.save!
+    render :text => "", :content_type => "text/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.new
+      pref.user = @user
+      pref.k = params[:preference_key]

     end
     end

-    render :nothing => true

 
 

-  rescue Exception => ex
-    render :text => 'OH NOES! FAIL!: ' + ex.to_s, :status => :internal_server_error
+    pref.v = request.raw_post.chomp
+    pref.save!
+
+    render :text => "", :content_type => "text/plain"
+  end
+
+  ##
+  # delete a single preference
+  def delete_one
+    UserPreference.find([@user.id, params[:preference_key]]).delete
+
+    render :text => "", :content_type => "text/plain"

   end
 end
   end
 end