From 07c135eeb5a71804a6c6cae080283f9a6583f119 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 26 Nov 2016 17:20:13 +1300
Subject: [PATCH] before_filter is now before_action

---
 .rubocop_todo.yml                             | 27 -------------------
 app/controllers/account_types_controller.rb   |  2 +-
 app/controllers/accounts_controller.rb        |  2 +-
 app/controllers/alternate_names_controller.rb |  2 +-
 app/controllers/application_controller.rb     |  4 +--
 app/controllers/authentications_controller.rb |  2 +-
 app/controllers/comments_controller.rb        |  2 +-
 app/controllers/crops_controller.rb           |  2 +-
 app/controllers/follows_controller.rb         |  2 +-
 app/controllers/gardens_controller.rb         |  2 +-
 app/controllers/harvests_controller.rb        |  2 +-
 app/controllers/notifications_controller.rb   |  2 +-
 app/controllers/order_items_controller.rb     |  2 +-
 app/controllers/orders_controller.rb          |  2 +-
 app/controllers/plantings_controller.rb       |  2 +-
 app/controllers/posts_controller.rb           |  2 +-
 app/controllers/products_controller.rb        |  2 +-
 app/controllers/roles_controller.rb           |  2 +-
 .../scientific_names_controller.rb            |  2 +-
 app/controllers/seeds_controller.rb           |  2 +-
 20 files changed, 20 insertions(+), 47 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ecf35d1e1..8892c96d3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -121,33 +121,6 @@ Performance/StringReplacement:
     - 'app/models/seed.rb'
     - 'spec/rails_helper.rb'
 
-# Offense count: 21
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, Include.
-# SupportedStyles: action, filter
-# Include: app/controllers/**/*.rb
-Rails/ActionFilter:
-  Exclude:
-    - 'app/controllers/account_types_controller.rb'
-    - 'app/controllers/accounts_controller.rb'
-    - 'app/controllers/alternate_names_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/controllers/authentications_controller.rb'
-    - 'app/controllers/comments_controller.rb'
-    - 'app/controllers/crops_controller.rb'
-    - 'app/controllers/follows_controller.rb'
-    - 'app/controllers/gardens_controller.rb'
-    - 'app/controllers/harvests_controller.rb'
-    - 'app/controllers/notifications_controller.rb'
-    - 'app/controllers/order_items_controller.rb'
-    - 'app/controllers/orders_controller.rb'
-    - 'app/controllers/plantings_controller.rb'
-    - 'app/controllers/posts_controller.rb'
-    - 'app/controllers/products_controller.rb'
-    - 'app/controllers/roles_controller.rb'
-    - 'app/controllers/scientific_names_controller.rb'
-    - 'app/controllers/seeds_controller.rb'
-
 # Offense count: 10
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: strict, flexible
diff --git a/app/controllers/account_types_controller.rb b/app/controllers/account_types_controller.rb
index 073933af4..fce71380a 100644
--- a/app/controllers/account_types_controller.rb
+++ b/app/controllers/account_types_controller.rb
@@ -1,5 +1,5 @@
 class AccountTypesController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /account_types
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index b2daf95ed..bca64597a 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,5 +1,5 @@
 class AccountsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /accounts
diff --git a/app/controllers/alternate_names_controller.rb b/app/controllers/alternate_names_controller.rb
index a02c0d9cb..ef81497e1 100644
--- a/app/controllers/alternate_names_controller.rb
+++ b/app/controllers/alternate_names_controller.rb
@@ -1,5 +1,5 @@
 class AlternateNamesController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /alternate_names
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 45c657b64..8548f8e8e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,8 +3,8 @@ class ApplicationController < ActionController::Base
 
   include ApplicationHelper
 
-  after_filter :store_location
-  before_filter :set_locale
+  after_action :store_location
+  before_action :set_locale
 
   def store_location
     if (request.path != "/members/sign_in" &&
diff --git a/app/controllers/authentications_controller.rb b/app/controllers/authentications_controller.rb
index 886715373..3567ea67f 100644
--- a/app/controllers/authentications_controller.rb
+++ b/app/controllers/authentications_controller.rb
@@ -1,5 +1,5 @@
 class AuthenticationsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # POST /authentications
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 967a386f8..ef3225bfb 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,5 +1,5 @@
 class CommentsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /comments
diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index dac763665..3c665e9d1 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -1,7 +1,7 @@
 require 'will_paginate/array'
 
 class CropsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :hierarchy, :search, :show]
+  before_action :authenticate_member!, except: [:index, :hierarchy, :search, :show]
   load_and_authorize_resource
   skip_authorize_resource only: [:hierarchy, :search]
 
diff --git a/app/controllers/follows_controller.rb b/app/controllers/follows_controller.rb
index 58a1ce795..2c4b2daab 100644
--- a/app/controllers/follows_controller.rb
+++ b/app/controllers/follows_controller.rb
@@ -1,5 +1,5 @@
 class FollowsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
   skip_load_resource only: :create
 
diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb
index 8720a693d..a83089844 100644
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -1,5 +1,5 @@
 class GardensController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /gardens
diff --git a/app/controllers/harvests_controller.rb b/app/controllers/harvests_controller.rb
index 948edfb63..3d36438fd 100644
--- a/app/controllers/harvests_controller.rb
+++ b/app/controllers/harvests_controller.rb
@@ -1,5 +1,5 @@
 class HarvestsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /harvests
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 39f48b85d..4bdae1c90 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -1,6 +1,6 @@
 class NotificationsController < ApplicationController
   include NotificationsHelper
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /notifications
diff --git a/app/controllers/order_items_controller.rb b/app/controllers/order_items_controller.rb
index 7781913d4..0eb381a89 100644
--- a/app/controllers/order_items_controller.rb
+++ b/app/controllers/order_items_controller.rb
@@ -1,5 +1,5 @@
 class OrderItemsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # POST /order_items
diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb
index 234c760f2..a3def3194 100644
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb
@@ -1,5 +1,5 @@
 class OrdersController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /orders
diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index 222944151..708fc448d 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -1,5 +1,5 @@
 class PlantingsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /plantings
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 75a4a7d49..76befd29d 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -1,5 +1,5 @@
 class PostsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /posts
diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb
index be3e923dd..cb2f96e52 100644
--- a/app/controllers/products_controller.rb
+++ b/app/controllers/products_controller.rb
@@ -1,5 +1,5 @@
 class ProductsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /products
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 82b554467..91bcf2e52 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -1,5 +1,5 @@
 class RolesController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /roles
diff --git a/app/controllers/scientific_names_controller.rb b/app/controllers/scientific_names_controller.rb
index 1bbfcd4c6..20c8dae0b 100644
--- a/app/controllers/scientific_names_controller.rb
+++ b/app/controllers/scientific_names_controller.rb
@@ -1,5 +1,5 @@
 class ScientificNamesController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /scientific_names
diff --git a/app/controllers/seeds_controller.rb b/app/controllers/seeds_controller.rb
index 45b14cb16..5d9a775e7 100644
--- a/app/controllers/seeds_controller.rb
+++ b/app/controllers/seeds_controller.rb
@@ -1,5 +1,5 @@
 class SeedsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /seeds