Fix delete method, which should be an instance method.

Author: aflanagan

lib/cronitor.rb

@@ -32,7 +32,7 @@ def self.read_config(path = nil)
   def self.apply_config(rollback: false)
     conf = read_config
     # allow a significantly longer timeout on requests that are sending full yaml config. min 30 seconds.
-    timeout = Cronitor.timeout < 30 ? 30 : Cronitor.timeout
+    timeout = [Cronitor.timeout, 30].max
     monitors = Monitor.put(monitors: conf, format: Cronitor::Monitor::Formats::YAML, rollback: rollback,
                            timeout: timeout)
     count = 0
@@ -62,7 +62,6 @@ def self.job(key, &block)
       raise e
     end
   end
-
 end
 
 Cronitor.read_config(Cronitor.config) unless Cronitor.config.nil?

lib/cronitor/config.rb

@@ -9,12 +9,12 @@ module Cronitor
   YAML_KEYS = MONITOR_TYPES.map { |t| "#{t}s" }
 
   class << self
-    attr_accessor :api_key, :api_version, :environment, :logger, :config, :timeout, :ping_timeout, :auto_discover_sidekiq, :telemetry_domain
+    attr_accessor :api_key, :api_version, :environment, :logger, :config, :timeout, :ping_timeout,
+                  :auto_discover_sidekiq, :telemetry_domain
 
     def configure(&block)
       block.call(self)
     end
-
   end
 
   self.api_key = ENV.fetch('CRONITOR_API_KEY', nil)

lib/cronitor/monitor.rb

@@ -5,6 +5,7 @@ class Monitor
     attr_reader :key, :api_key, :api_version, :env
 
     PING_RETRY_THRESHOLD = 3
+    MONITOR_API_URL = 'https://cronitor.io/api/monitors'
 
     module Formats
       ALL = [
@@ -24,13 +25,12 @@ module Headers
                         })
     end
 
-
     def self.put(opts = {})
       rollback = opts[:rollback] || false
       opts.delete(:rollback)
 
       monitors = opts[:monitors] || [opts]
-      url = "https://cronitor.io/api/monitors"
+      url = MONITOR_API_URL
       if opts[:format] == Cronitor::Monitor::Formats::YAML
         url = "#{url}.yaml"
         monitors['rollback'] = true if rollback
@@ -77,12 +77,12 @@ def self.put(opts = {})
       end
     end
 
-    def self.delete(key)
+    def delete
       resp = HTTParty.delete(
-        "#{Cronitor.monitor_api_url}/#{key}",
+        "#{monitor_api_url}/#{key}",
         timeout: Cronitor.timeout,
         basic_auth: {
-          username: Cronitor.api_key,
+          username: api_key,
           password: ''
         },
         headers: Cronitor::Monitor::Headers::JSON
@@ -187,10 +187,9 @@ def fallback_ping_api_url
     end
 
     def monitor_api_url
-      "https://cronitor.io/api/monitors"
+      MONITOR_API_URL
     end
 
-
     private
 
     def fetch
@@ -219,7 +218,7 @@ def clean_params(params)
         message: params.fetch(:message, nil),
         series: params.fetch(:series, nil),
         host: params.fetch(:host, Socket.gethostname),
-        metric: params[:metrics] ? params[:metrics].map { |k, v| "#{k}:#{v}" } : nil,
+        metric: params[:metrics]&.map { |k, v| "#{k}:#{v}" },
         stamp: Time.now.to_f,
         env: params.fetch(:env, env)
       }

spec/cronitor_spec.rb

@@ -294,7 +294,8 @@
     end
 
     it 'Deletes a monitor' do
-      expect(Cronitor::Monitor.delete('test-key')).to be(true)
+      monitor = Cronitor::Monitor.new('test-key')
+      expect(monitor.delete).to be(true)
     end
 
   end