Cleaning up code

Fixes #13

Author: ananace

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6-alpine
+FROM ruby:3.0-alpine
 
 #RUN apt-get update -qq && apt-get install -y build-essential
 

config.ru

@@ -1,6 +1,7 @@
 require 'grafana_matrix'
 
-config = GrafanaMatrix::Config.new 'config.yml'
+config = GrafanaMatrix::Config.global
+config.load! 'config.yml'
 warn 'Specifying port/bind in config' if config.port? || config.bind?
 
 Signal.trap('HUP') do
@@ -12,4 +13,6 @@ map '/health' do
   run -> { [200, { 'Content-Type' => 'text/plain' }, ['OK']] }
 end
 
-run GrafanaMatrix::Server.new(config)
+map '/' do
+  run GrafanaMatrix::Server.new
+end

grafana_matrix.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.join File.expand_path('lib', __dir__), 'grafana_matrix/version'
 
 Gem::Specification.new do |spec|

lib/grafana_matrix.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'grafana_matrix/config'
 require 'grafana_matrix/image_handler'
 require 'grafana_matrix/renderer'

lib/grafana_matrix/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'matrix_sdk'
 require 'psych'
 
@@ -64,6 +66,10 @@ def client
       end
     end
 
+    def self.global
+      @global ||= self.new
+    end
+
     def initialize(config = {})
       if config.is_a? String
         file = config
@@ -110,12 +116,7 @@ def client(client_name = nil)
       raise 'No client configuration found for name given' unless client_data
 
       @clients[client_name] ||= begin
-        client_data = client_data.dup
-
-        # Symbolize keys
-        client_data.each_key do |key|
-          client_data[(key.to_sym rescue key)] = client_data.delete key
-        end
+        client_data = client_data.dup.transform_keys { |key| key.to_sym rescue key }
 
         MatrixSdk::Api.new(client_data[:url],
                            **client_data.reject { |k, _v| %i[url].include? k })
@@ -126,12 +127,7 @@ def rules(rule_name)
       @config['rules']
         .select { |m| m['name'] == rule_name }
         .map do |rule_data|
-        rule_data = rule_data.dup
-
-        # Symbolize keys
-        rule_data.each_key do |key|
-          rule_data[(key.to_sym rescue key)] = rule_data.delete key
-        end
+        rule_data = rule_data.dup.transform_keys { |key| key.to_sym rescue key }
 
         Rule.new self, rule_data
       end

lib/grafana_matrix/image_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/http'
 
 module GrafanaMatrix

lib/grafana_matrix/renderer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GrafanaMatrix
   class Renderer
     HTML_TEMPLATE = '%TEMPLATES%/html.erb'.freeze

lib/grafana_matrix/server.rb

@@ -4,17 +4,15 @@
 
 module GrafanaMatrix
   class Server < ::Sinatra::Base
-    attr_reader :config, :renderer, :image_handler
-
-    def initialize(config)
-      super
-
-      @config = config
-      @renderer = GrafanaMatrix::Renderer.new
-      @image_handler = GrafanaMatrix::ImageHandler.new
+    configure :development, :production do
+      enable :logging
     end
 
     helpers do
+      def config; @config ||= GrafanaMatrix::Config.global; end
+      def renderer; @renderer ||= GrafanaMatrix::Renderer.new; end
+      def image_handler; @image_handler ||= GrafanaMatrix::ImageHandler.new; end
+
       def authorized(user, pass)
         @auth ||= Rack::Auth::Basic::Request.new(request.env)
         @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [user, pass]

lib/grafana_matrix/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GrafanaMatrix
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.1'
 end