moved an ostatus builder query out to the controller, where it belongs, and corrected the order
This commit is contained in:
parent
9d480b0961
commit
1ac688f82c
3 changed files with 5 additions and 5 deletions
|
|
@ -68,8 +68,9 @@ class UsersController < ApplicationController
|
||||||
user = User.find_by_username(params[:username])
|
user = User.find_by_username(params[:username])
|
||||||
|
|
||||||
if user
|
if user
|
||||||
|
posts = Post.where(:author_id => user.person.id, :public => true).order('created_at DESC')
|
||||||
director = Diaspora::Director.new
|
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'
|
render :xml => director.build(ostatus_builder), :content_type => 'application/atom+xml'
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,9 @@ module Diaspora
|
||||||
class OstatusBuilder
|
class OstatusBuilder
|
||||||
include Diaspora::Webhooks
|
include Diaspora::Webhooks
|
||||||
|
|
||||||
def initialize(user)
|
def initialize(user, posts)
|
||||||
@user = user
|
@user = user
|
||||||
@posts = Post.where(:author_id => @user.person.id, :public => true)
|
@posts = posts
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_headers
|
def create_headers
|
||||||
|
|
|
||||||
|
|
@ -22,11 +22,10 @@ describe Diaspora::OstatusBuilder do
|
||||||
arr << s
|
arr << s
|
||||||
end
|
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
|
it 'should include a users posts' do
|
||||||
public_status_messages.each{ |status| atom.should include status.message }
|
public_status_messages.each{ |status| atom.should include status.message }
|
||||||
private_status_messages.each{ |status| atom.should_not include status.message }
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue