From 15a4609c1428c1701e3ece297a9288c99cb5e292 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Mon, 27 Sep 2010 22:30:16 -0700
Subject: [PATCH] moved user's public route to user controller.  changed
 person.public_url to reflect change.

---
 app/controllers/publics_controller.rb | 10 ----------
 app/controllers/users_controller.rb   | 12 +++++++++++-
 app/models/person.rb                  |  2 +-
 config/routes.rb                      |  6 ++++--
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index c4ea0d29a..e3c90fc16 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -4,7 +4,6 @@
 
 class PublicsController < ApplicationController
   require File.expand_path('../../../lib/diaspora/parser', __FILE__)
-  require File.expand_path('../../../lib/diaspora/ostatus_builder', __FILE__)
   include Diaspora::Parser
 
   layout false
@@ -42,13 +41,4 @@ class PublicsController < ApplicationController
     @user.receive_salmon params[:xml]
   end
 
-  def public
-    user = User.find_by_username(params[:username])
-
-    director = Diaspora::Director.new
-    ostatus_builder = Diaspora::OstatusBuilder.new(user)
-
-    render :xml => director.build(ostatus_builder)
-  end
-
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ac284a219..0d5c4d449 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3,7 +3,9 @@
 #   the COPYRIGHT file.
 
 class UsersController < ApplicationController
-  before_filter :authenticate_user!, :except => [:new, :create]
+  require File.expand_path('../../../lib/diaspora/ostatus_builder', __FILE__)
+
+  before_filter :authenticate_user!, :except => [:new, :create, :public]
 
   respond_to :html
 
@@ -27,6 +29,14 @@ class UsersController < ApplicationController
     respond_with(@user, :location => root_url)
   end
 
+  def public
+    user = User.find_by_username(params[:username])
+    director = Diaspora::Director.new
+    ostatus_builder = Diaspora::OstatusBuilder.new(user)
+
+    render :xml => director.build(ostatus_builder)
+  end
+
   private
   def prep_image_url(params)
     url = APP_CONFIG[:pod_url].chop if APP_CONFIG[:pod_url][-1,1] == '/'
diff --git a/app/models/person.rb b/app/models/person.rb
index 0cbde015a..28503e921 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -50,7 +50,7 @@ class Person
   end
 
   def public_url
-    "#{self.url}users/#{self.id}/public"
+    "#{self.url}users/#{self.owner.username}/public"
   end
 
 
diff --git a/config/routes.rb b/config/routes.rb
index 0a8aa2630..56ec559c9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,12 +4,15 @@
 
 Diaspora::Application.routes.draw do
   resources :people,          :only   => [:index, :show, :destroy]
-  resources :users,           :except => [:create, :new, :show]
   resources :status_messages, :only   => [:create, :destroy, :show]
   resources :comments,        :except => [:index]
   resources :requests,        :except => [:edit, :update]
   resources :photos,          :except => [:index]
   resources :albums
+  
+  # added public route to user
+  match 'users/:username/public', :to => 'users#public'
+  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'
@@ -36,7 +39,6 @@ Diaspora::Application.routes.draw do
   match 'get_to_the_choppa', :to => redirect("/signup")
   #public routes
   #
-  match 'public/:username',    :to => 'publics#public'
 
   match 'webfinger', :to => 'publics#webfinger'
   match 'hcard/users/:id',    :to => 'publics#hcard'