Skip to content

🐛 Fix SequenceSet#include? handling of invalid inputs #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 31, 2025
Merged

🐛 Fix SequenceSet#include? handling of invalid inputs #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9872eb6
🐛📚 Fix bad SequenceSet#include? rdoc examples
nevans May 30, 2025
adaa4d1
🐛 Fix SequenceSet#include? for invalid inputs
nevans May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions lib/net/imap/sequence_set.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,17 +528,17 @@ def ===(other)
def cover?(other) input_to_tuples(other).none? { !include_tuple?(_1) } end

# Returns +true+ when a given number or range is in +self+, and +false+
# otherwise. Returns +false+ unless +number+ is an Integer, Range, or
# <tt>*</tt>.
# otherwise. Returns +nil+ when +number+ isn't a valid SequenceSet
# element (Integer, Range, <tt>*</tt>, +sequence-set+ string).
#
# set = Net::IMAP::SequenceSet["5:10,100,111:115"]
# set.include? 1 #=> false
# set.include? 5..10 #=> true
# set.include? 11..20 #=> false
# set.include? 100 #=> true
# set.include? 6 #=> true, covered by "5:10"
# set.include? 4..9 #=> true, covered by "5:10"
# set.include? "4:9" #=> true, strings are parsed
# set.include? 6..9 #=> true, covered by "5:10"
# set.include? "6:9" #=> true, strings are parsed
# set.include? 4..9 #=> false, intersection is not sufficient
# set.include? "*" #=> false, use #limit to re-interpret "*"
# set.include? -1 #=> false, -1 is interpreted as "*"
Expand All @@ -547,11 +547,14 @@ def cover?(other) input_to_tuples(other).none? { !include_tuple?(_1) } end
# set.include? :* #=> true
# set.include? "*" #=> true
# set.include? -1 #=> true
# set.include? 200.. #=> true
# set.include? 100.. #=> false
# set.include?(200..) #=> true
# set.include?(100..) #=> false
#
# Related: #include_star?, #cover?, #===
def include?(element) include_tuple? input_to_tuple element end
def include?(element)
tuple = input_to_tuple element rescue nil
!!include_tuple?(tuple) if tuple
end

alias member? include?

Expand Down
13 changes: 8 additions & 5 deletions test/net/imap/test_sequence_set.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,13 +794,16 @@ def obj.to_sequence_set; 192_168.001_255 end
end

test "#include?" do
assert SequenceSet["2:4"].include?(3)
assert SequenceSet["2,*:12"].include? :*
assert SequenceSet["2,*:12"].include?(-1)
assert_equal true, SequenceSet["2:4"].include?(3)
assert_equal true, SequenceSet["2,*:12"].include?(:*)
assert_equal true, SequenceSet["2,*:12"].include?(-1)
assert_nil SequenceSet["1:*"].include?("hopes and dreams")
assert_nil SequenceSet["1:*"].include?(:wat?)
assert_nil SequenceSet["1:*"].include?([1, 2, 3])
set = SequenceSet.new Array.new(100) { rand(1..1500) }
rev = (~set).limit(max: 1_501)
set.numbers.each do assert set.include?(_1) end
rev.numbers.each do refute set.include?(_1) end
set.numbers.each do assert_equal true, set.include?(_1) end
rev.numbers.each do assert_equal false, set.include?(_1) end
end

test "#cover?" do
Expand Down