提交 63e14a79 编写于 作者: X Xavier Noria

Merge pull request #4118 from nashby/remove-file-to-path

remove File#to_path alias
require 'active_support/core_ext/file/path'
require 'action_controller/metal/exceptions'
module ActionController #:nodoc:
......@@ -115,7 +114,7 @@ def send_data(data, options = {}) #:doc:
private
def send_file_headers!(options)
type_provided = options.has_key?(:type)
options.update(DEFAULT_SEND_FILE_OPTIONS.merge(options))
[:type, :disposition].each do |arg|
raise ArgumentError, ":#{arg} option required" if options[arg].nil?
......
require 'active_support/core_ext/file/path'
require 'rack/chunked'
module ActionController #:nodoc:
......@@ -195,7 +194,7 @@ module ActionController #:nodoc:
# ==== Passenger
#
# To be described.
#
#
module Streaming
extend ActiveSupport::Concern
......
require 'active_support/core_ext/file/atomic'
require 'active_support/core_ext/file/path'
class File
unless File.allocate.respond_to?(:to_path)
alias to_path path
end
end
\ No newline at end of file
......@@ -16,4 +16,3 @@
require 'active_support/core_ext/string/encoding'
require 'active_support/core_ext/rexml'
require 'active_support/core_ext/time/conversions'
require 'active_support/core_ext/file/path'
......@@ -57,10 +57,6 @@ def test_atomic_write_preserves_default_file_permissions
File.unlink(file_name) rescue nil
end
def test_responds_to_to_path
assert_equal __FILE__, File.open(__FILE__, "r").to_path
end
private
def file_name
"atomic.file"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册