Skip to content

Commit 87fcb29

Browse files
authored
Merge branch 'main' into MT-19854-sending-domains
2 parents 867daa7 + 600e614 commit 87fcb29

File tree

71 files changed

+80
-577
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+80
-577
lines changed

.coderabbit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ reviews:
77
Act as a data privacy officer. Carefully read all the vcr cassettes
88
with recorded HTTP interactions and try to identify sensitive data that
99
could potentially be recorded. It can be anything from PII to
10-
credentials. Ignore obvious placeholder values.
10+
credentials. Ignore obvious placeholder values and real IDs in URLs.

.github/workflows/main.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ jobs:
99
strategy:
1010
matrix:
1111
ruby:
12-
- '3.1.6'
13-
- '3.2.7'
14-
- '3.3.7'
15-
- '3.4.2'
12+
- '3.3.10'
13+
- '3.4.8'
14+
- '4.0.1'
1615
steps:
1716
- uses: actions/checkout@v4
1817
- name: Set up Ruby

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require:
1+
plugins:
22
- rubocop-rake
33
- rubocop-rspec
44

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## [2.6.0] - 2026-01-27
2+
- Add Inboxes API
3+
- Add Projects API
4+
- Models' `to_h` now returns all fields without compacting
5+
16
## [2.5.0] - 2025-11-10
27
- Add Contact Imports API
38
- Add Suppressions API

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ gem 'appraisal'
88
gem 'irb'
99
gem 'mail'
1010
gem 'net-smtp'
11-
gem 'rake', '~> 13.0'
12-
gem 'rdoc', '~> 6.13.0'
13-
gem 'rspec', '~> 3.0'
11+
gem 'rake', '~> 13.3'
12+
gem 'rdoc', '~> 7.1.0'
13+
gem 'rspec', '~> 3'
1414
gem 'rspec-its'
15-
gem 'rubocop', '~> 1.21'
15+
gem 'rubocop', '~> 1.82'
1616
gem 'rubocop-rake', require: false
1717
gem 'rubocop-rspec', require: false
1818
gem 'vcr'

Gemfile.lock

Lines changed: 61 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,126 @@
11
PATH
22
remote: .
33
specs:
4-
mailtrap (2.5.0)
4+
mailtrap (2.6.0)
55
base64
66

