more refactoriung

app/web.rb

@@ -75,18 +75,22 @@ def check_authorization
         def check_authorization
           redirect settings.oauth.login_url(request) unless session['access_token']
           return init_session if settings.oauth.authorized?(session['access_token'])
-          flash[:fatal] = 'Sorry you are not authorized to read puppet repo on gitlab.'
-          redirect '/'
+          sorry
         end
 
         def session_info
-          Hieraviz::Store.get(session['access_token'], settings.configdata['session_renew'])
+          Hieraviz::Store.get session['access_token'], settings.configdata['session_renew']
         end
 
         def init_session
           Hieraviz::Store.set session['access_token'], settings.oauth.user_info(session['access_token'])
           settings.oauth.user_info(session['access_token'])['username']
         end
+
+        def sorry
+          flash[:fatal] = 'Sorry you are not authorized to read puppet repo on gitlab.'
+          redirect '/'
+        end
       end
 
       get '/login' do

lib/hieraviz.rb

@@ -1,10 +1,10 @@
 require 'hieracles'
-require "hieraviz/version"
-require "hieraviz/config"
-require "hieraviz/store"
-require "hieraviz/facts"
-require "hieraviz/auth_gitlab"
-require "hieraviz/puppetdb"
+require 'hieraviz/version'
+require 'hieraviz/config'
+require 'hieraviz/store'
+require 'hieraviz/facts'
+require 'hieraviz/auth_gitlab'
+require 'hieraviz/puppetdb'
 
 module Hieraviz
   # Your code goes here...

lib/hieraviz/auth_gitlab.rb

@@ -4,23 +4,23 @@ module Hieraviz
   class AuthGitlab
 
     def initialize(settings)
-      @@client ||= OAuth2::Client.new(
-        settings['application_id'], 
-        settings['secret'], 
-        :site => settings['host']
-        )
+      @client = OAuth2::Client.new(
+        settings['application_id'],
+        settings['secret'],
+        site: settings['host']
+      )
       @settings = settings
     end
 
     def access_token(request, code)
-      @@client.auth_code.get_token(code, :redirect_uri => redirect_uri(request.url))
+      @client.auth_code.get_token(code, redirect_uri: redirect_uri(request.url))
     end
 
     def get_response(url, token)
-      a_token = OAuth2::AccessToken.new(@@client, token)
+      a_token = OAuth2::AccessToken.new(@client, token)
       begin
         JSON.parse(a_token.get(url).body)
-      rescue Exception => e
+      rescue StandardError => e
         { 'error' => JSON.parse(e.message.split(/\n/)[1])['message'] }
       end
     end
@@ -34,7 +34,7 @@ def redirect_uri(url)
     end
 
     def login_url(request)
-      @@client.auth_code.authorize_url(:redirect_uri => redirect_uri(request.url))
+      @client.auth_code.authorize_url(redirect_uri: redirect_uri(request.url))
     end
 
     def authorized?(token)