twilio-ruby 5.47.0 → 5.74.0

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
+gem 'simplecov', require: false, group: :test
 gemspec

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2021, Twilio, Inc. <help@twilio.com>
+Copyright (C) 2022, Twilio, Inc. <help@twilio.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/Makefile

@@ -1,33 +1,34 @@
-.PHONY: githooks install test lint docs docker-build docker-push
+.PHONY: githooks install test test-docker lint docs docker-build docker-push
 
 githooks:
 	ln -sf ../../githooks/pre-commit .git/hooks/pre-commit
 
-install: githooks
+install:
 	bundle install --with development; bundle exec rake install
 
-test: lint
+test:
 	bundle exec rake spec
 
-lint:
-	rubocop --cache true --parallel
+test-docker:
+	docker build -t twilio/twilio-ruby .
+	docker run twilio/twilio-ruby bundle exec rake spec
 
 docs:
-	yard doc --output-dir ./doc
+	bundle exec yard doc --output-dir ./doc
 
 authors:
 	echo "Authors\n=======\n\nA huge thanks to all of our contributors:\n\n" > AUTHORS.md
 	git log --raw | grep "^Author: " | cut -d ' ' -f2- | cut -d '<' -f1 | sed 's/^/- /' | sort | uniq >> AUTHORS.md
 
 API_DEFINITIONS_SHA=$(shell git log --oneline | grep Regenerated | head -n1 | cut -d ' ' -f 5)
+CURRENT_TAG=$(shell expr "${GITHUB_TAG}" : ".*-rc.*" >/dev/null && echo "rc" || echo "latest")
 docker-build:
 	docker build -t twilio/twilio-ruby .
-	docker tag twilio/twilio-ruby twilio/twilio-ruby:${TRAVIS_TAG}
+	docker tag twilio/twilio-ruby twilio/twilio-ruby:${GITHUB_TAG}
 	docker tag twilio/twilio-ruby twilio/twilio-ruby:apidefs-${API_DEFINITIONS_SHA}
-	docker tag twilio/twilio-ruby twilio/twilio-ruby:latest
+	docker tag twilio/twilio-ruby twilio/twilio-ruby:${CURRENT_TAG}
 
 docker-push:
-	echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin
-	docker push twilio/twilio-ruby:${TRAVIS_TAG}
+	docker push twilio/twilio-ruby:${GITHUB_TAG}
 	docker push twilio/twilio-ruby:apidefs-${API_DEFINITIONS_SHA}
-	docker push twilio/twilio-ruby:latest
+	docker push twilio/twilio-ruby:${CURRENT_TAG}

data/PULL_REQUEST_TEMPLATE.md

@@ -3,7 +3,7 @@ We appreciate the effort for this pull request but before that please make sure
 
 Please format the PR title appropriately based on the type of change:
   <type>[!]: <description>
-Where <type> is one of: docs, chore, feat, fix, test.
+Where <type> is one of: docs, chore, feat, fix, test, misc.
 Add a '!' after the type for breaking changes (e.g. feat!: new breaking feature).
 
 **All third-party contributors acknowledge that any contributions they provide will be made under the same open-source license that the open-source project is provided under.**

data/README.md

@@ -1,11 +1,9 @@
 # twilio-ruby
 