77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
addressable (2.8.7)
11-
public_suffix (>= 2.0.2, < 7.0)
10+
addressable (2.8.8)
11+
public_suffix (>= 2.0.2, < 8.0)
1212
appraisal (2.5.0)
1313
bundler
1414
rake
1515
thor (>= 0.14.0)
1616
ast (2.4.3)
1717
base64 (0.3.0)
18-
bigdecimal (3.1.8)
19-
crack (1.0.0)
18+
bigdecimal (4.0.1)
19+
crack (1.0.1)
2020
bigdecimal
2121
rexml
22-
date (3.4.1)
23-
diff-lcs (1.5.1)
24-
hashdiff (1.1.0)
25-
io-console (0.8.0)
26-
irb (1.15.2)
22+
date (3.5.1)
23+
diff-lcs (1.6.2)
24+
erb (6.0.1)
25+
hashdiff (1.2.1)
26+
io-console (0.8.2)
27+
irb (1.16.0)
2728
pp (>= 0.6.0)
2829
rdoc (>= 4.0.0)
2930
reline (>= 0.4.2)
30-
json (2.12.2)
31+
json (2.18.0)
3132
language_server-protocol (3.17.0.5)
3233
lint_roller (1.1.0)
33-
mail (2.8.1)
34+
logger (1.7.0)
35+
mail (2.9.0)
36+
logger
3437
mini_mime (>= 0.1.1)
3538
net-imap
3639
net-pop
3740
net-smtp
3841
mini_mime (1.1.5)
39-
net-imap (0.5.7)
42+
net-imap (0.6.2)
4043
date
4144
net-protocol
4245
net-pop (0.1.2)
4346
net-protocol
4447
net-protocol (0.2.2)
4548
timeout
46-
net-smtp (0.5.0)
49+
net-smtp (0.5.1)
4750
net-protocol
4851
parallel (1.27.0)
49-
parser (3.3.8.0)
52+
parser (3.3.10.1)
5053
ast (~> 2.4.1)
5154
racc
52-
pp (0.6.2)
55+
pp (0.6.3)
5356
prettyprint
5457
prettyprint (0.2.0)
55-
prism (1.4.0)
56-
psych (5.2.6)
58+
prism (1.9.0)
59+
psych (5.3.1)
5760
date
5861
stringio
59-
public_suffix (5.1.1)
62+
public_suffix (7.0.2)
6063
racc (1.8.1)
6164
rainbow (3.1.1)
62-
rake (13.2.1)
63-
rdoc (6.13.1)
65+
rake (13.3.1)
66+
rdoc (7.1.0)
67+
erb
6468
psych (>= 4.0.0)
65-
regexp_parser (2.10.0)
66-
reline (0.6.1)
69+
tsort
70+
regexp_parser (2.11.3)
71+
reline (0.6.3)
6772
io-console (~> 0.5)
68-
rexml (3.4.2)
69-
rspec (3.13.0)
73+
rexml (3.4.4)
74+
rspec (3.13.2)
7075
rspec-core (~> 3.13.0)
7176
rspec-expectations (~> 3.13.0)
7277
rspec-mocks (~> 3.13.0)
73-
rspec-core (3.13.0)
78+
rspec-core (3.13.6)
7479
rspec-support (~> 3.13.0)
75-
rspec-expectations (3.13.1)
80+
rspec-expectations (3.13.5)
7681
diff-lcs (>= 1.2.0, < 2.0)
7782
rspec-support (~> 3.13.0)
78-
rspec-its (1.3.0)
79-
rspec-core (>= 3.0.0)
80-
rspec-expectations (>= 3.0.0)
81-
rspec-mocks (3.13.1)
83+
rspec-its (2.0.0)
84+
rspec-core (>= 3.13.0)
85+
rspec-expectations (>= 3.13.0)
86+
rspec-mocks (3.13.7)
8287
diff-lcs (>= 1.2.0, < 2.0)
8388
rspec-support (~> 3.13.0)
84-
rspec-support (3.13.1)
85-
rubocop (1.78.0)
89+
rspec-support (3.13.6)
90+
rubocop (1.84.0)
8691
json (~> 2.3)
8792
language_server-protocol (~> 3.17.0.2)
8893
lint_roller (~> 1.1.0)
8994
parallel (~> 1.10)
9095
parser (>= 3.3.0.2)
9196
rainbow (>= 2.2.2, < 4.0)
9297
regexp_parser (>= 2.9.3, < 3.0)
93-
rubocop-ast (>= 1.45.1, < 2.0)
98+
rubocop-ast (>= 1.49.0, < 2.0)
9499
ruby-progressbar (~> 1.7)
95100
unicode-display_width (>= 2.4.0, < 4.0)
96-
rubocop-ast (1.45.1)
101+
rubocop-ast (1.49.0)
97102
parser (>= 3.3.7.2)
98-
prism (~> 1.4)
99-
rubocop-rake (0.6.0)
100-
rubocop (~> 1.0)
101-
rubocop-rspec (3.0.2)
102-
rubocop (~> 1.61)
103+
prism (~> 1.7)
104+
rubocop-rake (0.7.1)
105+
lint_roller (~> 1.1)
106+
rubocop (>= 1.72.1)
107+
rubocop-rspec (3.9.0)
108+
lint_roller (~> 1.1)
109+
rubocop (~> 1.81)
103110
ruby-progressbar (1.13.0)
104-
stringio (3.1.7)
105-
thor (1.4.0)
106-
timeout (0.4.3)
107-
unicode-display_width (3.1.4)
108-
unicode-emoji (~> 4.0, >= 4.0.4)
109-
unicode-emoji (4.0.4)
110-
vcr (6.2.0)
111-
webmock (3.23.1)
111+
stringio (3.2.0)
112+
thor (1.5.0)
113+
timeout (0.6.0)
114+
tsort (0.2.0)
115+
unicode-display_width (3.2.0)
116+
unicode-emoji (~> 4.1)
117+
unicode-emoji (4.2.0)
118+
vcr (6.4.0)
119+
webmock (3.26.1)
112120
addressable (>= 2.8.0)
113121
crack (>= 0.3.2)
114122
hashdiff (>= 0.4.0, < 2.0.0)
115-
yard (0.9.37)
123+
yard (0.9.38)
116124

117125
PLATFORMS
118126
ruby
@@ -123,11 +131,11 @@ DEPENDENCIES
123131
mail
124132
mailtrap!
125133
net-smtp
126-
rake (~> 13.0)
127-
rdoc (~> 6.13.0)
128-
rspec (~> 3.0)
134+
rake (~> 13.3)
135+
rdoc (~> 7.1.0)
136+
rspec (~> 3)
129137
rspec-its
130-
rubocop (~> 1.21)
138+
rubocop (~> 1.82)
131139
rubocop-rake
132140
rubocop-rspec
133141
vcr

lib/mailtrap/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module Mailtrap
4-
VERSION = '2.5.0'
4+
VERSION = '2.6.0'
55
end

spec/fixtures/vcr_cassettes/Mailtrap_Client/_send_batch/when_in_bulk_stream/successfully_sends_a_batch_of_emails.yml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spec/fixtures/vcr_cassettes/Mailtrap_Client/_send_batch/when_in_sandbox_mode/successfully_sends_a_batch_of_emails.yml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spec/fixtures/vcr_cassettes/Mailtrap_Client/_send_batch/with_API_errors/handles_API_errors.yml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)