From 4c057ba0aa2bff1457b72f091fc03901d45831fc Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@gmail.com>
Date: Tue, 17 Mar 2015 01:39:31 -0500
Subject: [PATCH] Cleanup.

---
 app/models/user.rb     | 11 ++++-------
 lib/calefaction/eve.rb |  7 +++----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index c0366da..682acc8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -5,20 +5,17 @@ class User < ActiveRecord::Base
   alias_attribute :admin?, :is_admin
 
   def characters
-    ensure_api_user
-    chars = @api.characters
+    chars = api.characters
     chars.nil? ? [] : chars
   end
 
   def name
-    ensure_api_user
-    sheet = @api.character_sheet(userid)
+    sheet = api.character_sheet(userid)
     sheet.nil? ? '?' : sheet.name
   end
 
   def corp_id
-    ensure_api_user
-    sheet = @api.character_sheet(userid)
+    sheet = api.character_sheet(userid)
     sheet.nil? ? 0 : sheet.corporationID.to_i
   end
 
@@ -31,7 +28,7 @@ class User < ActiveRecord::Base
   end
 
   private
-  def ensure_api_user
+  def api
     @api ||= Calefaction::EVE::APIUser.new(api_key, api_verify)
   end
 end
diff --git a/lib/calefaction/eve.rb b/lib/calefaction/eve.rb
index b3609e1..9086571 100644
--- a/lib/calefaction/eve.rb
+++ b/lib/calefaction/eve.rb
@@ -39,16 +39,15 @@ module Calefaction::EVE
 
   private
   def corporation_sheet(corp_id)
-    ensure_basic_api
-    @@api.scope = 'corp'
+    basic_api.scope = 'corp'
     begin
-      @@api.CorporationSheet(corporationID: corp_id)
+      basic_api.CorporationSheet(corporationID: corp_id)
     rescue EAAL::Exception::EAALError
       nil
     end
   end
 
-  def ensure_basic_api
+  def basic_api
     @@api ||= EAAL::API.new(nil, nil)
   end
 end