-[![Build Status](https://img.shields.io/travis/twilio/twilio-ruby.svg)][travis]
+[![Tests](https://github.com/twilio/twilio-ruby/actions/workflows/test-and-deploy.yml/badge.svg)][github-actions]
 [![Gem Version](https://img.shields.io/gem/v/twilio-ruby.svg)](https://rubygems.org/gems/twilio-ruby)
 [![Learn with TwilioQuest](https://img.shields.io/static/v1?label=TwilioQuest&message=Learn%20to%20contribute%21&color=F22F46&labelColor=1f243c&style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAASFBMVEUAAAAZGRkcHBwjIyMoKCgAAABgYGBoaGiAgICMjIyzs7PJycnMzMzNzc3UoBfd3d3m5ubqrhfrMEDu7u739/f4vSb/3AD///9tbdyEAAAABXRSTlMAAAAAAMJrBrEAAAKoSURBVHgB7ZrRcuI6EESdyxXGYoNFvMD//+l2bSszRgyUYpFAsXOeiJGmj4NkuWx1Qeh+Ekl9DgEXOBwOx+Px5xyQhDykfgq4wG63MxxaR4ddIkg6Ul3g84vCIcjPBA5gmUMeXESrlukuoK33+33uID8TWeLAdOWsKpJYzwVMB7bOzYSGOciyUlXSn0/ABXTosJ1M1SbypZ4O4MbZuIDMU02PMbauhhHMHXbmebmALIiEbbbbbUrpF1gwE9kFfRNAJaP+FQEXCCTGyJ4ngDrjOFo3jEL5JdqjF/pueR4cCeCGgAtwmuRS6gDwaRiGvu+DMFwSBLTE3+jF8JyuV1okPZ+AC4hDFhCHyHQjdjPHUKFDlHSJkHQXMB3KpSwXNGJPcwwTdZiXlRN0gSp0zpWxNtM0beYE0nRH6QIbO7rawwXaBYz0j78gxjokDuv12gVeUuBD0MDi0OQCLvDaAho4juP1Q/jkAncXqIcCfd+7gAu4QLMACCLxpRsSuQh0igu0C9Svhi7weAGZg50L3IE3cai4IfkNZAC8dfdhsUD3CgKBVC9JE5ABAFzg4QL/taYPAAWrHdYcgfLaIgAXWJ7OV38n1LEF8tt2TH29E+QAoDoO5Ve/LtCQDmKM9kPbvCEBApK+IXzbcSJ0cIGF6e8gpcRhUDogWZ8JnaWjPXc/fNnBBUKRngiHgTUSivSzDRDgHZQOLvBQgf8rRt+VdBUUhwkU6VpJ+xcOwQUqZr+mR0kvBUgv6cB4+37hQAkXqE8PwGisGhJtN4xAHMzrsgvI7rccXqSvKh6jltGlrOHA3Xk1At3LC4QiPdX9/0ndHpGVvTjR4bZA1ypAKgVcwE5vx74ulwIugDt8e/X7JgfkucBMIAr26ndnB4UCLnDOqvteQsHlgX9N4A+c4cW3DXSPbwAAAABJRU5ErkJggg==)](https://twil.io/learn-open-source)
 
-**The default branch name for this repository has been changed to `main` as of 07/27/2020.**
-
 ## Documentation
 
 The documentation for the Twilio API can be found [here][apidocs].
@@ -24,6 +22,8 @@ This library supports the following Ruby implementations:
 * Ruby 2.5
 * Ruby 2.6
 * Ruby 2.7
+* Ruby 3.0
+* Ruby 3.1
 
 ### Migrating from 4.x
 
@@ -34,13 +34,13 @@ This library supports the following Ruby implementations:
 To install using [Bundler][bundler] grab the latest stable version:
 
 ```ruby
-gem 'twilio-ruby', '~> 5.47.0'
+gem 'twilio-ruby', '~> 5.74.0'
 ```
 
 To manually install `twilio-ruby` via [Rubygems][rubygems] simply gem install:
 
 ```bash
-gem install twilio-ruby -v 5.47.0
+gem install twilio-ruby -v 5.74.0
 ```
 
 To build and install the development branch yourself from the latest source:
@@ -95,6 +95,8 @@ To take advantage of Twilio's [Global Infrastructure](https://www.twilio.com/doc
 @client.edge = 'sydney'
 ```
 
+This will result in the `hostname` transforming from `api.twilio.com` to `api.sydney.au1.twilio.com`.
+
 ### Enable Debug logging
 
 In order to enable debug logging, pass in a 'logger' instance to the client with the level set to at least 'DEBUG'
@@ -111,8 +113,6 @@ myLogger.level = Logger::DEBUG
 @client.logger = myLogger
 ```
 
-This will result in the `hostname` transforming from `api.twilio.com` to `api.sydney.au1.twilio.com`.
-
 ### Make a Call
 
 ```ruby
@@ -157,6 +157,14 @@ message_sid = 'SMxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 
 To use a custom HTTP client with this helper library, please see the [Twilio documentation](https://www.twilio.com/docs/libraries/ruby/custom-http-clients).
 
+To apply customizations such as middleware, you can use the `configure_connection` method like so:
+
+```ruby
+@client.http_client.configure_connection do |faraday|
+  faraday.use SomeMiddleware
+end
+```
+
 ### Handling Errors
 
 ```ruby
@@ -248,7 +256,7 @@ If you've instead found a bug in the library or would like new features added, g
 [bundler]: https://bundler.io
 [rubygems]: https://rubygems.org
 [gem]: https://rubygems.org/gems/twilio
-[travis]: https://travis-ci.org/twilio/twilio-ruby
+[github-actions]: https://github.com/twilio/twilio-ruby/actions/workflows/test-and-deploy.yml
 [upgrade]: https://github.com/twilio/twilio-ruby/wiki/Ruby-Version-5.x-Upgrade-Guide
 [issues]: https://github.com/twilio/twilio-ruby/issues
 [faraday]: https://github.com/lostisland/faraday

data/examples/examples.rb

@@ -69,7 +69,7 @@ puts @client.messages('SMXXXXXXXX').fetch.body
 @client.messages.create(
   from: '+14159341234',
   to: '+16105557069',
-  media_urls: 'http://example.com/media.png'
+  media_url: 'http://example.com/media.png'
 )
 
 ################ PHONE NUMBERS ################

data/lib/rack/twilio_webhook_authentication.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rack/media_type'
+
 module Rack
   # Middleware that authenticates webhooks from Twilio using the request
   # validator.
@@ -19,6 +21,10 @@ module Rack
   # doesn't validate then the middleware responds immediately with a 403 status.
 
   class TwilioWebhookAuthentication
+    # Rack's FORM_DATA_MEDIA_TYPES can be modified to taste, so we're slightly
+    # more conservative in what we consider form data.
+    FORM_URLENCODED_MEDIA_TYPE = Rack::MediaType.type('application/x-www-form-urlencoded')
+
     def initialize(app, auth_token, *paths, &auth_token_lookup)
       @app = app
       @auth_token = auth_token
@@ -30,7 +36,7 @@ module Rack
       return @app.call(env) unless env['PATH_INFO'].match(@path_regex)
       request = Rack::Request.new(env)
       original_url = request.url
-      params = request.post? ? request.POST : {}
+      params = extract_params!(request)
       auth_token = @auth_token || get_auth_token(params['AccountSid'])
       validator = Twilio::Security::RequestValidator.new(auth_token)
       signature = env['HTTP_X_TWILIO_SIGNATURE'] || ''
@@ -44,5 +50,23 @@ module Rack
         ]
       end
     end
+
+    # Extract the params from the the request that we can use to determine the
+    # signature. This _may_ modify the passed in request since it may read/rewind
+    # the body.
+    def extract_params!(request)
+      return {} unless request.post?
+
+      if request.media_type == FORM_URLENCODED_MEDIA_TYPE
+        request.POST
+      else
+        request.body.rewind
+        body = request.body.read
+        request.body.rewind
+        body
+      end
+    end
+
+    private :extract_params!
   end
 end

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

@@ -16,25 +16,41 @@ module Twilio
         @ssl_ca_file = ssl_ca_file
         @timeout = timeout
         @adapter = Faraday.default_adapter
+        @configure_connection_blocks = []
       end
 
-      def _request(request)
+      def configure_connection(&block)
+        raise ArgumentError, "#{__method__} must be given a block!" unless block_given?
+
+        @configure_connection_blocks << block
+        nil
+      end
+
+      def _request(request) # rubocop:disable Metrics/MethodLength
         @connection = Faraday.new(url: request.host + ':' + request.port.to_s, ssl: { verify: true }) do |f|
           f.options.params_encoder = Faraday::FlatParamsEncoder
           f.request :url_encoded
-          f.adapter @adapter
           f.headers = request.headers
-          f.basic_auth(request.auth[0], request.auth[1])
+          if Faraday::VERSION.start_with?('2.')
+            f.request(:authorization, :basic, request.auth[0], request.auth[1])
+          else
+            f.request(:basic_auth, request.auth[0], request.auth[1])
+          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
+
+          @configure_connection_blocks.each { |block| block.call(f) }
+          f.adapter @adapter
         end
 
         @last_request = request
         @last_response = nil
 
         response = send(request)
-        if response.body && !response.body.empty?
+        if (500..599).include?(response.status)
+          object = { message: "Server error (#{response.status})", code: response.status }.to_json
+        elsif response.body && !response.body.empty?
           object = response.body
         elsif response.status == 400
           object = { message: 'Bad request', code: 400 }.to_json

data/lib/twilio-ruby/http.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Dir[File.join(__dir__, 'http/**/*.rb')].sort.each do |file|
+  require file
+end

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

@@ -267,6 +267,19 @@ module Twilio
           payload
         end
       end
+
+      class PlaybackGrant
+        include AccessTokenGrant
+        attr_accessor :grant
+
+        def _key
+          'player'
+        end
+
+        def _generate_payload
+          grant
+        end
+      end
     end
   end
 end

data/lib/twilio-ruby/rest/api/v2010/account/address.rb

@@ -43,8 +43,10 @@ module Twilio
             #   the address. Can be: `true` or `false` and the default is `true`. If empty or
             #   `true`, we will correct the address you provide if necessary. If `false`, we
             #   won't alter the address you provide.
+            # @param [String] street_secondary The additional number and street address of the
+            #   address.
             # @return [AddressInstance] Created AddressInstance
-            def create(customer_name: nil, street: nil, city: nil, region: nil, postal_code: nil, iso_country: nil, friendly_name: :unset, emergency_enabled: :unset, auto_correct_address: :unset)
+            def create(customer_name: nil, street: nil, city: nil, region: nil, postal_code: nil, iso_country: nil, friendly_name: :unset, emergency_enabled: :unset, auto_correct_address: :unset, street_secondary: :unset)
               data = Twilio::Values.of({
                   'CustomerName' => customer_name,
                   'Street' => street,
@@ -55,6 +57,7 @@ module Twilio
                   'FriendlyName' => friendly_name,
                   'EmergencyEnabled' => emergency_enabled,
                   'AutoCorrectAddress' => auto_correct_address,
+                  'StreetSecondary' => street_secondary,
               })
 
               payload = @version.create('POST', @uri, data: data)
@@ -262,8 +265,10 @@ module Twilio
             #   the address. Can be: `true` or `false` and the default is `true`. If empty or
             #   `true`, we will correct the address you provide if necessary. If `false`, we
             #   won't alter the address you provide.
+            # @param [String] street_secondary The additional number and street address of the
+            #   address.
             # @return [AddressInstance] Updated AddressInstance
-            def update(friendly_name: :unset, customer_name: :unset, street: :unset, city: :unset, region: :unset, postal_code: :unset, emergency_enabled: :unset, auto_correct_address: :unset)
+            def update(friendly_name: :unset, customer_name: :unset, street: :unset, city: :unset, region: :unset, postal_code: :unset, emergency_enabled: :unset, auto_correct_address: :unset, street_secondary: :unset)
               data = Twilio::Values.of({
                   'FriendlyName' => friendly_name,
                   'CustomerName' => customer_name,
@@ -273,6 +278,7 @@ module Twilio
                   'PostalCode' => postal_code,
                   'EmergencyEnabled' => emergency_enabled,
                   'AutoCorrectAddress' => auto_correct_address,
+                  'StreetSecondary' => street_secondary,
               })
 
               payload = @version.update('POST', @uri, data: data)
@@ -342,6 +348,7 @@ module Twilio
                   'emergency_enabled' => payload['emergency_enabled'],
                   'validated' => payload['validated'],
                   'verified' => payload['verified'],
+                  'street_secondary' => payload['street_secondary'],
               }
 
               # Context
@@ -450,6 +457,12 @@ module Twilio
               @properties['verified']
             end
 
+            ##
+            # @return [String] The additional number and street address of the address
+            def street_secondary
+              @properties['street_secondary']
+            end
+
             ##
             # Delete the AddressInstance
             # @return [Boolean] true if delete succeeds, false otherwise
@@ -479,8 +492,10 @@ module Twilio
             #   the address. Can be: `true` or `false` and the default is `true`. If empty or
             #   `true`, we will correct the address you provide if necessary. If `false`, we
             #   won't alter the address you provide.
+            # @param [String] street_secondary The additional number and street address of the
+            #   address.
             # @return [AddressInstance] Updated AddressInstance
-            def update(friendly_name: :unset, customer_name: :unset, street: :unset, city: :unset, region: :unset, postal_code: :unset, emergency_enabled: :unset, auto_correct_address: :unset)
+            def update(friendly_name: :unset, customer_name: :unset, street: :unset, city: :unset, region: :unset, postal_code: :unset, emergency_enabled: :unset, auto_correct_address: :unset, street_secondary: :unset)
               context.update(
                   friendly_name: friendly_name,
                   customer_name: customer_name,
@@ -490,6 +505,7 @@ module Twilio
                   postal_code: postal_code,
                   emergency_enabled: emergency_enabled,
                   auto_correct_address: auto_correct_address,
+                  street_secondary: street_secondary,
               )
             end
 

data/lib/twilio-ruby/rest/api/v2010/account/available_phone_number/local.rb

@@ -391,8 +391,8 @@ module Twilio
                     'lata' => payload['lata'],
                     'locality' => payload['locality'],
                     'rate_center' => payload['rate_center'],
-                    'latitude' => payload['latitude'].to_f,
-                    'longitude' => payload['longitude'].to_f,
+                    'latitude' => payload['latitude'] == nil ? payload['latitude'] : payload['latitude'].to_f,
+                    'longitude' => payload['longitude'] == nil ? payload['longitude'] : payload['longitude'].to_f,
                     'region' => payload['region'],
                     'postal_code' => payload['postal_code'],
                     'iso_country' => payload['iso_country'],

data/lib/twilio-ruby/rest/api/v2010/account/available_phone_number/machine_to_machine.rb

@@ -391,8 +391,8 @@ module Twilio
                     'lata' => payload['lata'],
                     'locality' => payload['locality'],
                     'rate_center' => payload['rate_center'],
-                    'latitude' => payload['latitude'].to_f,
-                    'longitude' => payload['longitude'].to_f,
+                    'latitude' => payload['latitude'] == nil ? payload['latitude'] : payload['latitude'].to_f,
+                    'longitude' => payload['longitude'] == nil ? payload['longitude'] : payload['longitude'].to_f,
                     'region' => payload['region'],
                     'postal_code' => payload['postal_code'],
                     'iso_country' => payload['iso_country'],

data/lib/twilio-ruby/rest/api/v2010/account/available_phone_number/mobile.rb

@@ -391,8 +391,8 @@ module Twilio
                     'lata' => payload['lata'],
                     'locality' => payload['locality'],
                     'rate_center' => payload['rate_center'],
-                    'latitude' => payload['latitude'].to_f,
-                    'longitude' => payload['longitude'].to_f,
+                    'latitude' => payload['latitude'] == nil ? payload['latitude'] : payload['latitude'].to_f,
+                    'longitude' => payload['longitude'] == nil ? payload['longitude'] : payload['longitude'].to_f,
                     'region' => payload['region'],
                     'postal_code' => payload['postal_code'],
                     'iso_country' => payload['iso_country'],

data/lib/twilio-ruby/rest/api/v2010/account/available_phone_number/national.rb

@@ -391,8 +391,8 @@ module Twilio
                     'lata' => payload['lata'],
                     'locality' => payload['locality'],
                     'rate_center' => payload['rate_center'],
-                    'latitude' => payload['latitude'].to_f,
-                    'longitude' => payload['longitude'].to_f,
+                    'latitude' => payload['latitude'] == nil ? payload['latitude'] : payload['latitude'].to_f,
+                    'longitude' => payload['longitude'] == nil ? payload['longitude'] : payload['longitude'].to_f,
                     'region' => payload['region'],
                     'postal_code' => payload['postal_code'],
                     'iso_country' => payload['iso_country'],

data/lib/twilio-ruby/rest/api/v2010/account/available_phone_number/shared_cost.rb

@@ -391,8 +391,8 @@ module Twilio
                     'lata' => payload['lata'],
                     'locality' => payload['locality'],
                     'rate_center' => payload['rate_center'],
-                    'latitude' => payload['latitude'].to_f,
-                    'longitude' => payload['longitude'].to_f,
+                    'latitude' => payload['latitude'] == nil ? payload['latitude'] : payload['latitude'].to_f,
+                    'longitude' => payload['longitude'] == nil ? payload['longitude'] : payload['longitude'].to_f,
                     'region' => payload['region'],
                     'postal_code' => payload['postal_code'],
                     'iso_country' => payload['iso_country'],

data/lib/twilio-ruby/rest/api/v2010/account/available_phone_number/toll_free.rb

@@ -391,8 +391,8 @@ module Twilio
                     'lata' => payload['lata'],
                     'locality' => payload['locality'],
                     'rate_center' => payload['rate_center'],
-                    'latitude' => payload['latitude'].to_f,
-                    'longitude' => payload['longitude'].to_f,
+                    'latitude' => payload['latitude'] == nil ? payload['latitude'] : payload['latitude'].to_f,
+                    'longitude' => payload['longitude'] == nil ? payload['longitude'] : payload['longitude'].to_f,
                     'region' => payload['region'],
                     'postal_code' => payload['postal_code'],
                     'iso_country' => payload['iso_country'],

data/lib/twilio-ruby/rest/api/v2010/account/available_phone_number/voip.rb

@@ -391,8 +391,8 @@ module Twilio
                     'lata' => payload['lata'],
                     'locality' => payload['locality'],
                     'rate_center' => payload['rate_center'],
-                    'latitude' => payload['latitude'].to_f,
-                    'longitude' => payload['longitude'].to_f,
+                    'latitude' => payload['latitude'] == nil ? payload['latitude'] : payload['latitude'].to_f,
+                    'longitude' => payload['longitude'] == nil ? payload['longitude'] : payload['longitude'].to_f,
                     'region' => payload['region'],
                     'postal_code' => payload['postal_code'],
                     'iso_country' => payload['iso_country'],

data/lib/twilio-ruby/rest/api/v2010/account/call/event.rb

@@ -19,8 +19,8 @@ module Twilio
               # @param [String] account_sid The SID of the
               #   {Account}[https://www.twilio.com/docs/iam/api/account] that created this Call
               #   resource.
-              # @param [String] call_sid The unique string that that we created to identify this
-              #   Call resource.
+              # @param [String] call_sid The unique string that we created to identify this Call
+              #   resource.
               # @return [EventList] EventList
               def initialize(version, account_sid: nil, call_sid: nil)
                 super(version)
@@ -159,8 +159,8 @@ module Twilio
               # @param [String] account_sid The SID of the
               #   {Account}[https://www.twilio.com/docs/iam/api/account] that created this Call
               #   resource.
-              # @param [String] call_sid The unique string that that we created to identify this
-              #   Call resource.
+              # @param [String] call_sid The unique string that we created to identify this Call
+              #   resource.
               # @return [EventInstance] EventInstance
               def initialize(version, payload, account_sid: nil, call_sid: nil)
                 super(version)

data/lib/twilio-ruby/rest/api/v2010/account/call/feedback.rb

@@ -19,8 +19,8 @@ module Twilio
               # @param [String] account_sid The unique id of the
               #   {Account}[https://www.twilio.com/docs/iam/api/account] responsible for this
               #   resource.
-              # @param [String] call_sid The unique string that that we created to identify this
-              #   Call resource.
+              # @param [String] call_sid The unique string that we created to identify this Call
+              #   resource.
               # @return [FeedbackList] FeedbackList
               def initialize(version, account_sid: nil, call_sid: nil)
                 super(version)
@@ -87,6 +87,20 @@ module Twilio
                 @uri = "/Accounts/#{@solution[:account_sid]}/Calls/#{@solution[:call_sid]}/Feedback.json"
               end
 
+              ##
+              # Fetch the FeedbackInstance
+              # @return [FeedbackInstance] Fetched FeedbackInstance
+              def fetch
+                payload = @version.fetch('GET', @uri)
+
+                FeedbackInstance.new(
+                    @version,
+                    payload,
+                    account_sid: @solution[:account_sid],
+                    call_sid: @solution[:call_sid],
+                )
+              end
+
               ##
               # Create the FeedbackInstance
               # @param [String] quality_score The call quality expressed as an integer from `1`
@@ -113,20 +127,6 @@ module Twilio
                 )
               end
 
-              ##
-              # Fetch the FeedbackInstance
-              # @return [FeedbackInstance] Fetched FeedbackInstance
-              def fetch
-                payload = @version.fetch('GET', @uri)
-
-                FeedbackInstance.new(
-                    @version,
-                    payload,
-                    account_sid: @solution[:account_sid],
-                    call_sid: @solution[:call_sid],
-                )
-              end
-
               ##
               # Update the FeedbackInstance
               # @param [String] quality_score The call quality expressed as an integer from `1`
@@ -137,7 +137,7 @@ module Twilio
               #   `incorrect-caller-id`, `post-dial-delay`, `digits-not-captured`,
               #   `audio-latency`, `unsolicited-call`, or `one-way-audio`.
               # @return [FeedbackInstance] Updated FeedbackInstance
-              def update(quality_score: nil, issue: :unset)
+              def update(quality_score: :unset, issue: :unset)
                 data = Twilio::Values.of({
                     'QualityScore' => quality_score,
                     'Issue' => Twilio.serialize_list(issue) { |e| e },
@@ -176,8 +176,8 @@ module Twilio
               # @param [String] account_sid The unique id of the
               #   {Account}[https://www.twilio.com/docs/iam/api/account] responsible for this
               #   resource.
-              # @param [String] call_sid The unique string that that we created to identify this
-              #   Call resource.
+              # @param [String] call_sid The unique string that we created to identify this Call
+              #   resource.
               # @return [FeedbackInstance] FeedbackInstance
               def initialize(version, payload, account_sid: nil, call_sid: nil)
                 super(version)
@@ -188,7 +188,7 @@ module Twilio
                     'date_created' => Twilio.deserialize_rfc2822(payload['date_created']),
                     'date_updated' => Twilio.deserialize_rfc2822(payload['date_updated']),
                     'issues' => payload['issues'],
-                    'quality_score' => payload['quality_score'].to_i,
+                    'quality_score' => payload['quality_score'] == nil ? payload['quality_score'] : payload['quality_score'].to_i,
                     'sid' => payload['sid'],
                 }
 
@@ -244,6 +244,13 @@ module Twilio
                 @properties['sid']
               end
 
+              ##
+              # Fetch the FeedbackInstance
+              # @return [FeedbackInstance] Fetched FeedbackInstance
+              def fetch
+                context.fetch
+              end
+
               ##
               # Create the FeedbackInstance
               # @param [String] quality_score The call quality expressed as an integer from `1`
@@ -258,13 +265,6 @@ module Twilio
                 context.create(quality_score: quality_score, issue: issue, )
               end
 
-              ##
-              # Fetch the FeedbackInstance
-              # @return [FeedbackInstance] Fetched FeedbackInstance
-              def fetch
-                context.fetch
-              end
-
               ##
               # Update the FeedbackInstance
               # @param [String] quality_score The call quality expressed as an integer from `1`
@@ -275,7 +275,7 @@ module Twilio
               #   `incorrect-caller-id`, `post-dial-delay`, `digits-not-captured`,
               #   `audio-latency`, `unsolicited-call`, or `one-way-audio`.
               # @return [FeedbackInstance] Updated FeedbackInstance
-              def update(quality_score: nil, issue: :unset)
+              def update(quality_score: :unset, issue: :unset)
                 context.update(quality_score: quality_score, issue: issue, )
               end