Merge pull request #30 from Bandwidth/release/2021-09-17-18-16-53

DX-2204 Voice, Answering Machine Detection

Author: ajrice6713

Gemfile

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source 'https://rubygems.org'
 
 group :test do

bandwidth.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bandwidth-sdk'
-  s.version = '8.0.0'
+  s.version = '9.0.0'
   s.summary = 'bandwidth'
   s.description = 'Bandwidth\'s set of APIs'
   s.authors = ['APIMatic SDK Generator']
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency('builder', '~> 3.2.4')
   s.add_development_dependency('minitest', '~> 5.14', '>= 5.14.1')
   s.add_development_dependency('minitest-proveit', '~> 1.0')
-  s.required_ruby_version = '>= 2.0'
+  s.required_ruby_version = ['>= 2.0']
   s.files = Dir['{bin,lib,man,test,spec}/**/*', 'README*', 'LICENSE*']
   s.require_paths = ['lib']
 end

lib/bandwidth.rb

@@ -9,40 +9,41 @@
 require 'certifi'
 require 'logging'
 
-require_relative 'bandwidth/api_helper.rb'
-require_relative 'bandwidth/client.rb'
+require_relative 'bandwidth/api_helper'
+require_relative 'bandwidth/client'
 
 # Utilities
-require_relative 'bandwidth/utilities/file_wrapper.rb'
-require_relative 'bandwidth/utilities/date_time_helper.rb'
+require_relative 'bandwidth/utilities/file_wrapper'
+require_relative 'bandwidth/utilities/date_time_helper'
 
 # Http
-require_relative 'bandwidth/http/api_response.rb'
-require_relative 'bandwidth/http/http_call_back.rb'
-require_relative 'bandwidth/http/http_client.rb'
-require_relative 'bandwidth/http/faraday_client.rb'
-require_relative 'bandwidth/http/http_method_enum.rb'
-require_relative 'bandwidth/http/http_request.rb'
-require_relative 'bandwidth/http/http_response.rb'
+require_relative 'bandwidth/http/api_response'
+require_relative 'bandwidth/http/http_call_back'
+require_relative 'bandwidth/http/http_client'
+require_relative 'bandwidth/http/faraday_client'
+require_relative 'bandwidth/http/http_method_enum'
+require_relative 'bandwidth/http/http_request'
+require_relative 'bandwidth/http/http_response'
 
 # Models
-require_relative 'bandwidth/models/base_model.rb'
+require_relative 'bandwidth/models/base_model'
 
 # Exceptions
-require_relative 'bandwidth/exceptions/api_exception.rb'
+require_relative 'bandwidth/exceptions/api_exception'
 
-require_relative 'bandwidth/configuration.rb'
+require_relative 'bandwidth/configuration'
 
 # Namespaces
 require_relative 'bandwidth/messaging_lib/messaging'
-require_relative 'bandwidth/http/auth/messaging_basic_auth.rb'
+require_relative 'bandwidth/http/auth/messaging_basic_auth'
 require_relative 'bandwidth/multi_factor_auth_lib/multi_factor_auth'
-require_relative 'bandwidth/http/auth/multi_factor_auth_basic_auth.rb'
+require_relative 'bandwidth/http/auth/multi_factor_auth_basic_auth'
 require_relative 'bandwidth/phone_number_lookup_lib/phone_number_lookup'
-require_relative 'bandwidth/http/auth/phone_number_lookup_basic_auth.rb'
+require_relative 'bandwidth/http/auth/phone_number_lookup_basic_auth'
 require_relative 'bandwidth/voice_lib/voice'
-require_relative 'bandwidth/http/auth/voice_basic_auth.rb'
+require_relative 'bandwidth/http/auth/voice_basic_auth'
 require_relative 'bandwidth/web_rtc_lib/web_rtc'
+require_relative 'bandwidth/http/auth/web_rtc_basic_auth'
 require_relative 'bandwidth/http/auth/web_rtc_basic_auth.rb'
 
 # External Files

lib/bandwidth/api_helper.rb

@@ -13,13 +13,14 @@ class APIHelper
     def self.serialize_array(key, array, formatting: 'indexed')
       tuples = []
 
-      if formatting == 'unindexed'
+      case formatting
+      when 'unindexed'
         tuples += array.map { |element| ["#{key}[]", element] }
-      elsif formatting == 'indexed'
+      when 'indexed'
         tuples += array.map.with_index do |element, index|
           ["#{key}[#{index}]", element]
         end
-      elsif formatting == 'plain'
+      when 'plain'
         tuples += array.map { |element| [key, element] }
       else
         raise ArgumentError, 'Invalid format provided.'
@@ -60,7 +61,7 @@ def self.append_url_with_template_parameters(query_builder, parameters)
         end
 
         # Find the template parameter and replace it with its value.
-        query_builder = query_builder.gsub('{' + key.to_s + '}', replace_value)
+        query_builder = query_builder.gsub("{#{key}}", replace_value)
       end
       query_builder
     end
@@ -85,15 +86,16 @@ def self.append_url_with_query_parameters(query_builder, parameters)
         unless value.nil?
           if value.instance_of? Array
             value.compact!
-            query_builder += if array_serialization == 'csv'
+            query_builder += case array_serialization
+                             when 'csv'
                                "#{seperator}#{key}=#{value.map do |element|
                                  CGI.escape(element.to_s)
                                end.join(',')}"
-                             elsif array_serialization == 'psv'
+                             when 'psv'
                                "#{seperator}#{key}=#{value.map do |element|
                                  CGI.escape(element.to_s)
                                end.join('|')}"
