1 files changed, 16 insertions, 12 deletions
diff --git a/lib/tom_tom.rb b/lib/tom_tom.rb
index fcebcc7ac..91f1a3800 100644
--- a/lib/tom_tom.rb
+++ b/lib/tom_tom.rb
@@ -1,26 +1,30 @@
 module TomTom
   BASE_URL = 'https://api.tomtom.com'
-  @api_key = Rails.application.secrets.tomtom_api_key
 
-  @connection = Faraday.new(
-    url: BASE_URL,
-    params: {
-      key: @api_key
-    }
-  ) do |faraday|
-    faraday.use FaradayMiddleware::FollowRedirects, limit: 1
-    faraday.adapter Faraday.default_adapter
+  @@api_key = Rails.application.secrets.tomtom_api_key
+  cattr_accessor :api_key
+
+  def self.connection
+    @connection ||= Faraday.new(
+      url: BASE_URL,
+      params: {
+        key: api_key
+      }
+    ) do |faraday|
+      faraday.use FaradayMiddleware::FollowRedirects, limit: 1
+      faraday.adapter Faraday.default_adapter
+    end
   end
 
   def self.enabled?
-    @api_key.present?
+    api_key.present? && /[a-zA-Z0-9]{32}/ === api_key
   end
 
   def self.batch(way_costs)
-    TomTom::Batch.new(@connection).batch(way_costs)
+    TomTom::Batch.new(connection).batch(way_costs)
   end
 
   def self.matrix(way_costs)
-    TomTom::Matrix.new(@connection).matrix(way_costs)
+    TomTom::Matrix.new(connection).matrix(way_costs)
   end
 end