mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Remove updated_at from Templates
This commit is contained in:
parent
d445ceb9b5
commit
80c0ae7de8
4 changed files with 9 additions and 18 deletions
|
@ -22,11 +22,11 @@ module ActionView
|
|||
# to ensure that references to the template object can be marshalled as well. This means forgoing
|
||||
# the marshalling of the compiler mutex and instantiating that again on unmarshalling.
|
||||
def marshal_dump # :nodoc:
|
||||
[ @identifier, @handler, @compiled, @locals, @virtual_path, @updated_at, @format, @variant ]
|
||||
[ @identifier, @handler, @compiled, @locals, @virtual_path, @format, @variant ]
|
||||
end
|
||||
|
||||
def marshal_load(array) # :nodoc:
|
||||
@identifier, @handler, @compiled, @locals, @virtual_path, @updated_at, @format, @variant = *array
|
||||
@identifier, @handler, @compiled, @locals, @virtual_path, @format, @variant = *array
|
||||
@compile_mutex = Mutex.new
|
||||
end
|
||||
end
|
||||
|
|
|
@ -122,10 +122,10 @@ module ActionView
|
|||
|
||||
extend Template::Handlers
|
||||
|
||||
attr_reader :source, :identifier, :handler, :original_encoding, :updated_at
|
||||
attr_reader :source, :identifier, :handler, :original_encoding
|
||||
attr_reader :variable, :format, :variant, :locals, :virtual_path
|
||||
|
||||
def initialize(source, identifier, handler, format: nil, variant: nil, locals: nil, virtual_path: nil, updated_at: Time.now)
|
||||
def initialize(source, identifier, handler, format: nil, variant: nil, locals: nil, virtual_path: nil)
|
||||
unless locals
|
||||
ActiveSupport::Deprecation.warn "ActionView::Template#initialize requires a locals parameter"
|
||||
locals = []
|
||||
|
@ -144,7 +144,6 @@ module ActionView
|
|||
$1.to_sym
|
||||
end
|
||||
|
||||
@updated_at = updated_at
|
||||
@format = format
|
||||
@variant = variant
|
||||
@compile_mutex = Mutex.new
|
||||
|
@ -261,11 +260,11 @@ module ActionView
|
|||
# to ensure that references to the template object can be marshalled as well. This means forgoing
|
||||
# the marshalling of the compiler mutex and instantiating that again on unmarshalling.
|
||||
def marshal_dump # :nodoc:
|
||||
[ @source, @identifier, @handler, @compiled, @locals, @virtual_path, @updated_at, @format, @variant ]
|
||||
[ @source, @identifier, @handler, @compiled, @locals, @virtual_path, @format, @variant ]
|
||||
end
|
||||
|
||||
def marshal_load(array) # :nodoc:
|
||||
@source, @identifier, @handler, @compiled, @locals, @virtual_path, @updated_at, @format, @variant = *array
|
||||
@source, @identifier, @handler, @compiled, @locals, @virtual_path, @format, @variant = *array
|
||||
@compile_mutex = Mutex.new
|
||||
end
|
||||
|
||||
|
|
|
@ -190,8 +190,7 @@ module ActionView
|
|||
virtual_path: path.virtual,
|
||||
format: format,
|
||||
variant: variant,
|
||||
locals: locals,
|
||||
updated_at: mtime(template)
|
||||
locals: locals
|
||||
)
|
||||
end
|
||||
end
|
||||
|
@ -244,11 +243,6 @@ module ActionView
|
|||
entry.gsub(/[*?{}\[\]]/, '\\\\\\&')
|
||||
end
|
||||
|
||||
# Returns the file mtime from the filesystem.
|
||||
def mtime(p)
|
||||
File.mtime(p)
|
||||
end
|
||||
|
||||
# Extract handler, formats and variant from path. If a format cannot be found neither
|
||||
# from the path, or the handler, we should return the array of formats given
|
||||
# to the resolver.
|
||||
|
|
|
@ -31,16 +31,14 @@ module ActionView #:nodoc:
|
|||
query = /^(#{Regexp.escape(path)})#{query}$/
|
||||
|
||||
templates = []
|
||||
@hash.each do |_path, array|
|
||||
source, updated_at = array
|
||||
@hash.each do |_path, source|
|
||||
next unless query.match?(_path)
|
||||
handler, format, variant = extract_handler_and_format_and_variant(_path)
|
||||
templates << Template.new(source, _path, handler,
|
||||
virtual_path: path.virtual,
|
||||
format: format,
|
||||
variant: variant,
|
||||
locals: locals,
|
||||
updated_at: updated_at
|
||||
locals: locals
|
||||
)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue