From 7b122d3988dc3607385bc59a67713a36c7eda4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 24 Nov 2015 00:52:22 -0200
Subject: Move all nodoc methods to the private section

Since they are nodoc there is no need to be protected.
---
 actionmailer/lib/action_mailer/base.rb | 86 +++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 43 deletions(-)

(limited to 'actionmailer')

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index d80fd9227a..0b12860619 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -863,49 +863,6 @@ module ActionMailer
       I18n.t(:subject, interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
     end
 
-    def collect_responses(headers) #:nodoc:
-      if block_given?
-        collector = ActionMailer::Collector.new(lookup_context) { render(action_name) }
-        yield(collector)
-        collector.responses
-      elsif headers[:body]
-        [{
-          body: headers.delete(:body),
-          content_type: self.class.default[:content_type] || "text/plain"
-        }]
-      else
-        collect_responses_from_templates(headers)
-      end
-    end
-
-    def each_template(paths, name, &block) #:nodoc:
-      templates = lookup_context.find_all(name, paths)
-      if templates.empty?
-        raise ActionView::MissingTemplate.new(paths, name, paths, false, 'mailer')
-      else
-        templates.uniq(&:formats).each(&block)
-      end
-    end
-
-    def create_parts_from_responses(m, responses) #:nodoc:
-      if responses.size == 1 && !m.has_attachments?
-        responses[0].each { |k,v| m[k] = v }
-      elsif responses.size > 1 && m.has_attachments?
-        container = Mail::Part.new
-        container.content_type = "multipart/alternative"
-        responses.each { |r| insert_part(container, r, m.charset) }
-        m.add_part(container)
-      else
-        responses.each { |r| insert_part(m, r, m.charset) }
-      end
-    end
-
-    def insert_part(container, response, charset) #:nodoc:
-      response[:charset] ||= charset
-      part = Mail::Part.new(response)
-      container.add_part(part)
-    end
-
     # Emails do not support relative path links.
     def self.supports_path?
       false
@@ -932,6 +889,21 @@ module ActionMailer
       assignable.each { |k, v| message[k] = v }
     end
 
+    def collect_responses(headers)
+      if block_given?
+        collector = ActionMailer::Collector.new(lookup_context) { render(action_name) }
+        yield(collector)
+        collector.responses
+      elsif headers[:body]
+        [{
+          body: headers.delete(:body),
+          content_type: self.class.default[:content_type] || "text/plain"
+        }]
+      else
+        collect_responses_from_templates(headers)
+      end
+    end
+
     def collect_responses_from_templates(headers)
       templates_path = headers[:template_path] || self.class.mailer_name
       templates_name = headers[:template_name] || action_name
@@ -945,6 +917,34 @@ module ActionMailer
       end
     end
 
+    def each_template(paths, name, &block)
+      templates = lookup_context.find_all(name, paths)
+      if templates.empty?
+        raise ActionView::MissingTemplate.new(paths, name, paths, false, 'mailer')
+      else
+        templates.uniq(&:formats).each(&block)
+      end
+    end
+
+    def create_parts_from_responses(m, responses)
+      if responses.size == 1 && !m.has_attachments?
+        responses[0].each { |k,v| m[k] = v }
+      elsif responses.size > 1 && m.has_attachments?
+        container = Mail::Part.new
+        container.content_type = "multipart/alternative"
+        responses.each { |r| insert_part(container, r, m.charset) }
+        m.add_part(container)
+      else
+        responses.each { |r| insert_part(m, r, m.charset) }
+      end
+    end
+
+    def insert_part(container, response, charset)
+      response[:charset] ||= charset
+      part = Mail::Part.new(response)
+      container.add_part(part)
+    end
+
     ActiveSupport.run_load_hooks(:action_mailer, self)
   end
 end
-- 
cgit v1.2.3