Skip to content

Commit 9019639

Browse files
committed
Rename File to RawFile
1 parent beb0bc9 commit 9019639

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

actionview/lib/action_view/file_template.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def initialize(filename, handler, details)
1111
end
1212

1313
def source
14-
::File.binread @filename
14+
File.binread @filename
1515
end
1616

1717
def refresh(_)

actionview/lib/action_view/renderer/template_renderer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def determine_template(options)
2727
Template::HTML.new(options[:html], formats.first)
2828
elsif options.key?(:file)
2929
if File.exist?(options[:file])
30-
Template::File.new(options[:file])
30+
Template::RawFile.new(options[:file])
3131
else
3232
ActiveSupport::Deprecation.warn "render file: should be given the absolute path to a file"
3333
@lookup_context.with_fallbacks.find_file(options[:file], nil, false, keys, @details)

actionview/lib/action_view/template.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def self.finalize_compiled_template_methods=(_)
113113

114114
eager_autoload do
115115
autoload :Error
116-
autoload :File
116+
autoload :RawFile
117117
autoload :Handlers
118118
autoload :HTML
119119
autoload :Inline

actionview/lib/action_view/template/error.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def sub_template_of(template_path)
104104
def line_number
105105
@line_number ||=
106106
if file_name
107-
regexp = /#{Regexp.escape ::File.basename(file_name)}:(\d+)/
107+
regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)/
108108
$1 if message =~ regexp || backtrace.find { |line| line =~ regexp }
109109
end
110110
end

actionview/lib/action_view/template/file.rb renamed to actionview/lib/action_view/template/raw_file.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module ActionView #:nodoc:
44
# = Action View File Template
55
class Template #:nodoc:
6-
class File #:nodoc:
6+
class RawFile #:nodoc:
77
attr_accessor :type, :format
88

99
def initialize(filename)

0 commit comments

Comments
 (0)