code cleanup

Author: seuros

app/controllers/achievements_controller.rb

@@ -1,4 +1,5 @@
 class AchievementsController < ApplicationController
+  #TODO extract to api.coderwall.com
   before_action :ensure_valid_api_key, only: [:award]
   skip_before_action :verify_authenticity_token, only: [:award]
   layout 'protip'
@@ -9,8 +10,8 @@ def show
     show_achievements_params = params.permit(:id, :username)
 
     @badge = Badge.find(show_achievements_params[:id])
-    @user  = @badge.user
-    return redirect_to(destination_url) if @badge && @user.username.downcase != show_achievements_params[:username].downcase
+    @user = @badge.user
+    redirect_to(destination_url) if @badge && @user.username.downcase != show_achievements_params[:username].downcase
   end
 
   def award
@@ -23,7 +24,7 @@ def award
       render_404
     else
       if @api_access.can_award?(award_params[:badge])
-        user  = User.find_by_provider_username(award_params[provider], provider)
+        user = User.find_by_provider_username(award_params[provider], provider)
         badge = badge_class_factory(award_params[:badge].to_s).new(user, Date.strptime(award_params[:date], '%m/%d/%Y'))
         badge.generate_fact!(award_params[:badge], award_params[provider], provider)
         unless user.nil?
@@ -32,19 +33,15 @@ def award
         end
         render nothing: true, status: 200
       else
-        return render json: { message: "don't have permission to do that. contact [email protected]", status: 403 }.to_json
+        render json: {message: "don't have permission to do that. contact [email protected]", status: 403}.to_json
       end
     end
-  rescue Exception => e
-    return render json: { message: "something went wrong with your request or the end point may not be ready. contact [email protected]" }.to_json
   end
 
   private
 
   def ensure_valid_api_key
-    @api_key    = params.permit(:api_key)[:api_key]
-    @api_access = ApiAccess.for(@api_key) unless @api_key.nil?
-    return render json: { message: "no/invalid api_key provided. get your api_key from coderwall.com/settings" }.to_json if @api_access.nil?
+    @api_access = ApiAccess.find_by_api_key!(params.permit(:api_key)[:api_key])
   end
 
   def badge_class_factory(requested_badge_name)
@@ -54,4 +51,12 @@ def badge_class_factory(requested_badge_name)
   def pick_a_provider(award_params)
     (User::LINKABLE_PROVIDERS & award_params.keys.select { |key| %w{twitter linkedin github}.include?(key) }).first
   end
+
+  rescue_from ActiveRecord::RecordNotFound do
+    render json: {message: 'no/invalid api_key provided. get your api_key from coderwall.com/settings'}.to_json
+  end
+
+  rescue_from Exception do
+    render json: {message: 'something went wrong with your request or the end point may not be ready. contact [email protected]'}.to_json
+  end
 end

app/models/api_access.rb

@@ -10,14 +10,9 @@
 #
 
 class ApiAccess < ActiveRecord::Base
+  #TODO change column to postgresql array
   serialize :awards, Array
 
-  class << self
-    def for(api_key)
-      where(api_key: api_key).first
-    end
-  end
-
   def can_award?(badge_name)
     awards.include? badge_name
   end