Merge 8ce4e4a into 1170d02

.gitignore

@@ -2,3 +2,4 @@
 Gemfile.lock
 coverage
 doc
+sorbet/rbi/hidden-definitions/errors.txt

.travis.yml

@@ -1,6 +1,5 @@
 dist: xenial
 language: ruby
-cache: bundler
 rvm:
   - 2.5
   - 2.6

Gemfile

@@ -9,3 +9,4 @@ gem 'yard', '~> 0.9'
 gem 'simplecov', '~> 0.16'
 gem 'coveralls', '~> 0.8'
 gem 'json', '~> 2'
+gem 'sorbet', :group => :development

lib/nexmo.rb

@@ -1,5 +1,7 @@
+# typed: false
 # frozen_string_literal: true
 require 'zeitwerk'
+require 'sorbet-runtime'
 
 module Nexmo
   loader = Zeitwerk::Loader.new

lib/nexmo/abstract_authentication.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 module Nexmo
   class AbstractAuthentication
     def initialize(config)

lib/nexmo/account.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/alerts.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/applications.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/applications/list_response.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 class Nexmo::Applications::ListResponse < Nexmo::Response
   include Enumerable
 

lib/nexmo/authentication_error.rb

@@ -1,3 +1,4 @@
+# typed: strong
 module Nexmo
   class AuthenticationError < ClientError
   end

lib/nexmo/basic.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 module Nexmo
   class Basic < AbstractAuthentication
     def update(object)

lib/nexmo/bearer_token.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/calls.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/calls/dtmf.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/calls/list_response.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 class Nexmo::Calls::ListResponse < Nexmo::Response
   include Enumerable
 

lib/nexmo/calls/stream.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/calls/talk.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/client.rb

@@ -1,3 +1,4 @@
+# typed: false
 module Nexmo
   class Client
     attr_reader :config

lib/nexmo/client_error.rb

@@ -1,3 +1,4 @@
+# typed: strong
 module Nexmo
   class ClientError < Error
   end

lib/nexmo/config.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 require 'logger'
 

lib/nexmo/conversations.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/conversations/events.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/conversations/legs.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/conversations/members.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/conversations/users.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/conversions.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/entity.rb

@@ -1,3 +1,4 @@
+# typed: false
 module Nexmo
   class Entity
     include Keys

lib/nexmo/error.rb

@@ -1,3 +1,4 @@
+# typed: strong
 module Nexmo
   class Error < StandardError
   end

lib/nexmo/errors.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 # frozen_string_literal: true
 require 'json'
 

lib/nexmo/files.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/form_data.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 module Nexmo
   module FormData
     def self.update(http_request, params)

lib/nexmo/gsm7.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 module Nexmo
   module GSM7
     CHARACTERS = "\n\f\r !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_abcdefghijklmnopqrstuvwxyz{|}~ ¡£¤¥§¿ÄÅÆÉÑÖØÜßàäåæçèéìñòöøùüΓΔΘΛΞΠΣΦΨΩ€"
@@ -8,6 +9,4 @@ def self.encoded?(string)
       REGEXP =~ string
     end
   end
-
-  private_constant :GSM7
 end

lib/nexmo/http.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 # frozen_string_literal: true
 require 'net/http'
 

lib/nexmo/json.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 # frozen_string_literal: true
 require 'json'
 

lib/nexmo/jwt.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 require 'securerandom'
 require 'openssl'

lib/nexmo/key_secret_params.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 module Nexmo
   class KeySecretParams < AbstractAuthentication
     def update(object)

lib/nexmo/keys.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/logger.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 # frozen_string_literal: true
 require 'logger'
 require 'forwardable'
@@ -15,7 +16,7 @@ def initialize(logger)
     end
 
     def log_request_info(request)
