From eff96ec99fef82c17c79c9a752174596daef4455 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 1 Sep 2014 10:18:08 +0100 Subject: Move method to model to make it more testable, add spec. --- app/models/info_request.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index aed651ad3..121724424 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1048,6 +1048,14 @@ public File.join(Rails.root, "cache", "zips", "#{Rails.env}") end + def foi_fragment_cache_directory + # return stub path so admin can expire it + first_three_digits = id.to_s()[0..2] + path = "views/request/#{first_three_digits}/#{id}" + foi_cache_path = File.expand_path(File.join(File.dirname(__FILE__), '../../cache')) + return File.join(foi_cache_path, path) + end + def request_dirs first_three_digits = id.to_s()[0..2] File.join(first_three_digits.to_s, id.to_s) -- cgit v1.2.3 From eadc080e9c86c83dbcd517fb3089a62e993cf1c4 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 1 Sep 2014 10:29:12 +0100 Subject: Use path relative to Rails root. --- app/models/info_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 121724424..a99cadc77 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1052,7 +1052,7 @@ public # return stub path so admin can expire it first_three_digits = id.to_s()[0..2] path = "views/request/#{first_three_digits}/#{id}" - foi_cache_path = File.expand_path(File.join(File.dirname(__FILE__), '../../cache')) + foi_cache_path = File.expand_path(File.join(Rails.root, 'cache')) return File.join(foi_cache_path, path) end -- cgit v1.2.3 From 82565870dfa3b7da0a729723345097e230c4a163 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 1 Sep 2014 10:30:21 +0100 Subject: Use request dirs method. --- app/models/info_request.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index a99cadc77..1d82a5714 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1050,8 +1050,7 @@ public def foi_fragment_cache_directory # return stub path so admin can expire it - first_three_digits = id.to_s()[0..2] - path = "views/request/#{first_three_digits}/#{id}" + path = "views/request/#{request_dirs}" foi_cache_path = File.expand_path(File.join(Rails.root, 'cache')) return File.join(foi_cache_path, path) end -- cgit v1.2.3 From baf8be95fff5c00688af6f0fae72392600ee9254 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 1 Sep 2014 10:34:08 +0100 Subject: Return a list of all cache directories for the request --- app/models/info_request.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 1d82a5714..d0052603a 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1048,11 +1048,17 @@ public File.join(Rails.root, "cache", "zips", "#{Rails.env}") end - def foi_fragment_cache_directory + def foi_fragment_cache_directories # return stub path so admin can expire it - path = "views/request/#{request_dirs}" - foi_cache_path = File.expand_path(File.join(Rails.root, 'cache')) - return File.join(foi_cache_path, path) + directories = [] + path = File.join("request", request_dirs) + foi_cache_path = File.expand_path(File.join(Rails.root, 'cache', 'views')) + directories << File.join(foi_cache_path, path) + I18n.available_locales.each do |locale| + directories << File.join(foi_cache_path, locale.to_s, path) + end + + directories end def request_dirs -- cgit v1.2.3