fix: rework knock client usage (#20)

* fix: rework knock client usage

* chore: fix api hostname

* chore: fix rubocop

Author: cjbell

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    knockapi (0.4.12)
+    knockapi (0.5.0)
 
 GEM
   remote: https://rubygems.org/

README.md

@@ -26,18 +26,17 @@ Or, you may set the key yourself in an initializer:
 
 ```ruby
 # /config/initializers/knock.rb
-Knock.key = 'sk_12345'
+Knock.configure do |config|
+  config.key = '[your api key]'
+  config.timeout = 120
+end
 ```
 
 ## Usage
 
 ### Identifying users
 
 ```ruby
-require "knock"
-
-Knock.key = "sk_12345"
-
 Knock::Users.identify(
   id: "jhammond",
   data: {
@@ -50,10 +49,6 @@ Knock::Users.identify(
 ### Sending notifies (triggering workflows)
 
 ```ruby
-require "knock"
-
-Knock.key = "sk_12345"
-
 # The key of the workflow (from Knock dashboard)
 Knock::Workflows.trigger(
   key: "dinosaurs-loose",
@@ -74,29 +69,18 @@ Knock::Workflows.trigger(
 ### Retrieving users
 
 ```ruby
-require "knock"
-
-Knock.key = "sk_12345"
-
 Knock::Users.get(id: "jhammond")
 ```
 
 ### Deleting users
 
 ```ruby
-require "knock"
-
-Knock.key = "sk_12345"
-
 Knock::Users.delete(id: "jhammond")
 ```
 
 ### Preferences
 
 ```ruby
-require "knock"
-Knock.key = "sk_12345"
-
 # Set an entire preference set
 Knock::Users.set_preferences(
   user_id: "jhammond",
@@ -115,9 +99,6 @@ Knock::Users.get_preferences(user_id: "jhammond")
 ### Getting and setting channel data
 
 ```ruby
-require "knock"
-Knock.key = "sk_12345"
-
 # Set channel data for an APNS
 Knock::Users.set_channel_data(
   id: "jhammond",
@@ -134,9 +115,6 @@ Knock::Users.get_channel_data(user_id: "jhammond", channel_id: KNOCK_APNS_CHANNE
 ### Cancelling workflows
 
 ```ruby
-require "knock"
-Knock.key = "sk_12345"
-
 Knock::Workflows.cancel(
   key: "dinosaurs-loose",
   cancellation_key: trigger_alert.id,

lib/knock.rb

@@ -2,25 +2,39 @@
 
 require 'knock/version'
 require 'json'
+require 'knock/configuration'
 
 # Setup for Knock client
 module Knock
-  API_HOSTNAME = ENV['KNOCK_API_HOSTNAME'] || 'api.knock.app'
+  def self.default_config
+    Configuration.new.tap do |config|
+      config.api_hostname = ENV['KNOCK_API_HOSTNAME'] || 'api.knock.app'
+      config.key = ENV['KNOCK_API_KEY']
+    end
+  end
 
-  def self.key=(value)
-    Base.key = value
+  def self.config
+    @config ||= default_config
   end
 
-  def self.key
-    Base.key
+  def self.configure
+    yield(config)
   end
 
-  def self.key!
-    key || raise('Knock.key not set')
+  def self.key=(value)
+    warn '`Knock.key=` is deprecated. Use `Knock.configure` instead.'
+
+    config.key = value
+  end
+
+  def self.key
+    warn '`Knock.key` is deprecated. Use `Knock.configure` instead.'
+    config.key
   end
 
   autoload :Base, 'knock/base'
   autoload :Client, 'knock/client'
+  autoload :Configuration, 'knock/configuration'
 
   # Resources
   autoload :Preferences, 'knock/preferences'
@@ -35,9 +49,7 @@ def self.key!
   autoload :APIError, 'knock/errors'
   autoload :AuthenticationError, 'knock/errors'
   autoload :InvalidRequestError, 'knock/errors'
-
-  key = ENV['KNOCK_API_KEY']
-  Knock.key = key unless key.nil?
+  autoload :TimeoutError, 'knock/errors'
 
   # Triggers the workflow with the given key
   #

lib/knock/base.rb

@@ -7,7 +7,6 @@ module Knock
   # Provides convienience methods for working with bulk operations
   module BulkOperations
     class << self
-      include Base
       include Client
 
       # Retrieves the given bulk operation

lib/knock/bulk_operations.rb

@@ -2,20 +2,27 @@
 
 module Knock
   # A Net::HTTP based API client for interacting with the Knock API
+  # rubocop:disable Metrics/ModuleLength
   module Client
     include Kernel
 
     def client
-      return @client if defined?(@client)
-
-      @client = Net::HTTP.new(Knock::API_HOSTNAME, 443)
-      @client.use_ssl = true
-
-      @client
+      Net::HTTP.new(Knock.config.api_hostname, 443).tap do |http_client|
+        http_client.use_ssl = true
+        http_client.open_timeout = Knock.config.timeout
+        http_client.read_timeout = Knock.config.timeout
+        http_client.write_timeout = Knock.config.timeout if RUBY_VERSION >= '2.6.0'
+      end
     end
 
     def execute_request(request:)
-      response = client.request(request)
+      begin
+        response = client.request(request)
+      rescue Net::OpenTimeout, Net::ReadTimeout, Net::WriteTimeout
+        raise TimeoutError.new(
+          message: 'API Timeout Error'
+        )
+      end
 
       http_status = response.code.to_i
       handle_error_response(response: response) if http_status >= 400
@@ -32,15 +39,15 @@ def get_request(path:, auth: false, params: {}, access_token: nil)
         'Content-Type' => 'application/json'
       )
 
-      request['Authorization'] = "Bearer #{access_token || Knock.key!}" if auth
+      request['Authorization'] = "Bearer #{access_token || Knock.config.key!}" if auth
       request['User-Agent'] = user_agent
       request
     end
 
     def post_request(path:, auth: false, idempotency_key: nil, body: nil)
       request = Net::HTTP::Post.new(path, 'Content-Type' => 'application/json')
       request.body = body.to_json if body
-      request['Authorization'] = "Bearer #{Knock.key!}" if auth
+      request['Authorization'] = "Bearer #{Knock.config.key!}" if auth
       request['User-Agent'] = user_agent
       request['Idempotency-Key'] = idempotency_key if idempotency_key
       request
@@ -56,15 +63,15 @@ def delete_request(path:, auth: false, params: {}, body: nil)
       )
 
       request.body = body.to_json if body
-      request['Authorization'] = "Bearer #{Knock.key!}" if auth
+      request['Authorization'] = "Bearer #{Knock.config.key!}" if auth
       request['User-Agent'] = user_agent
       request
     end
 
     def put_request(path:, auth: false, idempotency_key: nil, body: nil)
       request = Net::HTTP::Put.new(path, 'Content-Type' => 'application/json')
       request.body = body.to_json if body
-      request['Authorization'] = "Bearer #{Knock.key!}" if auth
+      request['Authorization'] = "Bearer #{Knock.config.key!}" if auth
       request['User-Agent'] = user_agent
       request['Idempotency-Key'] = idempotency_key if idempotency_key
       request
@@ -122,4 +129,5 @@ def extract_error(errors)
       end.join('; ')
     end
   end
+  # rubocop:enable Metrics/ModuleLength
 end

lib/knock/client.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# typed: true
+
+module Knock
+  # Configuration class sets config initializer
+  class Configuration
+    attr_accessor :api_hostname, :timeout, :key
+
+    def initialize
+      @timeout = 60
+    end
+
+    def key!
+      key or raise '`Knock.config.key` not set'
+    end
+  end
+end

lib/knock/configuration.rb

@@ -42,4 +42,7 @@ class AuthenticationError < KnockError; end
   # InvalidRequestError is raised when a request is initiated with invalid
   # parameters.
   class InvalidRequestError < KnockError; end
+
+  # TimeoutError is raised when the HTTP request to the API times out
+  class TimeoutError < KnockError; end
 end

lib/knock/errors.rb

@@ -8,7 +8,6 @@ module Knock
   # Methods for interacting with messages in Knock
   module Messages
     class << self
-      include Base
       include Client
 
       # Retrieves a paginated list of messages for the provided environment

lib/knock/messages.rb

@@ -9,7 +9,6 @@ module Knock
   # rubocop:disable Metrics/ModuleLength
   module Objects
     class << self
-      include Base
       include Client
 
       DEFAULT_PREFERENCE_SET_ID = 'default'

lib/knock/objects.rb

@@ -7,7 +7,6 @@ module Knock
   # Provides convienience methods for working with preferences (deprecated)
   module Preferences
     class << self
-      include Base
       include Client
 
       # Returns all preference sets for the user

lib/knock/preferences.rb

@@ -7,7 +7,6 @@ module Knock
   # Methods for interacting with tenants in Knock
   module Tenants
     class << self
-      include Base
       include Client
 
       # Retrieves all Tenants in environment

lib/knock/tenants.rb

@@ -9,7 +9,6 @@ module Knock
   # rubocop:disable Metrics/ModuleLength
   module Users
     class << self
-      include Base
       include Client
 
       DEFAULT_PREFERENCE_SET_ID = 'default'

lib/knock/users.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Knock
-  VERSION = '0.4.12'
+  VERSION = '0.5.0'
 end

lib/knock/version.rb

@@ -7,7 +7,6 @@ module Knock
   # Methods for interacting with workflows in Knock
   module Workflows
     class << self
-      include Base
       include Client
 
       # Triggers the workflow with the given key

lib/knock/workflows.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+# typed: false
+require_relative '../lib/knock'
+
+describe Knock do
+  describe '.configure' do
+    context 'with key and no timeout' do
+      before do
+        Knock.configure do |config|
+          config.key = 'example_api_key'
+        end
+      end
+
+      it 'sets the key and default timeout configuration' do
+        expect(Knock.config.key).to eq('example_api_key')
+        expect(Knock.config.timeout).to eq(60)
+      end
+    end
+
+    context 'with key and timeout' do
+      before do
+        Knock.configure do |config|
+          config.key = 'example_api_key'
+          config.timeout = 120
+        end
+      end
+
+      it 'sets the key and timeout configuration' do
+        expect(Knock.config.key).to eq('example_api_key')
+        expect(Knock.config.timeout).to eq(120)
+      end
+    end
+  end
+end
+
+describe Knock::Configuration do
+  describe '.key!' do
+    context 'with key set' do
+      before do
+        Knock.config.key = 'example_api_key'
+      end
+
+      it 'returns the key' do
+        expect(Knock.config.key!).to eq('example_api_key')
+      end
+    end
+
+    context 'with key not set' do
+      before do
+        Knock.config.key = nil
+      end
+
+      it 'throws an error' do
+        expect do
+          Knock.config.key!
+        end.to raise_error(
+          '`Knock.config.key` not set'
+        )
+      end
+    end
+  end
+end