nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moved an ostatus builder query out to the controller, where it belongs, and corrected the order

Browse source
This commit is contained in:
maxwell 2011-03-09 17:33:47 -08:00
parent 9d480b0961
commit 1ac688f82c
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/users_controller.rb
View file

@ -68,8 +68,9 @@ class UsersController < ApplicationController
user = User.find_by_username(params[:username])
if user
posts = Post.where(:author_id => user.person.id, :public => true).order('created_at DESC')
director = Diaspora::Director.new
ostatus_builder = Diaspora::OstatusBuilder.new(user)
ostatus_builder = Diaspora::OstatusBuilder.new(user, posts)
render :xml => director.build(ostatus_builder), :content_type => 'application/atom+xml'
else

4
lib/diaspora/ostatus_builder.rb
View file

@ -21,9 +21,9 @@ module Diaspora
class OstatusBuilder
include Diaspora::Webhooks
def initialize(user)
def initialize(user, posts)
@user = user
@posts = Post.where(:author_id => @user.person.id, :public => true)
@posts = posts
end
def create_headers

3
spec/lib/diaspora/ostatus_builder.rb
View file

@ -22,11 +22,10 @@ describe Diaspora::OstatusBuilder do
arr << s
end
}
let!(:atom) { director = Diaspora::Director.new; director.build(Diaspora::OstatusBuilder.new(user)) }
let!(:atom) { director = Diaspora::Director.new; director.build(Diaspora::OstatusBuilder.new(user, public_status_messages)) }
it 'should include a users posts' do
public_status_messages.each{ |status| atom.should include status.message }
private_status_messages.each{ |status| atom.should_not include status.message }
end
end