Permalink
Browse files

use functional style to build a list of template objects

  • Loading branch information...
1 parent 37b77c6 commit 233696a02771abebf867dacc02bce7124b5aa647 @tenderlove tenderlove committed Aug 9, 2011
Showing with 12 additions and 9 deletions.
  1. +12 −9 actionpack/lib/action_view/template/resolver.rb
@@ -131,21 +131,24 @@ def find_templates(name, prefix, partial, details)
def query(path, details, formats)
query = build_query(path, details)
- templates = []
+
+ # deals with case-insensitive file systems.
sanitizer = Hash.new { |h,dir| h[dir] = Dir["#{dir}/*"] }
- Dir[query].each do |template|
- next if File.directory?(template)
- next unless sanitizer[File.dirname(template)].include?(template)
+ template_paths = Dir[query].reject { |filename|
+ File.directory?(filename) ||
+ !sanitizer[File.dirname(filename)].include?(filename)
+ }
+ template_paths.map { |template|
handler, format = extract_handler_and_format(template, formats)
contents = File.binread template
- templates << Template.new(contents, File.expand_path(template), handler,
- :virtual_path => path.virtual, :format => format, :updated_at => mtime(template))
- end
-
- templates
+ Template.new(contents, File.expand_path(template), handler,
+ :virtual_path => path.virtual,
+ :format => format,
+ :updated_at => mtime(template))
+ }
end
# Helper for building query glob string based on resolver's pattern.

0 comments on commit 233696a

Please sign in to comment.