Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

remove File#to_path alias

  • Loading branch information...
commit a7ba8e1fb325a20dc5115eeef278ce946d0450c7 1 parent 748725e
@nashby nashby authored
View
3  actionpack/lib/action_controller/metal/data_streaming.rb
@@ -1,4 +1,3 @@
-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?
View
3  actionpack/lib/action_controller/metal/streaming.rb
@@ -1,4 +1,3 @@
-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
View
1  activesupport/lib/active_support/core_ext/file.rb
@@ -1,2 +1 @@
require 'active_support/core_ext/file/atomic'
-require 'active_support/core_ext/file/path'
View
5 activesupport/lib/active_support/core_ext/file/path.rb
@@ -1,5 +0,0 @@
-class File
- unless File.allocate.respond_to?(:to_path)
- alias to_path path
- end
-end
View
1  activesupport/lib/active_support/ruby/shim.rb
@@ -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'
View
4 activesupport/test/core_ext/file_test.rb
@@ -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"
Please sign in to comment.
Something went wrong with that request. Please try again.