Skip to content

Commit a9feed3

Browse files
authored
Merge branch 'main' into patch-support
2 parents f2319f4 + 4d6cb7a commit a9feed3

File tree

16 files changed

+912
-35
lines changed

16 files changed

+912
-35
lines changed

.github/workflows/test-and-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
timeout-minutes: 20
1818
strategy:
1919
matrix:
20-
ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', 'jruby-9.3', 'jruby-9.4' ]
20+
ruby: [ '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', 'jruby-9.3', 'jruby-9.4' ]
2121
steps:
2222
- name: Checkout twilio-ruby
2323
uses: actions/checkout@v3

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ docs/_build
1919

2020

2121
coverage
22+
vendor/bundle

CHANGES.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
twilio-ruby changelog
22
=====================
33

4+
[2025-12-03] Version 7.8.8
5+
--------------------------
6+
**Library - Fix**
7+
- [PR #765](https://github.com/twilio/twilio-ruby/pull/765): Regional API domain processing. Thanks to [@manisha1997](https://github.com/manisha1997)!
8+
9+
**Api**
10+
- Add `twiml_session` resource for calls
11+
- Add `twiml_session` resource for calls
12+
13+
**Monitor**
14+
- Update default output properties
15+
16+
**Trusthub**
17+
- Added customer_profile_sid in toll-free initialize api payload.
18+
19+
420
[2025-11-20] Version 7.8.7
521
--------------------------
622
**Memory**

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ This library supports the following Ruby implementations:
3939
To install using [Bundler][bundler] grab the latest stable version:
4040

4141
```ruby
42-
gem 'twilio-ruby', '~> 7.8.7'
42+
gem 'twilio-ruby', '~> 7.8.8'
4343
```
4444

4545
To manually install `twilio-ruby` via [Rubygems][rubygems] simply gem install:
4646

4747
```bash
48-
gem install twilio-ruby -v 7.8.7
48+
gem install twilio-ruby -v 7.8.8
4949
```
5050

5151
To build and install the development branch yourself from the latest source:

lib/twilio-ruby/base/client_base.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,10 @@ def initialize(username = nil, password = nil, account_sid = nil, region = nil,
2727
@username = username || Twilio.account_sid
2828
@password = password || Twilio.auth_token
2929
@region = region || Twilio.region
30-
if (region.nil? && !Twilio.edge.nil?) || (!region.nil? && Twilio.edge.nil?)
31-
# rubocop:disable Layout/LineLength
32-
warn '[DEPRECATION] For regional processing, DNS is of format product.<edge>.<region>.twilio.com;otherwise use product.twilio.com.'
33-
end
3430
if Twilio.edge
3531
@edge = Twilio.edge
3632
elsif @region && @@region_mappings[region]
3733
warn '[DEPRECATION] Setting default `Edge` for the provided `region`.'
38-
# rubocop:enable Layout/LineLength
3934
@edge = @@region_mappings[region]
4035
end
4136
@account_sid = account_sid || @username
@@ -101,6 +96,11 @@ def request(host, port, method, uri, params = {}, data = {}, headers = {}, auth
10196
##
10297
# Build the final request uri
10398
def build_uri(uri)
99+
if (@region.nil? && !@edge.nil?) || (!@region.nil? && @edge.nil?)
100+
# rubocop:disable Layout/LineLength
101+
warn '[DEPRECATION] For regional processing, DNS is of format product.<edge>.<region>.twilio.com;otherwise use product.twilio.com.'
102+
# rubocop:enable Layout/LineLength
103+
end
104104
if @edge.nil? && @region && @@region_mappings[@region]
105105
warn '[DEPRECATION] Setting default `Edge` for the provided `region`.'
106106
@edge = @@region_mappings[@region]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ def delete(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: n
123123
timeout
124124
)
125125

126-
if response.status_code < 200 || response.status_code >= 300
126+
if response.status_code < 200 || response.status_code >= 400
127127
raise exception(response, 'Unable to delete record')
128128
end
129129

130-
response.status_code == 204
130+
response.status_code >= 200 && response.status_code < 400
131131
end
132132

133133
def read_limits(limit = nil, page_size = nil)

lib/twilio-ruby/rest/iam/v1.rb

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ def initialize(domain)
2424
@api_key = nil
2525
@get_api_keys = nil
2626
@new_api_key = nil
27+
@o_auth_apps = nil
2728
@token = nil
2829
end
2930

@@ -52,6 +53,20 @@ def new_api_key
5253
@new_api_key ||= NewApiKeyList.new self
5354
end
5455
##
56+
# @param [String] sid Unique ID (sid) of the OAuth app
57+
# @return [Twilio::REST::Iam::V1::OAuthAppContext] if sid was passed.
58+
# @return [Twilio::REST::Iam::V1::OAuthAppList]
59+
def o_auth_apps(sid=:unset)
60+
if sid.nil?
61+
raise ArgumentError, 'sid cannot be nil'
62+
end
63+
if sid == :unset
64+
@o_auth_apps ||= OAuthAppList.new self
65+
else
66+
OAuthAppContext.new(self, sid)
67+
end
68+
end
69+
##
5570
# @return [Twilio::REST::Iam::V1::TokenList]
5671
def token
5772
@token ||= TokenList.new self

0 commit comments

Comments
 (0)