Revert "change namespace from Mail to Mailers"

This reverts commit f859904c76.

app/mailers/notification_mailers/also_commented.rb

@@ -1,7 +1,3 @@
-#   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 NotificationMailers
   class AlsoCommented < NotificationMailers::Base
     include ActionView::Helpers::TextHelper

app/mailers/notification_mailers/base.rb

@@ -1,7 +1,3 @@
-#   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 NotificationMailers
   TRUNCATION_LEN = 70
 

app/mailers/notification_mailers/comment_on_post.rb

@@ -1,7 +1,3 @@
-#   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 NotificationMailers
   class CommentOnPost < NotificationMailers::Base
     include ActionView::Helpers::TextHelper

app/mailers/notification_mailers/confirm_email.rb

@@ -1,7 +1,3 @@
-#   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 NotificationMailers
   class ConfirmEmail < NotificationMailers::Base
     def set_headers

app/mailers/notification_mailers/liked.rb

@@ -1,7 +1,3 @@
-#   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 NotificationMailers
   class Liked < NotificationMailers::Base
     attr_accessor :like

app/mailers/notification_mailers/mentioned.rb

@@ -1,7 +1,3 @@
-#   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 NotificationMailers
   class Mentioned < NotificationMailers::Base
     attr_accessor :post

app/mailers/notification_mailers/private_message.rb

@@ -1,7 +1,3 @@
-#   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 NotificationMailers
   class PrivateMessage < NotificationMailers::Base
     attr_accessor :message, :conversation, :participants

app/mailers/notification_mailers/reshared.rb

@@ -1,7 +1,3 @@
-#   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 NotificationMailers
   class Reshared < NotificationMailers::Base
     attr_accessor :reshare

app/mailers/notification_mailers/started_sharing.rb

@@ -1,7 +1,3 @@
-#   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 NotificationMailers
   class StartedSharing < NotificationMailers::Base
     def set_headers

app/mailers/notifier.rb

@@ -1,7 +1,3 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
 class Notifier < ActionMailer::Base
   helper :application
   helper :markdownify

app/models/invitation.rb

@@ -135,7 +135,7 @@ class Invitation < ActiveRecord::Base
 
   def queue_send!
     unless self.recipient.present?
-      Resque.enqueue(Jobs::Mailers::InviteUserByEmail, self.id)
+      Resque.enqueue(Jobs::Mail::InviteUserByEmail, self.id) 
     end
   end
 

app/models/jobs/base.rb

@@ -4,7 +4,7 @@
 
 module Jobs
   class Base
-    Dir["#{Rails.root}/app/models/jobs/mailers/*.rb"].each {|file| require file }
+    Dir["#{Rails.root}/app/models/jobs/mail/*.rb"].each {|file| require file }
     extend ResqueJobLogging
   end
 end

app/models/jobs/mail/also_commented.rb

@@ -1,9 +1,5 @@
-#   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 Jobs
-  module Mailers
+  module Mail
     class AlsoCommented < Base
       @queue = :mail
       def self.perform(recipient_id, sender_id, comment_id)

app/models/jobs/mail/comment_on_post.rb

@@ -1,10 +1,5 @@
-#   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 Jobs
-  module Mailers
+  module Mail
     class CommentOnPost < Base
       @queue = :mail
       def self.perform(recipient_id, sender_id, comment_id)

app/models/jobs/mail/confirm_email.rb

@@ -0,0 +1,10 @@
+module Jobs
+  module Mail
+    class ConfirmEmail < Base
+      @queue = :mail
+      def self.perform(user_id)
+        Notifier.confirm_email(user_id).deliver
+      end
+    end
+  end
+end

app/models/jobs/mail/invite_user_by_email.rb

@@ -2,8 +2,9 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+
 module Jobs
-  module Mailers
+  module Mail
     class InviteUserByEmail < Base
       @queue = :mail
       def self.perform(invite_id)

app/models/jobs/mail/liked.rb

@@ -1,9 +1,5 @@
-#   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 Jobs
-  module Mailers
+  module Mail
     class Liked < Base
       @queue = :mail
       def self.perform(recipient_id, sender_id, like_id)

app/models/jobs/mail/mentioned.rb

@@ -2,8 +2,9 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+
 module Jobs
-  module Mailers
+  module Mail
     class Mentioned < Base
       @queue = :mail
       def self.perform(recipient_id, actor_id, target_id)

app/models/jobs/mail/private_message.rb

@@ -2,10 +2,11 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+
 module Jobs
-  module Mailers
+  module Mail
     class PrivateMessage < Base
-      @queue = :mailers
+      @queue = :mail
       def self.perform(recipient_id, actor_id, target_id)
         Notifier.private_message( recipient_id, actor_id, target_id).deliver
       end

app/models/jobs/mail/reshared.rb

@@ -1,9 +1,5 @@
-#   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 Jobs
-  module Mailers
+  module Mail
     class Reshared < Base
       @queue = :mail
       def self.perform(recipient_id, sender_id, reshare_id)

