提交 b8655768 编写于 作者: J José Valim

Merge pull request #1268 from ernie/compute_asset_host_fix

Redundant condition in compute_asset_host is redundant.
...@@ -55,11 +55,11 @@ def rewrite_host_and_protocol(source, has_request) ...@@ -55,11 +55,11 @@ def rewrite_host_and_protocol(source, has_request)
# Pick an asset host for this source. Returns +nil+ if no host is set, # Pick an asset host for this source. Returns +nil+ if no host is set,
# the host if no wildcard is set, the host interpolated with the # the host if no wildcard is set, the host interpolated with the
# numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4), # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4),
# or the value returned from invoking the proc if it's a proc or the value from # or the value returned from invoking call on an object responding to call
# invoking call if it's an object responding to call. # (proc or otherwise).
def compute_asset_host(source) def compute_asset_host(source)
if host = config.asset_host if host = config.asset_host
if host.is_a?(Proc) || host.respond_to?(:call) if host.respond_to?(:call)
case host.is_a?(Proc) ? host.arity : host.method(:call).arity case host.is_a?(Proc) ? host.arity : host.method(:call).arity
when 2 when 2
request = controller.respond_to?(:request) && controller.request request = controller.respond_to?(:request) && controller.request
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册