-      info do
+      @logger.info do
         format('Nexmo API request', {
           method: request.method,
           path: request.uri.path
@@ -24,7 +25,7 @@ def log_request_info(request)
     end
 
     def log_response_info(response, host)
-      info do
+      @logger.info do
         format('Nexmo API response', {
           host: host,
           status: response.code,

lib/nexmo/messages.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/namespace.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 # frozen_string_literal: true
 require 'net/http'
 require 'json'
@@ -7,8 +8,6 @@ class Namespace
     def initialize(config)
       @config = config
 
-      @logger = config.logger
-
       @host = self.class.host
 
       @http = Net::HTTP.new(@host, Net::HTTP.https_default_port, p_addr = nil)
@@ -53,7 +52,7 @@ def self.response_class=(response_class)
       @response_class = response_class
     end
 
-    private
+    protected
 
     Get = Net::HTTP::Get
     Put = Net::HTTP::Put
@@ -86,15 +85,15 @@ def request(path, params: nil, type: Get, response_class: nil, &block)
 
       self.class.request_body.update(message, params) if type::REQUEST_HAS_BODY
 
-      @logger.log_request_info(message)
+      logger.log_request_info(message)
 
       response = @http.request(message, &block)
 
-      @logger.log_response_info(response, @host)
+      logger.log_response_info(response, @host)
 
       return if block
 
-      @logger.debug(response.body) if response.body
+      logger.debug(response.body) if response.body
 
       parse(response, response_class || self.class.response_class)
     end
@@ -115,6 +114,10 @@ def parse(response, response_class)
         raise Errors.parse(response)
       end
     end
+
+    def logger
+      @config.logger
+    end
   end
 
   private_constant :Namespace

lib/nexmo/number_insight.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/number_insight/response.rb

@@ -1,3 +1,4 @@
+# typed: false
 class Nexmo::NumberInsight::Response < Nexmo::Response
   def success?
     status.zero?

lib/nexmo/numbers.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/numbers/list_response.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 class Nexmo::Numbers::ListResponse < Nexmo::Response
   include Enumerable
 

lib/nexmo/numbers/response.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 class Nexmo::Numbers::Response < Nexmo::Response

lib/nexmo/params.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 # frozen_string_literal: true
 require 'cgi'
 

lib/nexmo/pricing.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/pricing_types.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/redact.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/response.rb

@@ -1,3 +1,4 @@
+# typed: false
 module Nexmo
   class Response
     def initialize(entity=nil, http_response=nil)

lib/nexmo/secrets.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/secrets/list_response.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 class Nexmo::Secrets::ListResponse < Nexmo::Response
   include Enumerable
 

lib/nexmo/server_error.rb

@@ -1,3 +1,4 @@
+# typed: strong
 module Nexmo
   class ServerError < Error
   end

lib/nexmo/signature.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 require 'openssl'
 require 'digest/md5'

lib/nexmo/sms.rb

@@ -1,7 +1,9 @@
+# typed: strict
 # frozen_string_literal: true
 
 module Nexmo
   class SMS < Namespace
+    extend T::Sig
     include Keys
 
     self.host = 'rest.nexmo.com'
@@ -94,20 +96,22 @@ class SMS < Namespace
     #
     # @see https://developer.nexmo.com/api/sms#send-an-sms
     #
+    sig { params(params: T::Hash[Symbol, T.untyped]).returns(Nexmo::SMS::Response) }
     def send(params)
-      if unicode?(params[:text]) && params[:type] != 'unicode'
+      if unicode?(params.fetch(:text)) && params[:type] != 'unicode'
         message = 'Sending unicode text SMS without setting the type parameter to "unicode". ' \
           'See https://developer.nexmo.com/messaging/sms for details, ' \
           'or email support@nexmo.com if you have any questions.'
 
-        @logger.warn(message)
+        logger.warn(message)
       end
 
       request('/sms/json', params: hyphenate(params), type: Post, response_class: Response)
     end
 
     private
 
+    sig { params(text: String).returns(T::Boolean) }
     def unicode?(text)
       !GSM7.encoded?(text)
     end

lib/nexmo/sms/response.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 class Nexmo::SMS::Response < Nexmo::Response

lib/nexmo/tfa.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Nexmo

lib/nexmo/user_agent.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 # frozen_string_literal: true
 
 module Nexmo