Skip to content

Commit f398d66

Browse files
authored
🔀 Merge pull request #305 from ruby/config/update-for-0.5
🔧 Update config for v0.5
2 parents 37e50b3 + 687ceb5 commit f398d66

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

lib/net/imap/config.rb

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -306,30 +306,33 @@ def defaults_hash
306306
open_timeout: 30,
307307
idle_response_timeout: 5,
308308
sasl_ir: true,
309-
responses_without_block: :silence_deprecation_warning,
309+
responses_without_block: :warn,
310310
).freeze
311311

312312
@global = default.new
313313

314-
version_defaults[0.4] = Config[default.send(:defaults_hash)]
314+
version_defaults[:default] = Config[default.send(:defaults_hash)]
315+
version_defaults[:current] = Config[:default]
315316

316-
version_defaults[0] = Config[0.4].dup.update(
317+
version_defaults[0] = Config[:current].dup.update(
317318
sasl_ir: false,
319+
responses_without_block: :silence_deprecation_warning,
318320
).freeze
319321
version_defaults[0.0] = Config[0]
320322
version_defaults[0.1] = Config[0]
321323
version_defaults[0.2] = Config[0]
322324
version_defaults[0.3] = Config[0]
323325

324-
version_defaults[0.5] = Config[0.4].dup.update(
325-
responses_without_block: :warn,
326+
version_defaults[0.4] = Config[0.3].dup.update(
327+
sasl_ir: true,
326328
).freeze
327329

328-
version_defaults[:default] = Config[0.4]
329-
version_defaults[:current] = Config[0.4]
330-
version_defaults[:next] = Config[0.5]
330+
version_defaults[0.5] = Config[:current]
331+
332+
version_defaults[0.6] = Config[0.5]
333+
version_defaults[:next] = Config[0.6]
331334

332-
version_defaults[:future] = Config[0.5].dup.update(
335+
version_defaults[:future] = Config[0.6].dup.update(
333336
responses_without_block: :raise,
334337
).freeze
335338

test/net/imap/test_config.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ class ConfigTest < Test::Unit::TestCase
169169
end
170170

171171
test ".[] with symbol names" do
172-
assert_same Config[0.4], Config[:current]
173-
assert_same Config[0.4], Config[:default]
174-
assert_same Config[0.5], Config[:next]
172+
assert_same Config[0.5], Config[:current]
173+
assert_same Config[0.5], Config[:default]
174+
assert_same Config[0.6], Config[:next]
175175
assert_kind_of Config, Config[:future]
176176
end
177177

0 commit comments

Comments
 (0)