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

IZ DG MS; fix method call in public receiver

Browse source
This commit is contained in:
danielgrippi 2011-09-15 19:37:40 -07:00
parent 2bb2c6e3e8
commit 999efbd451
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/publics_controller.rb
View file

@ -5,6 +5,7 @@
class PublicsController < ApplicationController class PublicsController < ApplicationController
require File.join(Rails.root, '/lib/diaspora/parser') require File.join(Rails.root, '/lib/diaspora/parser')
require File.join(Rails.root, '/lib/postzord/receiver/public') require File.join(Rails.root, '/lib/postzord/receiver/public')
require File.join(Rails.root, '/lib/postzord/receiver/private')
include Diaspora::Parser include Diaspora::Parser
skip_before_filter :set_header_data skip_before_filter :set_header_data

3
app/models/jobs/receive_unencrypted_salmon.rb
View file

@ -1,7 +1,8 @@
# Copyright (c) 2010-2011, Diaspora Inc. This file is # Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See # licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file. # the COPYRIGHT file.
require File.join(Rails.root, 'lib/postzord/receiver/private')
require File.join(Rails.root, 'lib/postzord/receiver/public')
module Jobs module Jobs
class ReceiveUnencryptedSalmon < Base class ReceiveUnencryptedSalmon < Base

4
lib/postzord/receiver/public.rb
View file

@ -1,7 +1,7 @@
# Copyright (c) 2010-2011, Diaspora Inc. This file is # Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See # licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file. # the COPYRIGHT file.
#
module Postzord module Postzord
module Receiver module Receiver
class Public class Public
@ -25,7 +25,7 @@ module Postzord
if @object.respond_to?(:relayable?) if @object.respond_to?(:relayable?)
receive_relayable receive_relayable
else else
Resque.enqueue(Jobs::ReceiveLocalBatch, @object.id, self.recipient_user_ids) Resque.enqueue(Jobs::ReceiveLocalBatch, @object.class.to_s, @object.id, self.recipient_user_ids)
end end
end end

8
spec/lib/postzord/receiver/public_spec.rb
View file

@ -56,9 +56,15 @@ describe Postzord::Receiver::Public do
end end
it 'enqueues a Jobs::ReceiveLocalBatch' do it 'enqueues a Jobs::ReceiveLocalBatch' do
Resque.should_receive(:enqueue).with(Jobs::ReceiveLocalBatch, anything, anything) Resque.should_receive(:enqueue).with(Jobs::ReceiveLocalBatch, anything, anything, anything)
@receiver.perform! @receiver.perform!
end end
it 'intergrates' do
fantasy_resque do
@receiver.perform!
end
end
end end
end end