twilio-ruby 5.20.0 → 5.47.0

data/Rakefile

@@ -8,57 +8,3 @@ RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
 task test: :spec
-
-task :authors do
-  `make authors`
-end
-
-task :deploy, [:version] => [:spec, :authors] do |t, args|
-  current_version = Twilio::VERSION
-
-  if args.version.nil?
-    version = Twilio::VERSION
-    version_parts = version.split('.')
-    increment = version_parts.pop
-    increment_prefix = increment.split(/\d/)[0]
-
-    increment = increment[increment_prefix.length..-1] if increment_prefix
-
-    increment = increment.to_i + 1
-    increment = "#{increment_prefix}#{increment}" if increment_prefix
-
-    version = [*version_parts, increment].join('.')
-  else
-    version = args.version
-  end
-
-  puts("Deploying #{version}")
-
-  # Update version.rb
-  version_file = <<SRC
-module Twilio
-  VERSION = '#{version}'
-end
-SRC
-  File.write('lib/twilio-ruby/version.rb', version_file)
-
-  # Update README.md
-  current_readme = File.read('README.md')
-  new_readme = current_readme.gsub(Regexp.new(current_version.gsub('.', '\.')), version)
-  File.write('README.md', new_readme)
-
-  # Make a git commit
-  `git commit -am "Bumping to version #{version}"`
-
-  # Do the gem deployment
-  `make gem`
-
-  # Push the branch back up
-  `git push`
-
-  # Tag the branch
-  `git tag #{version}`
-
-  # Push the tags
-  `git push --tags`
-end

data/VERSIONS.md

@@ -5,11 +5,11 @@ all changes to the helper library. It is strongly encouraged that you pin at
 least the major version and potentially the minor version to avoid pulling in
 breaking changes.
 
-Semantic Versions take the form of `MAJOR`.`MINOR`.`PATCH`
+Semantic Versions take the form of `MAJOR.MINOR.PATCH`
 
-When bugs are fixed in the library in a backwards compatible way, the `PATCH`
+When bugs are fixed in the library in a backwards-compatible way, the `PATCH`
 level will be incremented by one. When new features are added to the library
-in a backwards compatible way, the `PATCH` level will be incremented by one.
+in a backwards-compatible way, the `PATCH` level will be incremented by one.
 `PATCH` changes should _not_ break your code and are generally safe for upgrade.
 
 When a new large feature set comes online or a small breaking change is
@@ -19,8 +19,8 @@ change for upgrade. These backwards-incompatible changes will generally be
 limited to a small number of function signature changes.
 
 The `MAJOR` version is used to indicate the family of technology represented by
-the helper library. Breaking changes that requires extensive reworking of code
-will case the `MAJOR` version to be incremented by one, and the `MINOR` and
+the helper library. Breaking changes that require extensive reworking of code
+will cause the `MAJOR` version to be incremented by one, and the `MINOR` and
 `PATCH` versions will be reset to zero. Twilio understands that this can be very
 disruptive, so we will only introduce this type of breaking change when
 absolutely necessary. New `MAJOR` versions will be communicated in advance with
@@ -28,9 +28,8 @@ absolutely necessary. New `MAJOR` versions will be communicated in advance with
 
 ## Supported Versions
 
-`twilio-ruby` follows an evergreen model of support. New features and
-functionality will only be added to the current version. The current version -
-1 will continue to be supported with bug fixes and security updates, but no new
-features.
+Only the current `MAJOR` version of `twilio-ruby` is supported. New
+features, functionality, bug fixes, and security updates will only be added to
+the current `MAJOR` version.
 
-[semver]: http://semver.org/
+[semver]: https://semver.org

data/lib/twilio-ruby.rb

@@ -2,12 +2,10 @@
 
 require 'net/http'
 require 'net/https'
-require 'nokogiri'
 require 'cgi'
 require 'openssl'
 require 'base64'
 require 'forwardable'
-require 'jwt'
 require 'time'
 require 'json'
 
@@ -15,37 +13,32 @@ require 'twilio-ruby/version' unless defined?(Twilio::VERSION)
 require 'rack/twilio_webhook_authentication'
 
 require 'twilio-ruby/util'
-require 'twilio-ruby/jwt/jwt'
-require 'twilio-ruby/jwt/access_token'
-require 'twilio-ruby/jwt/client_capability'
-require 'twilio-ruby/jwt/task_router'
 require 'twilio-ruby/security/request_validator'
 require 'twilio-ruby/util/configuration'
 
