kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Make more Template methods public to make ActionMailer tests pass

Browse source
This commit is contained in:
Carl Lerche & Yehuda Katz 2009-04-16 11:57:27 -07:00
parent 256b0ee8e3
commit b49027e188
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionmailer/lib/action_mailer/base.rb
View file

@ -474,7 +474,7 @@ module ActionMailer #:nodoc:
# have not already been specified manually.
if @parts.empty?
Dir.glob("#{template_path}/#{@template}.*").each do |path|
template = template_root.find_template("#{mailer_name}/#{File.basename(path)}")
template = template_root.find_by_parts("#{mailer_name}/#{File.basename(path)}")
# Skip unless template has a multipart format
next unless template && template.multipart?

14
actionpack/lib/action_view/template/template.rb
View file

@ -95,13 +95,6 @@ module ActionView #:nodoc:
end
memoize :mime_type
private
def format_and_extension
(extensions = [format, extension].compact.join(".")).blank? ? nil : extensions
end
memoize :format_and_extension
def multipart?
format && format.include?('.')
end
@ -110,6 +103,13 @@ module ActionView #:nodoc:
format.gsub('.', '/')
end
private
def format_and_extension
(extensions = [format, extension].compact.join(".")).blank? ? nil : extensions
end
memoize :format_and_extension
def mtime
File.mtime(filename)
end