aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/static.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-09-29 11:18:31 +0200
committerJosé Valim <jose.valim@gmail.com>2010-09-29 11:18:31 +0200
commit14f9904e0fc6d8a1e5627ac64c4b5b14e95177c5 (patch)
tree7bd869d61e99d58dbd374a5d2ce344139a784551 /actionpack/lib/action_dispatch/middleware/static.rb
parent0bbf9029e8089356aed0e3be2f859d56951a89cf (diff)
downloadrails-14f9904e0fc6d8a1e5627ac64c4b5b14e95177c5.tar.gz
rails-14f9904e0fc6d8a1e5627ac64c4b5b14e95177c5.tar.bz2
rails-14f9904e0fc6d8a1e5627ac64c4b5b14e95177c5.zip
Avoid (@_var ||= nil) pattern by using initialize methods and ensuring everyone calls super as expected.
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/static.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/static.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index 6d442b91f5..cf13938331 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -4,10 +4,9 @@ module ActionDispatch
class FileHandler
def initialize(at, root)
@at, @root = at.chomp('/'), root.chomp('/')
- @compiled_at = Regexp.compile(/^#{Regexp.escape(at)}/) unless @at.blank?
+ @compiled_at = (Regexp.compile(/^#{Regexp.escape(at)}/) unless @at.blank?)
@compiled_root = Regexp.compile(/^#{Regexp.escape(root)}/)
@file_server = ::Rack::File.new(root)
- @compiled_at ||= nil
end
def match?(path)