Merge branch 'master' of github.com:diaspora/diaspora

app/controllers/users_controller.rb

@@ -4,6 +4,7 @@
 
 class UsersController < ApplicationController
   require File.expand_path('../../../lib/diaspora/ostatus_builder', __FILE__)
+  require File.expand_path('../../../lib/diaspora/exporter', __FILE__)
 
   before_filter :authenticate_user!, :except => [:new, :create, :public]
 
@@ -56,6 +57,11 @@ class UsersController < ApplicationController
     end
   end
 
+  def export
+    exporter = Diaspora::Exporter.new(Diaspora::Exporters::XML)
+    render :xml => exporter.execute(current_user) 
+  end
+
   private
   def prep_image_url(params)
     url = APP_CONFIG[:pod_url].chop if APP_CONFIG[:pod_url][-1,1] == '/'

config/routes.rb

@@ -14,7 +14,8 @@ Diaspora::Application.routes.draw do
                                       :password      => "devise/passwords"}
   # added public route to user
   match 'public/:username', :to => 'users#public'
-  resources :users,               :except => [:create, :new, :show]
+  match 'users/export',     :to => 'users#export'
+  resources :users,         :except => [:create, :new, :show]
 
   match 'aspects/move_friends', :to => 'aspects#move_friends', :as => 'move_friends'
   match 'aspects/move_friend',  :to => 'aspects#move_friend', :as => 'move_friend'