From 00fba5114ae2c6176c88ff0ea152576c5bff657d Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 25 Mar 2016 11:06:55 +0100
Subject: upgrade: {File,Dir}.exists? -> exist?

exists? is deprecated in ruby 2.1
---
 app/controllers/controller_extension/json_file.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/controller_extension')

diff --git a/app/controllers/controller_extension/json_file.rb b/app/controllers/controller_extension/json_file.rb
index 6be919a..5b5e55e 100644
--- a/app/controllers/controller_extension/json_file.rb
+++ b/app/controllers/controller_extension/json_file.rb
@@ -12,7 +12,7 @@ module ControllerExtension::JsonFile
   end
 
   def fetch_file
-    if File.exists?(@filename)
+    if File.exist?(@filename)
       @file = File.new(@filename)
     else
       not_found
-- 
cgit v1.2.3


From fc066a42ec5a3271b0d476ff2c5ab771f1ab726d Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 3 May 2016 10:24:11 -0300
Subject: fix failing unit and functional tests

---
 app/controllers/controller_extension/fetch_user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/controller_extension')

diff --git a/app/controllers/controller_extension/fetch_user.rb b/app/controllers/controller_extension/fetch_user.rb
index 97f92fa..632291d 100644
--- a/app/controllers/controller_extension/fetch_user.rb
+++ b/app/controllers/controller_extension/fetch_user.rb
@@ -22,7 +22,7 @@ module ControllerExtension::FetchUser
     @user = User.find(params[:user_id] || params[:id])
     if current_user.is_admin? || current_user.is_monitor?
       if @user.nil?
-        not_found(t(:no_such_thing, :thing => 'user'), users_url)
+        not_found(t(:no_such_user), users_url)
       elsif current_user.is_monitor?
         access_denied unless @user.is_test?
       end
-- 
cgit v1.2.3


From 33e2a52f683697ca8489d856df90b39bfbbe7373 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 3 May 2016 11:29:45 -0300
Subject: 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.
---
 app/controllers/controller_extension/json_file.rb | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'app/controllers/controller_extension')

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
 
-- 
cgit v1.2.3