From 53265e88067084855753522256b86568fdad5b0c Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 27 Aug 2015 12:02:33 -0700 Subject: remove `@etag` ivar we're storing the value in the headers hash, so lets just store the value in one place. --- actionpack/lib/action_dispatch/http/cache.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'actionpack/lib/action_dispatch/http/cache.rb') diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb index 8dc693c8ae..c6ea6d8e01 100644 --- a/actionpack/lib/action_dispatch/http/cache.rb +++ b/actionpack/lib/action_dispatch/http/cache.rb @@ -51,8 +51,7 @@ module ActionDispatch end module Response - attr_reader :cache_control, :etag - alias :etag? :etag + attr_reader :cache_control def last_modified if last = get_header(LAST_MODIFIED) @@ -84,9 +83,13 @@ module ActionDispatch def etag=(etag) key = ActiveSupport::Cache.expand_cache_key(etag) - @etag = %("#{Digest::MD5.hexdigest(key)}") - set_header ETAG, @etag + set_header ETAG, %("#{Digest::MD5.hexdigest(key)}") + end + + def etag + get_header ETAG end + alias :etag? :etag private @@ -124,7 +127,6 @@ module ActionDispatch def prepare_cache_control! @cache_control = cache_control_headers - @etag = get_header ETAG end def handle_conditional_get! -- cgit v1.2.3