From 999efbd451c8a41399d8f485b35d44066048bbef Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Thu, 15 Sep 2011 19:37:40 -0700
Subject: [PATCH] IZ DG MS; fix method call in public receiver
---
app/controllers/publics_controller.rb | 1 +
app/models/jobs/receive_unencrypted_salmon.rb | 3 ++-
lib/postzord/receiver/public.rb | 4 ++--
spec/lib/postzord/receiver/public_spec.rb | 8 +++++++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index d39cdfc445..e9e83a9575 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -5,6 +5,7 @@
class PublicsController < ApplicationController
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/private')
include Diaspora::Parser
skip_before_filter :set_header_data
diff --git a/app/models/jobs/receive_unencrypted_salmon.rb b/app/models/jobs/receive_unencrypted_salmon.rb
index 21354ce8e4..1b6c44f2c9 100644
--- a/app/models/jobs/receive_unencrypted_salmon.rb
+++ b/app/models/jobs/receive_unencrypted_salmon.rb
@@ -1,7 +1,8 @@
# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
-require File.join(Rails.root, 'lib/postzord/receiver/private')
+
+require File.join(Rails.root, 'lib/postzord/receiver/public')
module Jobs
class ReceiveUnencryptedSalmon < Base
diff --git a/lib/postzord/receiver/public.rb b/lib/postzord/receiver/public.rb
index 59c8e18a4e..5ba887afd8 100644
--- a/lib/postzord/receiver/public.rb
+++ b/lib/postzord/receiver/public.rb
@@ -1,7 +1,7 @@
# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
-#
+
module Postzord
module Receiver
class Public
@@ -25,7 +25,7 @@ module Postzord
if @object.respond_to?(:relayable?)
receive_relayable
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
diff --git a/spec/lib/postzord/receiver/public_spec.rb b/spec/lib/postzord/receiver/public_spec.rb
index 777941d818..9b05321490 100644
--- a/spec/lib/postzord/receiver/public_spec.rb
+++ b/spec/lib/postzord/receiver/public_spec.rb
@@ -56,9 +56,15 @@ describe Postzord::Receiver::Public do
end
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!
end
+
+ it 'intergrates' do
+ fantasy_resque do
+ @receiver.perform!
+ end
+ end
end
end
--
GitLab