add individual user preference read/write, and default all new users to having public...

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 5d113910d86916f10b44e2b7e33111e7672b9241..e998e83c69d86e843f4763f2e42e41bfd295034c 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -11,6 +11,8 @@ class UserController < ApplicationController
     @title = 'create account'
     @user = User.new(params[:user])
 
+    @user.data_public = true
+      
     if @user.save
       token = @user.tokens.create
       flash[:notice] = "User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br>Please note that you won't be able to login until you've received and confirmed your email address."

diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb
index b22c522402e581cc54a1572cd6bee2757aaff42e..a4de5c099ab5cc5d580eae983680b596467a323a 100644 (file)
--- a/app/controllers/user_preference_controller.rb
+++ b/app/controllers/user_preference_controller.rb
@@ -1,8 +1,35 @@
+# Update and read user preferences, which are arbitrayr key/val pairs
 class UserPreferenceController < ApplicationController
   before_filter :authorize
 
-  def read
+  def read_one
+    pref = UserPreference.find(:first, :conditions => ['user_id = ? AND k = ?', @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
+    pref = UserPreference.find(:first, :conditions => ['user_id = ? AND k = ?', @user.id, params[:preference_key]])
+  
+    if pref
+      pref.v = request.raw_post.chomp
+      pref.save
+    else
+      pref = UserPreference.new
+      pref.user = @user
+      pref.k = params[:preference_key]
+      pref.v = request.raw_post.chomp
+      pref.save
+    end
+  end
+
 
+  # print out all the preferences as a big xml block
+  def read
     doc = OSM::API.new.get_xml_doc
 
     prefs = @user.preferences
@@ -15,9 +42,9 @@ class UserPreferenceController < ApplicationController
 
     doc.root << el1
     render :text => doc.to_s, :content_type => "text/xml"
-
   end
 
+  # update the entire set of preferences
   def update
     begin
       p = XML::Parser.new
@@ -30,12 +57,12 @@ class UserPreferenceController < ApplicationController
 
       doc.find('//preferences/preference').each do |pt|
         pref = UserPreference.new
-        
+
         unless keyhash[pt['k']].nil? # already have that key
           render :text => 'OH NOES! CAN HAS UNIQUE KEYS?', :status => :not_acceptable
           return
         end
-        
+
         keyhash[pt['k']] = 1
 
         pref.k = pt['k']

diff --git a/config/routes.rb b/config/routes.rb
index 0a03962514bde74ca16672ef3ea919647a3f391e..1444de106f02607c8f77e6278252013a74d0d009 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -42,7 +42,9 @@ ActionController::Routing::Routes.draw do |map|
   
   map.connect "api/#{API_VERSION}/user/details", :controller => 'user', :action => 'api_details'
   map.connect "api/#{API_VERSION}/user/preferences", :controller => 'user_preference', :action => 'read', :conditions => { :method => :get }
+  map.connect "api/#{API_VERSION}/user/preferences/:preference_key", :controller => 'user_preference', :action => 'read_one', :conditions => { :method => :get }
   map.connect "api/#{API_VERSION}/user/preferences", :controller => 'user_preference', :action => 'update', :conditions => { :method => :put }
+  map.connect "api/#{API_VERSION}/user/preferences/:preference_key", :controller => 'user_preference', :action => 'update_one', :conditions => { :method => :put }
   map.connect "api/#{API_VERSION}/user/gpx_files", :controller => 'user', :action => 'api_gpx_files'
  
   map.connect "api/#{API_VERSION}/gpx/create", :controller => 'trace', :action => 'api_create'

diff --git a/db/migrate/012_add_user_preference_id.rb b/db/migrate/012_add_user_preference_id.rb
new file mode 100644 (file)
index 0000000..9dee237
--- /dev/null
+++ b/db/migrate/012_add_user_preference_id.rb
@@ -0,0 +1,12 @@
+class AddUserPreferenceId < ActiveRecord::Migration
+  def self.up
+    add_column "user_preferences", "id", :bigint, :limit => 64, :null => false, :options => "AUTO_INCREMENT"
+    
+    add_index "user_preferences", ["id"], :name => "user_preferences_id_idx"
+  end
+
+  def self.down
+    remove_index 'user_preferences', 'id'
+    remove_column 'user_preferences', 'id'
+  end
+end