Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
1d8c4cf6
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1d8c4cf6
编写于
11月 16, 2008
作者:
M
Mike Gunderloy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix markup for cattr_accessors in Action View and Action Mailer to work better with RDoc 2+.
上级
b58d0a94
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
76 addition
and
45 deletion
+76
-45
actionmailer/lib/action_mailer/base.rb
actionmailer/lib/action_mailer/base.rb
+68
-43
actionpack/lib/action_view/base.rb
actionpack/lib/action_view/base.rb
+6
-2
actionpack/lib/action_view/template_handlers/erb.rb
actionpack/lib/action_view/template_handlers/erb.rb
+2
-0
未找到文件。
actionmailer/lib/action_mailer/base.rb
浏览文件 @
1d8c4cf6
...
...
@@ -201,49 +201,7 @@ module ActionMailer #:nodoc:
# end
#
#
# = Configuration options
#
# These options are specified on the class level, like <tt>ActionMailer::Base.template_root = "/my/templates"</tt>
#
# * <tt>template_root</tt> - Determines the base from which template references will be made.
#
# * <tt>logger</tt> - the logger is used for generating information on the mailing run if available.
# Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.
#
# * <tt>smtp_settings</tt> - Allows detailed configuration for <tt>:smtp</tt> delivery method:
# * <tt>:address</tt> - Allows you to use a remote mail server. Just change it from its default "localhost" setting.
# * <tt>:port</tt> - On the off chance that your mail server doesn't run on port 25, you can change it.
# * <tt>:domain</tt> - If you need to specify a HELO domain, you can do it here.
# * <tt>:user_name</tt> - If your mail server requires authentication, set the username in this setting.
# * <tt>:password</tt> - If your mail server requires authentication, set the password in this setting.
# * <tt>:authentication</tt> - If your mail server requires authentication, you need to specify the authentication type here.
# This is a symbol and one of <tt>:plain</tt>, <tt>:login</tt>, <tt>:cram_md5</tt>.
#
# * <tt>sendmail_settings</tt> - Allows you to override options for the <tt>:sendmail</tt> delivery method.
# * <tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>.
# * <tt>:arguments</tt> - The command line arguments. Defaults to <tt>-i -t</tt>.
#
# * <tt>raise_delivery_errors</tt> - Whether or not errors should be raised if the email fails to be delivered.
#
# * <tt>delivery_method</tt> - Defines a delivery method. Possible values are <tt>:smtp</tt> (default), <tt>:sendmail</tt>, and <tt>:test</tt>.
#
# * <tt>perform_deliveries</tt> - Determines whether <tt>deliver_*</tt> methods are actually carried out. By default they are,
# but this can be turned off to help functional testing.
#
# * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with <tt>delivery_method :test</tt>. Most useful
# for unit and functional testing.
#
# * <tt>default_charset</tt> - The default charset used for the body and to encode the subject. Defaults to UTF-8. You can also
# pick a different charset from inside a method with +charset+.
# * <tt>default_content_type</tt> - The default content type used for the main part of the message. Defaults to "text/plain". You
# can also pick a different content type from inside a method with +content_type+.
# * <tt>default_mime_version</tt> - The default mime version used for the message. Defaults to <tt>1.0</tt>. You
# can also pick a different value from inside a method with +mime_version+.
# * <tt>default_implicit_parts_order</tt> - When a message is built implicitly (i.e. multiple parts are assembled from templates
# which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to
# <tt>["text/html", "text/enriched", "text/plain"]</tt>. Items that appear first in the array have higher priority in the mail client
# and appear last in the mime encoded message. You can also pick a different order from inside a method with
# +implicit_parts_order+.
# Configuration options are specified on the class level, like <tt>ActionMailer::Base.template_root = "/my/templates"</tt>
class
Base
include
AdvAttrAccessor
,
PartContainer
if
Object
.
const_defined?
(
:ActionController
)
...
...
@@ -254,6 +212,10 @@ class Base
private_class_method
:new
#:nodoc:
class_inheritable_accessor
:view_paths
##
# :singleton-method:
# The logger is used for generating information on the mailing run if available.
# Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.
cattr_accessor
:logger
@@smtp_settings
=
{
...
...
@@ -264,88 +226,150 @@ class Base
:password
=>
nil
,
:authentication
=>
nil
}
##
# :singleton-method:
# Allows detailed configuration for <tt>:smtp</tt> delivery method:
# * <tt>:address</tt> - Allows you to use a remote mail server. Just change it from its default "localhost" setting.
# * <tt>:port</tt> - On the off chance that your mail server doesn't run on port 25, you can change it.
# * <tt>:domain</tt> - If you need to specify a HELO domain, you can do it here.
# * <tt>:user_name</tt> - If your mail server requires authentication, set the username in this setting.
# * <tt>:password</tt> - If your mail server requires authentication, set the password in this setting.
# * <tt>:authentication</tt> - If your mail server requires authentication, you need to specify the authentication type here.
# This is a symbol and one of <tt>:plain</tt>, <tt>:login</tt>, <tt>:cram_md5</tt>.
cattr_accessor
:smtp_settings
@@sendmail_settings
=
{
:location
=>
'/usr/sbin/sendmail'
,
:arguments
=>
'-i -t'
}
##
# :singleton-method:
# Allows you to override options for the <tt>:sendmail</tt> delivery method.
# * <tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>.
# * <tt>:arguments</tt> - The command line arguments. Defaults to <tt>-i -t</tt>.
cattr_accessor
:sendmail_settings
@@raise_delivery_errors
=
true
##
# :singleton-method:
# Whether or not errors should be raised if the email fails to be delivered.
cattr_accessor
:raise_delivery_errors
##
# :singleton-method:
# Defines a delivery method. Possible values are <tt>:smtp</tt> (default), <tt>:sendmail</tt>, and <tt>:test</tt>.
superclass_delegating_accessor
:delivery_method
self
.
delivery_method
=
:smtp
@@perform_deliveries
=
true
##
# :singleton-method:
# Determines whether <tt>deliver_*</tt> methods are actually carried out. By default they are,
# but this can be turned off to help functional testing.
cattr_accessor
:perform_deliveries
@@deliveries
=
[]
##
# :singleton-method:
# Keeps an array of all the emails sent out through the Action Mailer with <tt>delivery_method :test</tt>. Most useful
# for unit and functional testing.
cattr_accessor
:deliveries
@@default_charset
=
"utf-8"
##
# :singleton-method:
# The default charset used for the body and to encode the subject. Defaults to UTF-8. You can also
# pick a different charset from inside a method with +charset+.
cattr_accessor
:default_charset
@@default_content_type
=
"text/plain"
##
# :singleton-method:
# The default content type used for the main part of the message. Defaults to "text/plain". You
# can also pick a different content type from inside a method with +content_type+.
cattr_accessor
:default_content_type
@@default_mime_version
=
"1.0"
##
# :singleton-method:
# The default mime version used for the message. Defaults to <tt>1.0</tt>. You
# can also pick a different value from inside a method with +mime_version+.
cattr_accessor
:default_mime_version
@@default_implicit_parts_order
=
[
"text/html"
,
"text/enriched"
,
"text/plain"
]
##
# :singleton-method:
# When a message is built implicitly (i.e. multiple parts are assembled from templates
# which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to
# <tt>["text/html", "text/enriched", "text/plain"]</tt>. Items that appear first in the array have higher priority in the mail client
# and appear last in the mime encoded message. You can also pick a different order from inside a method with
# +implicit_parts_order+.
cattr_accessor
:default_implicit_parts_order
cattr_reader
:protected_instance_variables
@@protected_instance_variables
=
%w(@body)
##
# Specify the BCC addresses for the message
adv_attr_accessor
:bcc
##
# Define the body of the message. This is either a Hash (in which case it
# specifies the variables to pass to the template when it is rendered),
# or a string, in which case it specifies the actual text of the message.
adv_attr_accessor
:body
##
# Specify the CC addresses for the message.
adv_attr_accessor
:cc
##
# Specify the charset to use for the message. This defaults to the
# +default_charset+ specified for ActionMailer::Base.
adv_attr_accessor
:charset
##
# Specify the content type for the message. This defaults to <tt>text/plain</tt>
# in most cases, but can be automatically set in some situations.
adv_attr_accessor
:content_type
##
# Specify the from address for the message.
adv_attr_accessor
:from
##
# Specify the address (if different than the "from" address) to direct
# replies to this message.
adv_attr_accessor
:reply_to
##
# Specify additional headers to be added to the message.
adv_attr_accessor
:headers
##
# Specify the order in which parts should be sorted, based on content-type.
# This defaults to the value for the +default_implicit_parts_order+.
adv_attr_accessor
:implicit_parts_order
##
# Defaults to "1.0", but may be explicitly given if needed.
adv_attr_accessor
:mime_version
##
# The recipient addresses for the message, either as a string (for a single
# address) or an array (for multiple addresses).
adv_attr_accessor
:recipients
##
# The date on which the message was sent. If not set (the default), the
# header will be set by the delivery agent.
adv_attr_accessor
:sent_on
##
# Specify the subject of the message.
adv_attr_accessor
:subject
##
# Specify the template name to use for current message. This is the "base"
# template name, without the extension or directory, and may be used to
# have multiple mailer methods share the same template.
...
...
@@ -432,6 +456,7 @@ def register_template_extension(extension)
"Use ActionView::Base.register_template_extension instead"
,
caller
)
end
# Determines the base from which template references will be made.
def
template_root
self
.
view_paths
&&
self
.
view_paths
.
first
end
...
...
actionpack/lib/action_view/base.rb
浏览文件 @
1d8c4cf6
...
...
@@ -183,13 +183,17 @@ def self.exempt_from_layout(*extensions)
@@exempt_from_layout
.
merge
(
regexps
)
end
@@debug_rjs
=
false
##
# :singleton-method:
# Specify whether RJS responses should be wrapped in a try/catch block
# that alert()s the caught exception (and then re-raises it).
@@debug_rjs
=
false
cattr_accessor
:debug_rjs
# A warning will be displayed whenever an action results in a cache miss on your view paths.
@@warn_cache_misses
=
false
##
# :singleton-method:
# A warning will be displayed whenever an action results in a cache miss on your view paths.
cattr_accessor
:warn_cache_misses
attr_internal
:request
...
...
actionpack/lib/action_view/template_handlers/erb.rb
浏览文件 @
1d8c4cf6
...
...
@@ -42,6 +42,8 @@ module TemplateHandlers
class
ERB
<
TemplateHandler
include
Compilable
##
# :singleton-method:
# Specify trim mode for the ERB compiler. Defaults to '-'.
# See ERb documentation for suitable values.
cattr_accessor
:erb_trim_mode
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录