-require 'twilio-ruby/twiml/twiml'
-require 'twilio-ruby/twiml/voice_response'
-require 'twilio-ruby/twiml/messaging_response'
-
-Dir[File.dirname(__FILE__) + '/twilio-ruby/http/**/*.rb'].each do |file|
+Dir[File.dirname(__FILE__) + '/twilio-ruby/http/**/*.rb'].sort.each do |file|
   require file
 end
-Dir[File.dirname(__FILE__) + '/twilio-ruby/framework/**/*.rb'].each do |file|
+Dir[File.dirname(__FILE__) + '/twilio-ruby/framework/**/*.rb'].sort.each do |file|
   require file
 end
-Dir[File.dirname(__FILE__) + '/twilio-ruby/rest/*.rb'].each do |file|
+Dir[File.dirname(__FILE__) + '/twilio-ruby/rest/*.rb'].sort.each do |file|
   require file
 end
-Dir[File.dirname(__FILE__) + '/twilio-ruby/rest/**/*.rb'].each do |file|
+Dir[File.dirname(__FILE__) + '/twilio-ruby/rest/**/*.rb'].sort.each do |file|
   require file
 end
-Dir[File.dirname(__FILE__) + '/twilio-ruby/compatibility/**/*.rb'].each do |file|
+Dir[File.dirname(__FILE__) + '/twilio-ruby/compatibility/**/*.rb'].sort.each do |file|
   require file
 end
 
 module Twilio
   extend SingleForwardable
 
-  def_delegators :configuration, :account_sid, :auth_token
+  autoload :JWT, File.join(File.dirname(__FILE__), 'twilio-ruby', 'jwt', 'jwt.rb')
+  autoload :TwiML, File.join(File.dirname(__FILE__), 'twilio-ruby', 'twiml', 'twiml.rb')
+
+  def_delegators :configuration, :account_sid, :auth_token, :http_client, :region, :edge, :logger
 
   ##
   # Pre-configure with account SID and auth token so that you don't need to
@@ -59,5 +52,6 @@ module Twilio
   def self.configuration
     @configuration ||= Util::Configuration.new
   end
+
   private_class_method :configuration
 end

data/lib/twilio-ruby/framework/domain.rb