app/models/jobs/mail/started_sharing.rb

@@ -2,8 +2,9 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+
 module Jobs
-  module Mailers
+  module Mail
     class StartedSharing < Base
       @queue = :mail
       def self.perform(recipient_id, sender_id, target_id)

app/models/jobs/mailers/confirm_email.rb

@@ -1,14 +0,0 @@
-#   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 Jobs
-  module Mailers
-    class ConfirmEmail < Base
-      @queue = :mail
-      def self.perform(user_id)
-        Notifier.confirm_email(user_id).deliver
-      end
-    end
-  end
-end

app/models/jobs/resend_invitation.rb

@@ -2,6 +2,7 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+
 module Jobs
   class ResendInvitation < Base
     @queue = :mail

app/models/notifications/also_commented.rb

@@ -1,10 +1,6 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
 class Notifications::AlsoCommented < Notification
   def mail_job
-    Jobs::Mailers::AlsoCommented
+    Jobs::Mail::AlsoCommented
   end
   
   def popup_translation_key

app/models/notifications/comment_on_post.rb

@@ -1,10 +1,6 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
 class Notifications::CommentOnPost < Notification
   def mail_job
-    Jobs::Mailers::CommentOnPost
+    Jobs::Mail::CommentOnPost
   end
 
   def popup_translation_key

app/models/notifications/liked.rb

@@ -1,10 +1,6 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
 class Notifications::Liked < Notification
   def mail_job
-    Jobs::Mailers::Liked
+    Jobs::Mail::Liked
   end
   
   def popup_translation_key

app/models/notifications/mentioned.rb

@@ -1,10 +1,6 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
 class Notifications::Mentioned < Notification
   def mail_job
-    Jobs::Mailers::Mentioned
+    Jobs::Mail::Mentioned
   end
   
   def popup_translation_key

app/models/notifications/private_message.rb

@@ -1,10 +1,6 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
 class Notifications::PrivateMessage < Notification
   def mail_job
-    Jobs::Mailers::PrivateMessage
+    Jobs::Mail::PrivateMessage
   end
   def popup_translation_key
     'notifications.private_message'

app/models/notifications/request_accepted.rb

@@ -1,10 +1,6 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
 class Notifications::RequestAccepted < Notification
   def mail_job
-    Jobs::Mailers::RequestAcceptance
+    Jobs::Mail::RequestAcceptance
   end
   def popup_translation_key
     'notifications.request_accepted'

app/models/notifications/reshared.rb

@@ -1,10 +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.
-
 class Notifications::Reshared < Notification
   def mail_job
-    Jobs::Mailers::Reshared
+    Jobs::Mail::Reshared
+    #Jobs::Mail::Liked
   end
 
   def popup_translation_key

app/models/notifications/started_sharing.rb

@@ -1,10 +1,6 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
 class Notifications::StartedSharing < Notification
   def mail_job
-    Jobs::Mailers::StartedSharing
+    Jobs::Mail::StartedSharing
   end
 
   def popup_translation_key

app/models/user.rb

@@ -267,7 +267,7 @@ class User < ActiveRecord::Base
 
   ######### Mailer #######################
   def mail(job, *args)
-    pref = job.to_s.gsub('Jobs::Mailers::', '').underscore
+    pref = job.to_s.gsub('Jobs::Mail::', '').underscore
     if(self.disable_mail == false && !self.user_preferences.exists?(:email_type => pref))
       Resque.enqueue(job, *args)
     end
@@ -275,7 +275,7 @@ class User < ActiveRecord::Base
 
   def mail_confirm_email
     return false if unconfirmed_email.blank?
-    Resque.enqueue(Jobs::Mailers::ConfirmEmail, id)
+    Resque.enqueue(Jobs::Mail::ConfirmEmail, id)
     true
   end
 

spec/controllers/users_controller_spec.rb

@@ -136,7 +136,7 @@ describe UsersController do
       end
 
       it 'sends out activation email on success' do
-        Resque.should_receive(:enqueue).with(Jobs::Mailers::ConfirmEmail, @user.id).once
+        Resque.should_receive(:enqueue).with(Jobs::Mail::ConfirmEmail, @user.id).once
         put(:update, :id => @user.id, :user => { :email => "my@newemail.com"})
       end
     end

spec/models/jobs/mail/invite_user_by_email_spec.rb

@@ -1,10 +1,6 @@
-#   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 'spec_helper'
 
-describe Jobs::Mailers::InviteUserByEmail do
+describe Jobs::Mail::InviteUserByEmail do
   before do
     @sender = alice
     @email = 'bob@bob.com'
@@ -16,6 +12,6 @@ describe Jobs::Mailers::InviteUserByEmail do
     invitation = Invitation.create(:sender => @sender, :identifier => @email, :service => "email", :aspect => @aspect, :message => @message)
     invitation.should_receive(:send!)
     Invitation.stub(:find).and_return(invitation)
-    Jobs::Mailers::InviteUserByEmail.perform(invitation.id)
+    Jobs::Mail::InviteUserByEmail.perform(invitation.id)
   end
 end

spec/models/jobs/mail/mail_mentioned_spec.rb

@@ -4,7 +4,7 @@
 
 require 'spec_helper'
 
-describe Jobs::Mailers::Mentioned do
+describe Jobs::Mail::Mentioned do
   describe '#perfom' do
     it 'should call .deliver on the notifier object' do
       user = alice
@@ -15,7 +15,7 @@ describe Jobs::Mailers::Mentioned do
       mail_mock.should_receive(:deliver)
       Notifier.should_receive(:mentioned).with(user.id, sm.author.id, m.id).and_return(mail_mock)
 
-      Jobs::Mailers::Mentioned.perform(user.id, sm.author.id, m.id)
+      Jobs::Mail::Mentioned.perform(user.id, sm.author.id, m.id)
     end
   end
 end

spec/models/jobs/mail/mail_private_message.rb

@@ -4,7 +4,7 @@
 
 require 'spec_helper'
 
-describe Jobs::Mailers::PrivateMessage do
+describe Jobs::Mail::PrivateMessage do
   describe '#perfom_delegate' do
     it 'should call .deliver on the notifier object' do
       user1 = alice
@@ -21,7 +21,7 @@ describe Jobs::Mailers::PrivateMessage do
       mail_mock.should_receive(:deliver)
       Notifier.should_receive(:mentioned).with(user2.id, user1.person.id, message.id).and_return(mail_mock)
 
-      Jobs::Mailers::Mentioned.perform(user2.id, user1.person.id, message.id)
+      Jobs::Mail::Mentioned.perform(user2.id, user1.person.id, message.id)
     end
   end
 end

spec/models/jobs/mail/mail_reshared_spec.rb

@@ -4,7 +4,7 @@
 
 require 'spec_helper'
 
-describe Jobs::Mailers::Reshared do
+describe Jobs::Mail::Reshared do
   describe '#perfom' do
     it 'should call .deliver on the notifier object' do
       sm = Factory(:status_message, :author => bob.person, :public => true)
@@ -14,7 +14,7 @@ describe Jobs::Mailers::Reshared do
       mail_mock.should_receive(:deliver)
       Notifier.should_receive(:reshared).with(bob.id, reshare.author.id, reshare.id).and_return(mail_mock)
 
-      Jobs::Mailers::Reshared.perform(bob.id, reshare.author.id, reshare.id)
+      Jobs::Mail::Reshared.perform(bob.id, reshare.author.id, reshare.id)
     end
   end
 end

spec/models/user_spec.rb

@@ -661,14 +661,14 @@ describe User do
       alice.disable_mail = false
       alice.save
 
-      Resque.should_receive(:enqueue).with(Jobs::Mailers::StartedSharing, alice.id, 'contactrequestid').once
+      Resque.should_receive(:enqueue).with(Jobs::Mail::StartedSharing, alice.id, 'contactrequestid').once
-      alice.mail(Jobs::Mailers::StartedSharing, alice.id, 'contactrequestid')
+      alice.mail(Jobs::Mail::StartedSharing, alice.id, 'contactrequestid')
     end
 
     it 'does not enqueue a mail job if the correct corresponding job has a prefrence entry' do
       alice.user_preferences.create(:email_type => 'started_sharing')
       Resque.should_not_receive(:enqueue)
-      alice.mail(Jobs::Mailers::StartedSharing, alice.id, 'contactrequestid')
+      alice.mail(Jobs::Mail::StartedSharing, alice.id, 'contactrequestid')
     end
 
     it 'does not send a mail if disable_mail is set to true' do
@@ -676,7 +676,7 @@ describe User do
        alice.save
        alice.reload
        Resque.should_not_receive(:enqueue)
-      alice.mail(Jobs::Mailers::StartedSharing, alice.id, 'contactrequestid')
+      alice.mail(Jobs::Mail::StartedSharing, alice.id, 'contactrequestid')
     end
   end
 
@@ -823,12 +823,12 @@ describe User do
     describe '#mail_confirm_email' do
       it 'enqueues a mail job on user with unconfirmed email' do
         user.update_attribute(:unconfirmed_email, "alice@newmail.com")
-        Resque.should_receive(:enqueue).with(Jobs::Mailers::ConfirmEmail, alice.id).once
+        Resque.should_receive(:enqueue).with(Jobs::Mail::ConfirmEmail, alice.id).once
         alice.mail_confirm_email.should eql(true)
       end
 
       it 'enqueues NO mail job on user without unconfirmed email' do
-        Resque.should_not_receive(:enqueue).with(Jobs::Mailers::ConfirmEmail, alice.id)
+        Resque.should_not_receive(:enqueue).with(Jobs::Mail::ConfirmEmail, alice.id)
         alice.mail_confirm_email.should eql(false)
       end
     end