Merge pull request #7198 from cfcosta/refactor-cache_control_headers

Refactor ActionDispatch::Http::Cache::Response#cache_control_headers

1 files changed, 19 insertions, 11 deletions

diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb
index 0b895e7860..647a9e3c19 100644
--- a/actionpack/lib/action_dispatch/http/cache.rb
+++ b/actionpack/lib/action_dispatch/http/cache.rb
@@ -86,21 +86,29 @@ module ActionDispatch
         CACHE_CONTROL = "Cache-Control".freeze
         SPESHUL_KEYS  = %w[extras no-cache max-age public must-revalidate]
 
+        def cache_control_segments
+          if cache_control = self[CACHE_CONTROL]
+            cache_control.delete(' ').split(',')
+          else
+            []
+          end
+        end
+
         def cache_control_headers
           cache_control = {}
-          if cc = self[CACHE_CONTROL]
-            cc.delete(' ').split(',').each do |segment|
-              directive, argument = segment.split('=', 2)
-              case directive
-              when *SPESHUL_KEYS
-                key = directive.tr('-', '_')
-                cache_control[key.to_sym] = argument || true
-              else
-                cache_control[:extras] ||= []
-                cache_control[:extras] << segment
-              end
+
+          cache_control_segments.each do |segment|
+            directive, argument = segment.split('=', 2)
+
+            if SPESHUL_KEYS.include? directive
+              key = directive.tr('-', '_')
+              cache_control[key.to_sym] = argument || true
+            else
+              cache_control[:extras] ||= []
+              cache_control[:extras] << segment
             end
           end
+
           cache_control
         end