From 8b340ab2f62bac2af9d5917e296bb4101530282a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 15 Oct 2009 18:06:15 -0300
Subject: Revert "Rename Orchestra to Notifications [#3321 state:resolved]"

This reverts commit 8cbf825425dc8ad3770881ea4e100b9023c69ce2.
---
 actionmailer/lib/action_mailer/base.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'actionmailer')

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 24be66d197..c0c04af51c 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -394,7 +394,7 @@ module ActionMailer #:nodoc:
     def controller_path
       self.class.controller_path
     end
-
+    
     def formats
       @template.formats
     end
@@ -481,7 +481,7 @@ module ActionMailer #:nodoc:
     # Initialize the mailer via the given +method_name+. The body will be
     # rendered and a new TMail::Mail object created.
     def create!(method_name, *parameters) #:nodoc:
-      ActiveSupport::Notifications.instrument(:create_mail, :name => method_name) do
+      ActiveSupport::Orchestra.instrument(:create_mail, :name => method_name) do
         initialize_defaults(method_name)
         __send__(method_name, *parameters)
 
@@ -550,7 +550,7 @@ module ActionMailer #:nodoc:
         logger.debug "\n#{mail.encoded}"
       end
 
-      ActiveSupport::Notifications.instrument(:deliver_mail, :mail => @mail) do
+      ActiveSupport::Orchestra.instrument(:deliver_mail, :mail => @mail) do
         begin
           __send__("perform_delivery_#{delivery_method}", mail) if perform_deliveries
         rescue Exception => e # Net::SMTP errors or sendmail pipe errors
@@ -583,9 +583,9 @@ module ActionMailer #:nodoc:
         if template.respond_to?(:mime_type)
           @current_template_content_type = template.mime_type && template.mime_type.to_sym.to_s
         end
-
+        
         @template = initialize_template_class(body)
-        layout = _pick_layout(layout, true) unless
+        layout = _pick_layout(layout, true) unless 
           ActionController::Base.exempt_from_layout.include?(template.handler)
         @template._render_template(template, layout, {})
       ensure
@@ -601,16 +601,16 @@ module ActionMailer #:nodoc:
       def render(opts)
         opts[:locals] ||= {}
         layout, file = opts.delete(:layout), opts[:file]
-
+        
         begin
           @template = initialize_template_class(opts.delete(:body))
-
+          
           if file
             prefix = mailer_name unless file =~ /\//
             template = view_paths.find(file, {:formats => formats}, prefix)
           end
 
-          layout = _pick_layout(layout,
+          layout = _pick_layout(layout, 
             !template || ActionController::Base.exempt_from_layout.include?(template.handler))
 
           if template
@@ -649,7 +649,7 @@ module ActionMailer #:nodoc:
 
       def sort_parts(parts, order = [])
         order = order.collect { |s| s.downcase }
-
+        
         parts = parts.sort do |a, b|
           a_ct = a.content_type.downcase
           b_ct = b.content_type.downcase
@@ -690,7 +690,7 @@ module ActionMailer #:nodoc:
         headers.each { |k, v| m[k] = v }
 
         real_content_type, ctype_attrs = parse_content_type
-
+        
         if @parts.empty?
           m.set_content_type(real_content_type, nil, ctype_attrs)
           m.body = normalize_new_lines(body)
-- 
cgit v1.2.3