Skip to content

🔥 Use psych (>= 5.2.5) for encoding Data objects #543

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

🔥 Use psych (>= 5.2.5) for encoding Data objects #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ gemspec
gem "digest"
gem "strscan"
gem "base64"
gem "psych", ">= 5.2.5" # for Data serialization

gem "irb"
gem "rake"
Expand Down
1 change: 0 additions & 1 deletion lib/net/imap.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3860,7 +3860,6 @@ def self.saslprep(string, **opts)
require_relative "imap/config"
require_relative "imap/command_data"
require_relative "imap/data_encoding"
require_relative "imap/data_lite"
require_relative "imap/flags"
require_relative "imap/response_data"
require_relative "imap/response_parser"
Expand Down
1 change: 0 additions & 1 deletion lib/net/imap/command_data.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require "date"

require_relative "errors"
require_relative "data_lite"

module Net
class IMAP < Protocol
Expand Down
2 changes: 1 addition & 1 deletion lib/net/imap/connection_state.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module Net
class IMAP
class ConnectionState < Net::IMAP::Data # :nodoc:
class ConnectionState < Data # :nodoc:
def self.define(symbol, *attrs)
symbol => Symbol
state = super(*attrs)
Expand Down
18 changes: 0 additions & 18 deletions lib/net/imap/data_lite.rb
View file
Open in desktop

This file was deleted.

