DG MS; renamed Salmon jobs; CGI::unescape() incoming xml in public receive route

app/controllers/publics_controller.rb

@@ -50,7 +50,7 @@ class PublicsController < ApplicationController
   end
 
   def receive_public
-    Resque.enqueue(Jobs::ReceivePublicSalmon, params[:xml])
+    Resque.enqueue(Jobs::ReceiveUnencryptedSalmon, CGI::unescape(params[:xml]))
     render :nothing => true, :status => :ok
   end
 
@@ -64,7 +64,7 @@ class PublicsController < ApplicationController
     end
 
     @user = person.owner
-    Resque.enqueue(Jobs::ReceiveSalmon, @user.id, CGI::unescape(params[:xml]))
+    Resque.enqueue(Jobs::ReceiveEncryptedSalmon, @user.id, CGI::unescape(params[:xml]))
 
     render :nothing => true, :status => 202
   end

app/models/jobs/receive_encrypted_salmon.rb

@@ -5,7 +5,7 @@
 
 require File.join(Rails.root, 'lib/postzord/receiver/private')
 module Jobs
-  class ReceiveSalmon < Base
+  class ReceiveEncryptedSalmon < Base
     @queue = :receive_salmon
 
     def self.perform(user_id, xml)

app/models/jobs/receive_unencrypted_salmon.rb

@@ -4,7 +4,7 @@
 require File.join(Rails.root, 'lib/postzord/receiver/private')
 
 module Jobs
-  class ReceivePublicSalmon < Base
+  class ReceiveUnencryptedSalmon < Base
 
     @queue = :receive
 

spec/controllers/publics_controller_spec.rb

@@ -31,9 +31,9 @@ describe PublicsController do
       response.code.should == '422'
     end
 
-    it 'enqueues a ReceivePublicSalmon job' do
+    it 'enqueues a ReceiveUnencryptedSalmon job' do
       xml = "stuff"
-      Resque.should_receive(:enqueue).with(Jobs::ReceivePublicSalmon, xml)
+      Resque.should_receive(:enqueue).with(Jobs::ReceiveUnencryptedSalmon, xml)
       post :receive_public, :xml => xml
     end
   end
@@ -47,7 +47,7 @@ describe PublicsController do
     end
 
     it 'enqueues a receive job' do
-      Resque.should_receive(:enqueue).with(Jobs::ReceiveSalmon, @user.id, xml).once
+      Resque.should_receive(:enqueue).with(Jobs::ReceiveEncryptedSalmon, @user.id, xml).once
       post :receive, "guid" => @user.person.guid.to_s, "xml" => xml
     end
 
@@ -60,7 +60,7 @@ describe PublicsController do
       salmon_factory = Salmon::EncryptedSlap.create_by_user_and_activity(@user, xml2)
       enc_xml = salmon_factory.xml_for(user2.person)
 
-      Resque.should_receive(:enqueue).with(Jobs::ReceiveSalmon, @user.id, enc_xml).once
+      Resque.should_receive(:enqueue).with(Jobs::ReceiveEncryptedSalmon, @user.id, enc_xml).once
       post :receive, "guid" => @user.person.guid.to_s, "xml" => CGI::escape(enc_xml)
     end
 

spec/models/jobs/receive_salmon_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Jobs::ReceiveSalmon do
+describe Jobs::ReceiveEncryptedSalmon do
   before do
     @user = alice
     @xml = '<xml></xml>'
@@ -18,6 +18,6 @@ describe Jobs::ReceiveSalmon do
     zord.should_receive(:perform)
     Postzord::Receiver::Private.should_receive(:new).with(@user, hash_including(:salmon_xml => @xml)).and_return(zord)
 
-    Jobs::ReceiveSalmon.perform(@user.id, @xml)
+    Jobs::ReceiveEncryptedSalmon.perform(@user.id, @xml)
   end
 end