From 46bb4242874fe716268e3bb7b1ce3bb3c2d883e4 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 28 Feb 2011 19:47:09 -0800 Subject: Revert "compute ext in initialize, and use an attr_reader" This reverts commit 2dbb73bdda3b81947fd112486ac4285fb1a6e3a9. Conflicts: actionpack/lib/action_dispatch/middleware/static.rb --- actionpack/lib/action_dispatch/middleware/static.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'actionpack/lib/action_dispatch/middleware') diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb index c5598f3e56..5076567bd4 100644 --- a/actionpack/lib/action_dispatch/middleware/static.rb +++ b/actionpack/lib/action_dispatch/middleware/static.rb @@ -2,16 +2,11 @@ require 'rack/utils' module ActionDispatch class FileHandler - attr_reader :ext - def initialize(at, root) @at, @root = at.chomp('/'), root.chomp('/') @compiled_at = /^#{Regexp.escape(at)}/ unless @at.blank? @compiled_root = /^#{Regexp.escape(root)}/ @file_server = ::Rack::File.new(@root) - - ext = ::ActionController::Base.page_cache_extension - @ext = "{,#{ext},/index#{ext}}" end def match?(path) @@ -32,6 +27,13 @@ module ActionDispatch def call(env) @file_server.call(env) end + + def ext + @ext ||= begin + ext = ::ActionController::Base.page_cache_extension + "{,#{ext},/index#{ext}}" + end + end end class Static -- cgit v1.2.3