@@ -20,7 +20,7 @@ module Twilio
         url = uri.match(/^http/) ? uri : absolute_url(uri)
 
         @client.request(
-          @host,
+          @base_url,
           @port,
           method,
           url,

data/lib/twilio-ruby/framework/error.rb

@@ -11,12 +11,12 @@ module Twilio
     end
 
     class RestError < TwilioError
-      attr_reader :message, :response, :code, :status_code, :detail, :more_info, :error_message
+      attr_reader :message, :response, :code, :status_code, :details, :more_info, :error_message
 
       def initialize(message, response)
         @status_code = response.status_code
         @code = response.body.fetch('code', @status_code)
-        @detail = response.body.fetch('detail', nil)
+        @details = response.body.fetch('details', nil)
         @error_message = response.body.fetch('message', nil)
         @more_info = response.body.fetch('more_info', nil)
         @message = format_message(message)
@@ -39,7 +39,7 @@ module Twilio
       def format_message(initial_message)
         message = "[HTTP #{status_code}] #{code} : #{initial_message}"
         message += "\n#{error_message}" if error_message
-        message += "\n#{detail}" if detail
+        message += "\n#{details}" if details
         message += "\n#{more_info}" if more_info
         message + "\n\n"
       end

data/lib/twilio-ruby/framework/version.rb

@@ -57,7 +57,7 @@ module Twilio
         Twilio::REST::RestError.new(header, response)
       end
 
-      def fetch(method, uri, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
+      def fetch(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
         response = request(
           method,
           uri,
@@ -68,7 +68,8 @@ module Twilio
           timeout
         )
 
-        if response.status_code < 200 || response.status_code >= 300
+        # Note that 3XX response codes are allowed for fetches.
+        if response.status_code < 200 || response.status_code >= 400
           raise exception(response, 'Unable to fetch record')
         end
 
@@ -93,7 +94,7 @@ module Twilio
         response.body
       end
 
-      def delete(method, uri, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
+      def delete(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
         response = request(
           method,
           uri,
@@ -112,22 +113,17 @@ module Twilio
       end
 
       def read_limits(limit = nil, page_size = nil)
-        page_limit = nil
-
-        unless limit.nil?
-          # If there is no user-specified page_size, pick the most network efficient size
+        unless limit.nil? || page_size
           page_size = limit
-          page_limit = (limit / page_size.to_f).ceil
         end
 
         {
           limit: limit || nil,
-          page_size: page_size || nil,
-          page_limit: page_limit
+          page_size: page_size || nil
         }
       end
 
-      def page(method, uri, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
+      def page(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
         request(
           method,
           uri,

data/lib/twilio-ruby/http/http_client.rb

@@ -8,12 +8,11 @@ module Twilio
       attr_accessor :adapter
       attr_reader :timeout, :last_response, :last_request
 
-      def initialize(proxy_addr = nil, proxy_port = nil, proxy_user = nil, proxy_pass = nil, ssl_ca_file = nil,
-                     timeout: nil)
-        @proxy_addr = proxy_addr
-        @proxy_port = proxy_port
-        @proxy_user = proxy_user
-        @proxy_pass = proxy_pass
+      def initialize(proxy_prot = nil, proxy_addr = nil, proxy_port = nil, proxy_user = nil, proxy_pass = nil,
+                     ssl_ca_file = nil, timeout: nil)
+        @proxy_prot = proxy_prot
+        @proxy_path = "#{proxy_addr}:#{proxy_port}" if proxy_addr && proxy_port
+        @proxy_auth = "#{proxy_user}:#{proxy_pass}@" if proxy_pass && proxy_user
         @ssl_ca_file = ssl_ca_file
         @timeout = timeout
         @adapter = Faraday.default_adapter
@@ -26,19 +25,15 @@ module Twilio
           f.adapter @adapter
           f.headers = request.headers
           f.basic_auth(request.auth[0], request.auth[1])
-          if @proxy_addr
-            f.proxy "#{@proxy_user}:#{@proxy_pass}@#{@proxy_addr}:#{@proxy_port}"
-          end
+          f.proxy = "#{@proxy_prot}://#{@proxy_auth}#{@proxy_path}" if @proxy_prot && @proxy_path
           f.options.open_timeout = request.timeout || @timeout
           f.options.timeout = request.timeout || @timeout
         end
 
         @last_request = request
         @last_response = nil
-        response = @connection.send(request.method.downcase.to_sym,
-                                    request.url,
-                                    request.method == 'GET' ? request.params : request.data)
 
+        response = send(request)
         if response.body && !response.body.empty?
           object = response.body
         elsif response.status == 400
@@ -51,6 +46,14 @@ module Twilio
         twilio_response
       end
 
+      def send(request)
+        @connection.send(request.method.downcase.to_sym,
+                         request.url,
+                         request.method == 'GET' ? request.params : request.data)
+      rescue Faraday::Error => e
+        raise Twilio::REST::TwilioError, e
+      end
+
       def request(host, port, method, url, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
         request = Twilio::Request.new(host, port, method, url, params, data, headers, auth, timeout)
         _request(request)

data/lib/twilio-ruby/jwt/access_token.rb

@@ -20,7 +20,8 @@ module Twilio
                     :grants,
                     :nbf,
                     :ttl,
-                    :valid_until
+                    :valid_until,
+                    :region
 
       def initialize(
         account_sid,
@@ -30,7 +31,8 @@ module Twilio
         identity: nil,
         nbf: nil,
         ttl: 3600,
-        valid_until: nil
+        valid_until: nil,
+        region: nil
       )
         super(secret_key: secret,
               issuer: signing_key_sid,
@@ -46,6 +48,7 @@ module Twilio
         @grants = grants
         @ttl = ttl
         @valid_until = valid_until
+        @region = region
       end
 
       def add_grant(grant)
@@ -76,6 +79,8 @@ module Twilio
           cty: 'twilio-fpa;v=1'
         }
 
+        headers[:twr] = region unless region&.nil?
+
         headers
       end
 

data/lib/twilio-ruby/jwt/jwt.rb

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
+require 'jwt'
+
 module Twilio
   module JWT
+    autoload :AccessToken, File.join(File.dirname(__FILE__), 'access_token.rb')
+    autoload :ClientCapability, File.join(File.dirname(__FILE__), 'client_capability.rb')
+    autoload :TaskRouterCapability, File.join(File.dirname(__FILE__), 'task_router.rb')
+
     class BaseJWT
       # valid_until overrides ttl if specified
       def initialize(secret_key: nil, issuer: nil, subject: nil, nbf: nil, ttl: 3600, valid_until: nil)

data/lib/twilio-ruby/jwt/task_router.rb

@@ -84,8 +84,8 @@ module Twilio
           [TASK_ROUTER_BASE_URL, TASK_ROUTER_VERSION, 'Workspaces'].join('/')
         end
 
-        def self.workspace(worskspace_sid)
-          [TASK_ROUTER_BASE_URL, TASK_ROUTER_VERSION, 'Workspaces', worskspace_sid].join('/')
+        def self.workspace(workspace_sid)
+          [TASK_ROUTER_BASE_URL, TASK_ROUTER_VERSION, 'Workspaces', workspace_sid].join('/')
         end
 
         def self.all_workspaces

data/lib/twilio-ruby/rest/accounts.rb

@@ -3,7 +3,7 @@
 # \ / _    _  _|   _  _
 #  | (_)\/(_)(_|\/| |(/_  v1.0.0
 #       /       /
-# 
+#
 # frozen_string_literal: true
 
 module Twilio
@@ -28,12 +28,24 @@ module Twilio
         @v1 ||= V1.new self
       end
 
+      ##
+      # @return [Twilio::REST::Accounts::V1::AuthTokenPromotionInstance]
+      def auth_token_promotion
+        self.v1.auth_token_promotion()
+      end
+
       ##
       # @return [Twilio::REST::Accounts::V1::CredentialInstance]
       def credentials
         self.v1.credentials()
       end
 
+      ##
+      # @return [Twilio::REST::Accounts::V1::SecondaryAuthTokenInstance]
+      def secondary_auth_token
+        self.v1.secondary_auth_token()
+      end
+
       ##
       # Provide a user friendly representation
       def to_s

data/lib/twilio-ruby/rest/accounts/v1.rb

@@ -3,7 +3,7 @@
 # \ / _    _  _|   _  _
 #  | (_)\/(_)(_|\/| |(/_  v1.0.0
 #       /       /
-# 
+#
 # frozen_string_literal: true
 
 module Twilio
@@ -15,7 +15,15 @@ module Twilio
         def initialize(domain)
           super
           @version = 'v1'
+          @auth_token_promotion = nil
           @credentials = nil
+          @secondary_auth_token = nil
+        end
+
+        ##
+        # @return [Twilio::REST::Accounts::V1::AuthTokenPromotionContext]
+        def auth_token_promotion
+          @auth_token_promotion ||= AuthTokenPromotionContext.new self
         end
 
         ##
@@ -24,6 +32,12 @@ module Twilio
           @credentials ||= CredentialList.new self
         end
 
+        ##
+        # @return [Twilio::REST::Accounts::V1::SecondaryAuthTokenContext]
+        def secondary_auth_token
+          @secondary_auth_token ||= SecondaryAuthTokenContext.new self
+        end
+
         ##
         # Provide a user friendly representation
         def to_s

data/lib/twilio-ruby/rest/accounts/v1/auth_token_promotion.rb

@@ -0,0 +1,186 @@
+##
+# This code was generated by
+# \ / _    _  _|   _  _
+#  | (_)\/(_)(_|\/| |(/_  v1.0.0
+#       /       /
+#
+# frozen_string_literal: true
+
+module Twilio
+  module REST
+    class Accounts < Domain
+      class V1 < Version
+        class AuthTokenPromotionList < ListResource
+          ##
+          # Initialize the AuthTokenPromotionList
+          # @param [Version] version Version that contains the resource
+          # @return [AuthTokenPromotionList] AuthTokenPromotionList
+          def initialize(version)
+            super(version)
+
+            # Path Solution
+            @solution = {}
+          end
+
+          ##
+          # Provide a user friendly representation
+          def to_s
+            '#<Twilio.Accounts.V1.AuthTokenPromotionList>'
+          end
+        end
+
+        class AuthTokenPromotionPage < Page
+          ##
+          # Initialize the AuthTokenPromotionPage
+          # @param [Version] version Version that contains the resource
+          # @param [Response] response Response from the API
+          # @param [Hash] solution Path solution for the resource
+          # @return [AuthTokenPromotionPage] AuthTokenPromotionPage
+          def initialize(version, response, solution)
+            super(version, response)
+
+            # Path Solution
+            @solution = solution
+          end
+
+          ##
+          # Build an instance of AuthTokenPromotionInstance
+          # @param [Hash] payload Payload response from the API
+          # @return [AuthTokenPromotionInstance] AuthTokenPromotionInstance
+          def get_instance(payload)
+            AuthTokenPromotionInstance.new(@version, payload, )
+          end
+
+          ##
+          # Provide a user friendly representation
+          def to_s
+            '<Twilio.Accounts.V1.AuthTokenPromotionPage>'
+          end
+        end
+
+        class AuthTokenPromotionContext < InstanceContext
+          ##
+          # Initialize the AuthTokenPromotionContext
+          # @param [Version] version Version that contains the resource
+          # @return [AuthTokenPromotionContext] AuthTokenPromotionContext
+          def initialize(version)
+            super(version)
+
+            # Path Solution
+            @solution = {}
+            @uri = "/AuthTokens/Promote"
+          end
+
+          ##
+          # Update the AuthTokenPromotionInstance
+          # @return [AuthTokenPromotionInstance] Updated AuthTokenPromotionInstance
+          def update
+            payload = @version.update('POST', @uri)
+
+            AuthTokenPromotionInstance.new(@version, payload, )
+          end
+
+          ##
+          # Provide a user friendly representation
+          def to_s
+            context = @solution.map {|k, v| "#{k}: #{v}"}.join(',')
+            "#<Twilio.Accounts.V1.AuthTokenPromotionContext #{context}>"
+          end
+
+          ##
+          # Provide a detailed, user friendly representation
+          def inspect
+            context = @solution.map {|k, v| "#{k}: #{v}"}.join(',')
+            "#<Twilio.Accounts.V1.AuthTokenPromotionContext #{context}>"
+          end
+        end
+
+        class AuthTokenPromotionInstance < InstanceResource
+          ##
+          # Initialize the AuthTokenPromotionInstance
+          # @param [Version] version Version that contains the resource
+          # @param [Hash] payload payload that contains response from Twilio
+          # @return [AuthTokenPromotionInstance] AuthTokenPromotionInstance
+          def initialize(version, payload)
+            super(version)
+
+            # Marshaled Properties
+            @properties = {
+                'account_sid' => payload['account_sid'],
+                'auth_token' => payload['auth_token'],
+                'date_created' => Twilio.deserialize_iso8601_datetime(payload['date_created']),
+                'date_updated' => Twilio.deserialize_iso8601_datetime(payload['date_updated']),
+                'url' => payload['url'],
+            }
+
+            # Context
+            @instance_context = nil
+            @params = {}
+          end
+
+          ##
+          # Generate an instance context for the instance, the context is capable of
+          # performing various actions.  All instance actions are proxied to the context
+          # @return [AuthTokenPromotionContext] AuthTokenPromotionContext for this AuthTokenPromotionInstance
+          def context
+            unless @instance_context
+              @instance_context = AuthTokenPromotionContext.new(@version, )
+            end
+            @instance_context
+          end
+
+          ##
+          # @return [String] The SID of the Account that the secondary Auth Token was created for
+          def account_sid
+            @properties['account_sid']
+          end
+
+          ##
+          # @return [String] The promoted Auth Token
+          def auth_token
+            @properties['auth_token']
+          end
+
+          ##
+          # @return [Time] The ISO 8601 formatted date and time in UTC when the resource was created
+          def date_created
+            @properties['date_created']
+          end
+
+          ##
+          # @return [Time] The ISO 8601 formatted date and time in UTC when the resource was last updated
+          def date_updated
+            @properties['date_updated']
+          end
+
+          ##
+          # @return [String] The URI for this resource, relative to `https://accounts.twilio.com`
+          def url
+            @properties['url']
+          end
+
+          ##
+          # Update the AuthTokenPromotionInstance
+          # @return [AuthTokenPromotionInstance] Updated AuthTokenPromotionInstance
+          def update
+            context.update
+          end
+
+          ##
+          # Provide a user friendly representation
+          def to_s
+            values = @params.map{|k, v| "#{k}: #{v}"}.join(" ")
+            "<Twilio.Accounts.V1.AuthTokenPromotionInstance #{values}>"
+          end
+
+          ##
+          # Provide a detailed, user friendly representation
+          def inspect
+            values = @properties.map{|k, v| "#{k}: #{v}"}.join(" ")
+            "<Twilio.Accounts.V1.AuthTokenPromotionInstance #{values}>"
+          end
+        end
+      end
+    end
+  end
+end