use APP_CONFIG[config_file_paths] for provider.json

This avoids overwriting the PROVIDER_JSON constant in the
StaticConfigController and thus fixes test warnings.

Also moved away from using instance variables in the
ControllerExtension::JsonFile - instead querying the corresponding
functions now - less sideeffects and easier stubbing.

1 files changed, 14 insertions, 9 deletions

diff --git a/app/controllers/controller_extension/json_file.rb b/app/controllers/controller_extension/json_file.rb
index 5b5e55e..df9cf55 100644
--- a/app/controllers/controller_extension/json_file.rb
+++ b/app/controllers/controller_extension/json_file.rb
@@ -4,20 +4,25 @@ module ControllerExtension::JsonFile
 
   protected
 
-  def send_file
-    if stale?(:last_modified => @file.mtime)
-      response.content_type = 'application/json'
-      render :text => @file.read
+  def send_file(filename)
+    file = fetch_file(filename)
+    if file.present?
+      send_file_or_cache_hit(file)
+    else
+      not_found
     end
   end
 
-  def fetch_file
-    if File.exist?(@filename)
-      @file = File.new(@filename)
-    else
-      not_found
+  def send_file_or_cache_hit(file)
+    if stale?(:last_modified => file.mtime)
+      response.content_type = 'application/json'
+      render :text => file.read
     end
   end
 
+  def fetch_file(filename)
+    File.new(filename) if File.exist?(filename)
+  end
+
 end