From 5fab6de48abd4e6ee084f0bbb509af026c6b6662 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Sat, 24 Sep 2016 11:00:53 +0800
Subject: [PATCH] fiddle with metacodes controller

---
 .rubocop.yml                            |  6 ++++++
 app/controllers/metacodes_controller.rb | 18 +++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 9fb58aba..897484b7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -12,3 +12,9 @@ Rails:
 
 Metrics/LineLength:
   Max: 100
+
+Metrics/AbcSize:
+  Max: 16
+
+Style/Documentation:
+  Enabled: false
diff --git a/app/controllers/metacodes_controller.rb b/app/controllers/metacodes_controller.rb
index 313d9764..00f92878 100644
--- a/app/controllers/metacodes_controller.rb
+++ b/app/controllers/metacodes_controller.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
 class MetacodesController < ApplicationController
   before_action :require_admin, except: [:index, :show]
+  before_action :set_metacode, only: [:edit, :update]
 
   # GET /metacodes
   # GET /metacodes.json
@@ -8,10 +10,7 @@ class MetacodesController < ApplicationController
 
     respond_to do |format|
       format.html do
-        unless authenticated? && user.admin
-          redirect_to root_url, notice: 'You need to be an admin for that.'
-          return false
-        end
+        return unless require_admin
         render :index
       end
       format.json { render json: @metacodes }
@@ -23,7 +22,7 @@ class MetacodesController < ApplicationController
   # GET /metacodes/action.json
   def show
     @metacode = Metacode.where('DOWNCASE(name) = ?', downcase(params[:name])).first if params[:name]
-    @metacode = Metacode.find(params[:id]) unless @metacode
+    set_metacode unless @metacode
 
     respond_to do |format|
       format.json { render json: @metacode }
@@ -36,14 +35,13 @@ class MetacodesController < ApplicationController
     @metacode = Metacode.new
 
     respond_to do |format|
-      format.html # new.html.erb
+      format.html
       format.json { render json: @metacode }
     end
   end
 
   # GET /metacodes/1/edit
   def edit
-    @metacode = Metacode.find(params[:id])
   end
 
   # POST /metacodes
@@ -65,8 +63,6 @@ class MetacodesController < ApplicationController
   # PUT /metacodes/1
   # PUT /metacodes/1.json
   def update
-    @metacode = Metacode.find(params[:id])
-
     respond_to do |format|
       if @metacode.update(metacode_params)
         format.html { redirect_to metacodes_url, notice: 'Metacode was successfully updated.' }
@@ -84,4 +80,8 @@ class MetacodesController < ApplicationController
   def metacode_params
     params.require(:metacode).permit(:id, :name, :aws_icon, :manual_icon, :color)
   end
+
+  def set_metacode
+    @metacode = Metacode.find(params[:id])
+  end
 end