mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

applies project style guidelines 

Just saw these in passing while reading this file.
This commit is contained in:
Xavier Noria 2015-06-20 23:37:01 +02:00
parent d8c22275fa
commit 29959eb59d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
actionview/lib/action_view/template/resolver.rb
View File

@ -181,9 +181,9 @@ module ActionView
def query(path, details, formats) def query(path, details, formats)
query = build_query(path, details) query = build_query(path, details)
template_paths = find_template_paths query template_paths = find_template_paths(query)
template_paths.map { |template| template_paths.map do |template|
handler, format, variant = extract_handler_and_format_and_variant(template, formats) handler, format, variant = extract_handler_and_format_and_variant(template, formats)
contents = File.binread(template) contents = File.binread(template)
@ -193,22 +193,22 @@ module ActionView
:variant => variant, :variant => variant,
:updated_at => mtime(template) :updated_at => mtime(template)
) )
} end
end end
def find_template_paths(query) def find_template_paths(query)
Dir[query].reject { |filename| Dir[query].reject do |filename|
File.directory?(filename) || File.directory?(filename) ||
# deals with case-insensitive file systems. # deals with case-insensitive file systems.
!File.fnmatch(query, filename, File::FNM_EXTGLOB) !File.fnmatch(query, filename, File::FNM_EXTGLOB)
} end
end end
# Helper for building query glob string based on resolver's pattern. # Helper for building query glob string based on resolver's pattern.
def build_query(path, details) def build_query(path, details)
query = @pattern.dup query = @pattern.dup
prefix = path.prefix.empty? ? "" : "#{escape_entry(path.prefix)}\\1" prefix = path.prefix.empty? ? '' : "#{escape_entry(path.prefix)}\\1"
query.gsub!(/:prefix(\/)?/, prefix) query.gsub!(/:prefix(\/)?/, prefix)
partial = escape_entry(path.partial? ? "_#{path.name}" : path.name) partial = escape_entry(path.partial? ? "_#{path.name}" : path.name)
@ -234,7 +234,7 @@ module ActionView
# from the path, or the handler, we should return the array of formats given # from the path, or the handler, we should return the array of formats given
# to the resolver. # to the resolver.
def extract_handler_and_format_and_variant(path, default_formats) def extract_handler_and_format_and_variant(path, default_formats)
pieces = File.basename(path).split(".") pieces = File.basename(path).split('.')
pieces.shift pieces.shift
extension = pieces.pop extension = pieces.pop