* Remove rails 3 deprecation warnings

* Remove release_notes as it doesn't appear to be a cap variable

README.rdoc

@@ -134,7 +134,6 @@ From version 2.1.0 to version 3.1.x:
       config[:sender_address]       = "deployment@example.com"
       config[:subject_prepend]      = "[EMPTY-CAP-DEPLOY]"
       config[:site_name]            = "Empty Example.com App"
-      config[:email_content_type]   = "text/html" # OR "text/plain" if you want the plain text version of the email
     end
 
   4. Add these two tasks to your deploy.rb:

lib/cap_mailer.rb

@@ -25,7 +25,7 @@ def self.configure_capistrano_mailer(&block)
     puts "Deprecated 'configure_capistrano_mailer'.  Please update your capistrano_mailer configuration to use 'configure' instead of 'configure_capistrano_mailer'"
   end
 
-  self.template_root = default_base_config[:template_root]
+  self.prepend_view_path default_base_config[:template_root]
 
   def self.reloadable?() false end
 
@@ -43,7 +43,8 @@ def notification_email(cap, config = {}, *args)
           :revision           => cap.revision,
           :real_revision      => cap.real_revision,
           :release_name       => cap.release_name,
-          :release_notes      => cap.release_notes,
+          #This does not appear to be a capistrano variable:
+          #:release_notes      => cap.release_notes,
           :version_dir        => cap.version_dir,
           :shared_dir         => cap.shared_dir,
           :current_dir        => cap.current_dir,
@@ -78,13 +79,14 @@ def notification_email(cap, config = {}, *args)
       front = front.slice(0..x)
     end
     @repo_end = repo.sub(front, '')
-
-    subject       subject_line
-    recipients    @config[:recipient_addresses]
-    from          @config[:sender_address]
-    content_type  @config[:email_content_type]
 
-    body          body_data_hash
+    body_data_hash.each_pair do |k, v|
+      self.instance_variable_set("@#{k}", v)
+    end
+
+    mail :subject       => subject_line,
+         :to            => @config[:recipient_addresses],
+         :from          => @config[:sender_address]
   end
 
   private

lib/capistrano/mailer.rb

@@ -14,7 +14,7 @@ module Capistrano
   class Configuration
     module CapistranoMailer
       def send_notification_email(cap, config = {}, *args)
-        CapMailer.deliver_notification_email(cap, config, *args)
+        CapMailer.notification_email(cap, config, *args).deliver
       end
     end