38 changes: 19 additions & 19 deletions test/net/imap/fixtures/response_parser/esearch_responses.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:response: "* ESEARCH (TAG \"A282\") MIN 2 COUNT 3\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: A282
uid: false
data:
Expand All @@ -18,7 +18,7 @@
:response: "* ESEARCH (TAG \"A283\") ALL 2,10:11\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: A283
uid: false
data:
Expand All @@ -31,7 +31,7 @@
:response: "* ESEARCH (TAG \"A284\")\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: A284
uid: false
data: []
Expand All @@ -41,7 +41,7 @@
:response: "* ESEARCH (TAG \"A285\") ALL 43\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: A285
uid: false
data:
Expand All @@ -54,7 +54,7 @@
:response: "* ESEARCH (TAG \"A284\") MIN 4\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: A284
uid: false
data:
Expand All @@ -66,7 +66,7 @@
:response: "* ESEARCH (TAG \"A285\") UID MIN 7 MAX 3800\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: A285
uid: true
data:
Expand All @@ -80,7 +80,7 @@
:response: "* ESEARCH (TAG \"A286\") COUNT 15\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: A286
uid: false
data:
Expand All @@ -92,7 +92,7 @@
:response: "* ESEARCH (TAG \"A301\") UID ALL 17,900,901\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: A301
uid: true
data:
Expand All @@ -105,7 +105,7 @@
:response: "* ESEARCH (TAG \"P283\") ALL 882,1102,3003,3005:3006\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: P283
uid: false
data:
Expand All @@ -118,7 +118,7 @@
:response: "* ESEARCH (TAG \"G283\") ALL 3:15,27,29:103\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: G283
uid: false
data:
Expand All @@ -131,7 +131,7 @@
:response: "* ESEARCH (TAG \"C283\") ALL 2,10:15,21\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: C283
uid: false
data:
Expand All @@ -144,7 +144,7 @@
:response: "* ESEARCH (TAG \"C284\") MIN 2\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: C284
uid: false
data:
Expand All @@ -156,7 +156,7 @@
:response: "* ESEARCH (TAG \"C285\") MIN 2 MAX 21\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: C285
uid: false
data:
Expand All @@ -170,7 +170,7 @@
:response: "* ESEARCH (TAG \"C286\") MIN 2 MAX 21 COUNT 8\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: C286
uid: false
data:
Expand All @@ -186,7 +186,7 @@
:response: "* ESEARCH (TAG \"C286\") MIN 2 ALL 2,10:15,21\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: C286
uid: false
data:
Expand All @@ -201,7 +201,7 @@
:response: "* ESEARCH (TAG \"h\") ALL 1:3,5,8,13,21,42\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: h
uid: false
data:
Expand All @@ -214,7 +214,7 @@
:response: "* ESEARCH UID COUNT 17 ALL 4:18,21,28\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag:
uid: true
data:
Expand All @@ -229,7 +229,7 @@
:response: "* ESEARCH (TAG \"a567\") UID COUNT 17 ALL 4:18,21,28\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: a567
uid: true
data:
Expand All @@ -244,7 +244,7 @@
:response: "* ESEARCH COUNT 18 ALL 1:17,21\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag:
uid: false
data:
Expand Down
8 changes: 4 additions & 4 deletions test/net/imap/fixtures/response_parser/rfc7162_condstore_qresync_responses.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
:response: "* ESEARCH (TAG \"a\") ALL 1:3,5 MODSEQ 1236\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: a
uid: false
data:
Expand All @@ -112,7 +112,7 @@
:response: "* ESEARCH (TAG \"a\") ALL 5,3,2,1 MODSEQ 1236\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: a
uid: false
data:
Expand All @@ -127,7 +127,7 @@
:response: "* VANISHED (EARLIER) 41,43:116,118,120:211,214:540\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: VANISHED
data: !ruby/object:Net::IMAP::VanishedData
data: !ruby/data:Net::IMAP::VanishedData
uids: !ruby/object:Net::IMAP::SequenceSet
string: 41,43:116,118,120:211,214:540
earlier: true
Expand All @@ -137,7 +137,7 @@
:response: "* VANISHED 405,407,410,425\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: VANISHED
data: !ruby/object:Net::IMAP::VanishedData
data: !ruby/data:Net::IMAP::VanishedData
uids: !ruby/object:Net::IMAP::SequenceSet
string: '405,407,410,425'
earlier: false
Expand Down
12 changes: 6 additions & 6 deletions test/net/imap/fixtures/response_parser/rfc9394_partial.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
:response: "* ESEARCH (TAG \"A01\") UID PARTIAL (-1:-100 200:250,252:300)\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: A01
uid: true
data:
- - PARTIAL
- !ruby/object:Net::IMAP::ESearchResult::PartialResult
- !ruby/data:Net::IMAP::ESearchResult::PartialResult
range: !ruby/range
begin: -100
end: -1
Expand All @@ -26,12 +26,12 @@
:response: "* ESEARCH (TAG \"A02\") UID PARTIAL (23500:24000 55500:56000)\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: A02
uid: true
data:
- - PARTIAL
- !ruby/object:Net::IMAP::ESearchResult::PartialResult
- !ruby/data:Net::IMAP::ESearchResult::PartialResult
range: !ruby/range
begin: 23500
end: 24000
Expand All @@ -44,12 +44,12 @@
:response: "* ESEARCH (TAG \"A04\") UID PARTIAL (24000:24500 NIL)\r\n"
:expected: !ruby/struct:Net::IMAP::UntaggedResponse
name: ESEARCH
data: !ruby/object:Net::IMAP::ESearchResult
data: !ruby/data:Net::IMAP::ESearchResult
tag: A04
uid: true
data:
- - PARTIAL
- !ruby/object:Net::IMAP::ESearchResult::PartialResult
- !ruby/data:Net::IMAP::ESearchResult::PartialResult
range: !ruby/range
begin: 24000
end: 24500
Expand Down
8 changes: 4 additions & 4 deletions test/net/imap/fixtures/response_parser/uidplus_extension.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
data: !ruby/struct:Net::IMAP::ResponseText
code: !ruby/struct:Net::IMAP::ResponseCode
name: APPENDUID
data: !ruby/object:Net::IMAP::AppendUIDData
data: !ruby/data:Net::IMAP::AppendUIDData
uidvalidity: 38505
assigned_uids: !ruby/object:Net::IMAP::SequenceSet
string: '3955'
Expand All @@ -26,7 +26,7 @@
data: !ruby/struct:Net::IMAP::ResponseText
code: !ruby/struct:Net::IMAP::ResponseCode
name: COPYUID
data: !ruby/object:Net::IMAP::CopyUIDData
data: !ruby/data:Net::IMAP::CopyUIDData
uidvalidity: 38505
source_uids: !ruby/object:Net::IMAP::SequenceSet
string: 304,319:320
Expand All @@ -43,7 +43,7 @@
data: !ruby/struct:Net::IMAP::ResponseText
code: !ruby/struct:Net::IMAP::ResponseCode
name: APPENDUID
data: !ruby/object:Net::IMAP::AppendUIDData
data: !ruby/data:Net::IMAP::AppendUIDData
uidvalidity: 2
assigned_uids: !ruby/object:Net::IMAP::SequenceSet
string: 4,6:7,9
Expand All @@ -62,7 +62,7 @@
data: !ruby/struct:Net::IMAP::ResponseText
code: !ruby/struct:Net::IMAP::ResponseCode
name: COPYUID
data: !ruby/object:Net::IMAP::CopyUIDData
data: !ruby/data:Net::IMAP::CopyUIDData
uidvalidity: 9999
source_uids: !ruby/object:Net::IMAP::SequenceSet
string: 20:19,500:495
Expand Down
2 changes: 0 additions & 2 deletions test/net/imap/regexp_collector.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# frozen_string_literal: true

class RegexpCollector
Data = Net::IMAP::Data

ConstantRegexp = Data.define(:mod, :const_name, :regexp) do
def name = "%s::%s" % [mod, const_name]
end
Expand Down
Loading