-                             elsif array_serialization == 'tsv'
+                             when 'tsv'
                                "#{seperator}#{key}=#{value.map do |element|
                                  CGI.escape(element.to_s)
                                end.join("\t")}"
@@ -119,7 +121,7 @@ def self.clean_url(url)
       raise ArgumentError, 'Invalid Url.' unless url.instance_of? String
 
       # Ensure that the urls are absolute.
-      matches = url.match(%r{^(https?:\/\/[^\/]+)})
+      matches = url.match(%r{^(https?://[^/]+)})
       raise ArgumentError, 'Invalid Url format.' if matches.nil?
 
       # Get the http protocol match.
@@ -130,7 +132,7 @@ def self.clean_url(url)
 
       # Remove redundant forward slashes.
       query = url[protocol.length...(!index.nil? ? index : url.length)]
-      query.gsub!(%r{\/\/+}, '/')
+      query.gsub!(%r{//+}, '/')
 
       # Get the parameters.
       parameters = !index.nil? ? url[url.index('?')...url.length] : ''
@@ -142,7 +144,7 @@ def self.clean_url(url)
     # Parses JSON string.
     # @param [String] A JSON string.
     def self.json_deserialize(json)
-      return JSON.parse(json)
+      JSON.parse(json)
     rescue StandardError
       raise TypeError, 'Server responded with invalid JSON.'
     end
@@ -171,6 +173,7 @@ def self.custom_merge(a, b)
       a.each do |key, value_a|
         b.each do |k, value_b|
           next unless key == k
+
           x[k] = []
           if value_a.instance_of? Array
             value_a.each do |v|
@@ -215,13 +218,12 @@ def self.form_encode(obj, instance_name, formatting: 'indexed')
       elsif obj.instance_of? Array
         if formatting == 'indexed'
           obj.each_with_index do |value, index|
-            retval.merge!(APIHelper.form_encode(value, instance_name + '[' +
-              index.to_s + ']'))
+            retval.merge!(APIHelper.form_encode(value, "#{instance_name}[#{index}]"))
           end
         elsif serializable_types.map { |x| obj[0].is_a? x }.any?
           obj.each do |value|
             abc = if formatting == 'unindexed'
-                    APIHelper.form_encode(value, instance_name + '[]',
+                    APIHelper.form_encode(value, "#{instance_name}[]",
                                           formatting: formatting)
                   else
                     APIHelper.form_encode(value, instance_name,
@@ -231,14 +233,14 @@ def self.form_encode(obj, instance_name, formatting: 'indexed')
           end
         else
           obj.each_with_index do |value, index|
-            retval.merge!(APIHelper.form_encode(value, instance_name + '[' +
-              index.to_s + ']', formatting: formatting))
+            retval.merge!(APIHelper.form_encode(value, "#{instance_name}[#{index}]",
+                                                formatting: formatting))
           end
         end
       elsif obj.instance_of? Hash
         obj.each do |key, value|
-          retval.merge!(APIHelper.form_encode(value, instance_name + '[' +
-            key.to_s + ']', formatting: formatting))
+          retval.merge!(APIHelper.form_encode(value, "#{instance_name}[#{key}]",
+                                              formatting: formatting))
         end
       elsif obj.instance_of? File
         retval[instance_name] = UploadIO.new(

lib/bandwidth/configuration.rb

@@ -28,25 +28,13 @@ class Server
   # are configured in this class.
   class Configuration
     # The attribute readers for properties.
-    attr_reader :http_client
-    attr_reader :timeout
-    attr_reader :max_retries
-    attr_reader :retry_interval
-    attr_reader :backoff_factor
-    attr_reader :retry_statuses
-    attr_reader :retry_methods
-    attr_reader :environment
-    attr_reader :base_url
-    attr_reader :messaging_basic_auth_user_name
-    attr_reader :messaging_basic_auth_password
-    attr_reader :multi_factor_auth_basic_auth_user_name
-    attr_reader :multi_factor_auth_basic_auth_password
-    attr_reader :phone_number_lookup_basic_auth_user_name
-    attr_reader :phone_number_lookup_basic_auth_password
-    attr_reader :voice_basic_auth_user_name
-    attr_reader :voice_basic_auth_password
-    attr_reader :web_rtc_basic_auth_user_name
-    attr_reader :web_rtc_basic_auth_password
+    attr_reader :http_client, :timeout, :max_retries, :retry_interval, :backoff_factor,
+                :retry_statuses, :retry_methods, :environment, :base_url,
+                :messaging_basic_auth_user_name, :messaging_basic_auth_password,
+                :multi_factor_auth_basic_auth_user_name, :multi_factor_auth_basic_auth_password,
+                :phone_number_lookup_basic_auth_user_name, :phone_number_lookup_basic_auth_password,
+                :voice_basic_auth_user_name, :voice_basic_auth_password,
+                :web_rtc_basic_auth_user_name, :web_rtc_basic_auth_password
 
     class << self
       attr_reader :environments

lib/bandwidth/http/faraday_client.rb

@@ -27,7 +27,7 @@ def initialize(timeout:, max_retries:, retry_interval:,
                                 methods: retry_methods
         faraday.adapter Faraday.default_adapter
         faraday.options[:params_encoder] = Faraday::FlatParamsEncoder
-        faraday.options[:timeout] = timeout if timeout > 0
+        faraday.options[:timeout] = timeout if timeout.positive?
       end
     end