rims 0.2.1 → 0.2.2

data/test/test_mail_store.rb

@@ -389,9 +389,10 @@ module RIMS::Test
       assert_equal((1..50).to_set, folder.parse_msg_set('1:*', uid: false))
       assert_equal((1..99).to_set, folder.parse_msg_set('1:*', uid: true))
 
-      assert_raise(RIMS::MessageSetSyntaxError) {
+      error = assert_raise(RIMS::MessageSetSyntaxError) {
         folder.parse_msg_set('detarame')
       }
+      assert_match(/invalid message sequence format/, error.message)
     end
 
     def test_mail_folder_parse_msg_set_empty
@@ -509,9 +510,14 @@ module RIMS::Test
       assert_equal(1..10, RIMS::MailFolder.parse_msg_seq('1:10', 99))
       assert_equal(1..99, RIMS::MailFolder.parse_msg_seq('1:*', 99))
       assert_equal(99..99, RIMS::MailFolder.parse_msg_seq('*:*', 99))
-      assert_raise(RIMS::MessageSetSyntaxError) {
+      error = assert_raise(RIMS::MessageSetSyntaxError) {
         RIMS::MailFolder.parse_msg_seq('detarame', 99)
       }
+      assert_match(/invalid message sequence format/, error.message)
+      error = assert_raise(RIMS::MessageSetSyntaxError) {
+        RIMS::MailFolder.parse_msg_seq('0', 99)
+      }
+      assert_match(/out of range of message sequence number/, error.message)
     end
 
     def test_parse_msg_set
@@ -525,12 +531,20 @@ module RIMS::Test
       assert_equal([ 1, 2, 3, 11, 97, 98, 99 ].to_set, RIMS::MailFolder.parse_msg_set('1:3,11,97:*', 99))
       assert_equal((1..99).to_set, RIMS::MailFolder.parse_msg_set('1:70,30:*', 99))
 
-      assert_raise(RIMS::MessageSetSyntaxError) {
+      error = assert_raise(RIMS::MessageSetSyntaxError) {
         RIMS::MailFolder.parse_msg_set('detarame', 99)
       }
-      assert_raise(RIMS::MessageSetSyntaxError) {
+      assert_match(/invalid message sequence format/, error.message)
+
+      error = assert_raise(RIMS::MessageSetSyntaxError) {
         RIMS::MailFolder.parse_msg_set('1,2,X', 99)
       }
+      assert_match(/invalid message sequence format/, error.message)
+
+      error = assert_raise(RIMS::MessageSetSyntaxError) {
+        RIMS::MailFolder.parse_msg_set('0', 99)
+      }
+      assert_match(/out of range of message sequence number/, error.message)
     end
   end
 
@@ -569,11 +583,12 @@ module RIMS::Test
     def test_recovery_empty
       mail_store = make_mail_store
       assert_equal(false, mail_store.abort_transaction?)
-      assert_raise(RuntimeError) {
+      error = assert_raise(RuntimeError) {
         mail_store.transaction do
           raise 'abort'
         end
       }
+      assert_equal('abort', error.message)
       assert_equal(true, mail_store.abort_transaction?)
       mail_store.close
 
@@ -594,11 +609,12 @@ module RIMS::Test
       mail_store.add_mbox('bar')
 
       assert_equal(false, mail_store.abort_transaction?)
-      assert_raise(RuntimeError) {
+      error = assert_raise(RuntimeError) {
         mail_store.transaction do
           raise 'abort'
         end
       }
+      assert_equal('abort', error.message)
       assert_equal(true, mail_store.abort_transaction?)
       mail_store.close
 

data/test/test_protocol_decoder.rb

@@ -6472,9 +6472,10 @@ LOGOUT
       assert_equal([ 'foo', 'a mailbox ' ],
                    RIMS::Protocol::Decoder.decode_delivery_target_mailbox("b64user-mbox #{base64_username} a mailbox "))
 
-      assert_raise(RIMS::SyntaxError) {
+      error = assert_raise(RIMS::SyntaxError) {
         RIMS::Protocol::Decoder.decode_delivery_target_mailbox("unknown-encode-type #{base64_username} INBOX")
       }
+      assert_match(/unknown mailbox encode type/, error.message)
     end
 
     def test_encode_delivery_target_mailbox

data/test/test_protocol_fetch.rb

@@ -229,9 +229,10 @@ module RIMS::Test
         assert_fetch(1, [ "BODY[4.2.2] #{literal(@mpart_mail.parts[3].parts[1].message.parts[1].body.raw_source)}" ])
       }
 
-      assert_raise(RIMS::SyntaxError) {
+      error = assert_raise(RIMS::SyntaxError) {
         @parser.parse(make_body('BODY[MIME]'))
       }
+      assert_match(/need for section index/, error.message)
 
       parse_fetch_attribute(make_body('BODY[1.MIME]')) {
         assert_fetch(0, [ "BODY[1.MIME] #{literal(@simple_mail.header.raw_source)}" ])
@@ -965,12 +966,15 @@ module RIMS::Test
       assert_nil(RIMS::Protocol::FetchParser::Utils.get_body_section(@mpart_mail, [ 4, 2, 3 ]))
       assert_nil(RIMS::Protocol::FetchParser::Utils.get_body_section(@mpart_mail, [ 4, 2, 2, 3 ]))
 
-      assert_raise(RIMS::SyntaxError) {
+      error = assert_raise(RIMS::SyntaxError) {
         RIMS::Protocol::FetchParser::Utils.get_body_section(@simple_mail, [ 0 ])
       }
-      assert_raise(RIMS::SyntaxError) {
+      assert_match(/not a none-zero body section number/, error.message)
+
+      error = assert_raise(RIMS::SyntaxError) {
         RIMS::Protocol::FetchParser::Utils.get_body_section(@mpart_mail, [ 4, 2, 2, 0 ])
       }
+      assert_match(/not a none-zero body section number/, error.message)
     end
 
     def test_get_body_content

data/test/test_protocol_search.rb

@@ -76,10 +76,18 @@ module RIMS::Test
     end
     private :assert_search_cond
 
-    def assert_search_syntax_error(search_key_list)
-      assert_raise(RIMS::SyntaxError) {
+    def assert_search_syntax_error(search_key_list, expected_error_message)
+      error = assert_raise(RIMS::SyntaxError) {
         @parser.parse(search_key_list)
       }
+      case (expected_error_message)
+      when String
+        assert_equal(expected_error_message, error.message)
+      when Regexp
+        assert_match(expected_error_message, error.message)
+      else
+        flunk
+      end
     end
     private :assert_search_syntax_error
 
@@ -128,8 +136,8 @@ module RIMS::Test
         assert_search_cond(2, false)
       }
 
-      assert_search_syntax_error([ 'BCC' ])
-      assert_search_syntax_error([ 'BCC', [ :group, 'foo' ] ])
+      assert_search_syntax_error([ 'BCC' ], /need for a search string/)
+      assert_search_syntax_error([ 'BCC', [ :group, 'foo' ] ], /search string expected as <String> but was/)
     end
 
     def test_parse_before
@@ -146,9 +154,9 @@ module RIMS::Test
         assert_search_cond(2, false)
       }
 
-      assert_search_syntax_error([ 'BEFORE' ])
-      assert_search_syntax_error([ 'BEFORE', '99-Nov-2013' ])
-      assert_search_syntax_error([ 'BEFORE', [ :group, '08-Nov-2013'] ])
+      assert_search_syntax_error([ 'BEFORE' ], /need for a search date/)
+      assert_search_syntax_error([ 'BEFORE', '99-Nov-2013' ], /search date is invalid/)
+      assert_search_syntax_error([ 'BEFORE', [ :group, '08-Nov-2013'] ], /search date string expected as <String> but was/)
     end
 
     def test_parse_body
@@ -186,8 +194,8 @@ Content-Type: text/html
         assert_search_cond(3, false) # ignored text part of multipart message.
       }
 
-      assert_search_syntax_error([ 'BODY' ])
-      assert_search_syntax_error([ 'BODY', [ :group, 'foo' ] ])
+      assert_search_syntax_error([ 'BODY' ], /need for a search string/)
+      assert_search_syntax_error([ 'BODY', [ :group, 'foo' ] ], /search string expected as <String> but was/)
     end
 
     def test_parse_cc
@@ -208,8 +216,8 @@ Content-Type: text/html
         assert_search_cond(2, false)
       }
 
-      assert_search_syntax_error([ 'CC' ])
-      assert_search_syntax_error([ 'CC', [ :group, 'foo' ] ])
+      assert_search_syntax_error([ 'CC' ], /need for a search string/)
+      assert_search_syntax_error([ 'CC', [ :group, 'foo' ] ], /search string expected as <String> but was/)
     end
 
     def test_parse_deleted
@@ -278,8 +286,8 @@ Content-Type: text/html
         assert_search_cond(2, false)
       }
 
-      assert_search_syntax_error([ 'FROM' ])
-      assert_search_syntax_error([ 'FROM', [ :group, 'foo' ] ])
+      assert_search_syntax_error([ 'FROM' ], /need for a search string/)
+      assert_search_syntax_error([ 'FROM', [ :group, 'foo' ] ], /search string expected as <String> but was/)
     end
 
     def test_parse_header
@@ -320,10 +328,10 @@ Content-Type: text/html
         assert_search_cond(2, false)
       }
 
-      assert_search_syntax_error([ 'HEADER' ])
-      assert_search_syntax_error([ 'HEADER', 'Received' ])
-      assert_search_syntax_error([ 'HEADER', 'Received', [ :group, 'foo' ] ])
-      assert_search_syntax_error([ 'HEADER', [ :group, 'Received' ], 'foo' ])
+      assert_search_syntax_error([ 'HEADER' ], /need for a search string/)
+      assert_search_syntax_error([ 'HEADER', 'Received' ], /need for a search string/)
+      assert_search_syntax_error([ 'HEADER', 'Received', [ :group, 'foo' ] ], /search string expected as <String> but was/)
+      assert_search_syntax_error([ 'HEADER', [ :group, 'Received' ], 'foo' ], /search string expected as <String> but was/)
     end
 
     def test_parse_keyword
@@ -336,8 +344,8 @@ Content-Type: text/html
         assert_search_cond(0, false) # always false
       }
 
-      assert_search_syntax_error([ 'KEYWORD' ])
-      assert_search_syntax_error([ 'KEYWORD', [ :group, 'foo' ] ])
+      assert_search_syntax_error([ 'KEYWORD' ], /need for a search string/)
+      assert_search_syntax_error([ 'KEYWORD', [ :group, 'foo' ] ], /search string expected as <String> but was/)
     end
 
     def test_parse_larger
@@ -354,9 +362,9 @@ Content-Type: text/html
         assert_search_cond(2, false)
       }
 
-      assert_search_syntax_error([ 'LARGER' ])
-      assert_search_syntax_error([ 'LARGER', [ :group, '3' ] ])
-      assert_search_syntax_error([ 'LARGER', 'nonum' ])
+      assert_search_syntax_error([ 'LARGER' ], /need for a octet size/)
+      assert_search_syntax_error([ 'LARGER', [ :group, '3' ] ], /octet size is expected as numeric string but was/)
+      assert_search_syntax_error([ 'LARGER', 'nonum' ], /octet size is expected as numeric string but was/)
     end
 
     def test_parse_new
@@ -402,7 +410,7 @@ Content-Type: text/html
         assert_search_cond(2, true)
       }
 
-      assert_search_syntax_error([ 'NOT' ])
+      assert_search_syntax_error([ 'NOT' ], 'unexpected end of search key.')
     end
 
     def test_parse_old
@@ -435,9 +443,9 @@ Content-Type: text/html
         assert_search_cond(2, false)
       }
 
-      assert_search_syntax_error([ 'ON' ])
-      assert_search_syntax_error([ 'ON', '99-Nov-2013' ])
-      assert_search_syntax_error([ 'ON', [ :group, '08-Nov-2013'] ])
+      assert_search_syntax_error([ 'ON' ], /need for a search date/)
+      assert_search_syntax_error([ 'ON', '99-Nov-2013' ], /search date is invalid/)
+      assert_search_syntax_error([ 'ON', [ :group, '08-Nov-2013'] ], /search date string expected as <String> but was/)
     end
 
     def test_parse_or
@@ -464,8 +472,8 @@ Content-Type: text/html
 
       }
 
-      assert_search_syntax_error([ 'OR' ])
-      assert_search_syntax_error([ 'OR', 'ANSWERED' ])
+      assert_search_syntax_error([ 'OR' ], 'unexpected end of search key.')
+      assert_search_syntax_error([ 'OR', 'ANSWERED' ], 'unexpected end of search key.')
     end
 
     def test_parse_recent
@@ -522,9 +530,9 @@ Content-Type: text/html
         assert_search_cond(3, false)
       }
 
-      assert_search_syntax_error([ 'SENTBEFORE' ])
-      assert_search_syntax_error([ 'SENTBEFORE', '99-Nov-2013' ])
-      assert_search_syntax_error([ 'SENTBEFORE', [ :group, '08-Nov-2013'] ])
+      assert_search_syntax_error([ 'SENTBEFORE' ], /need for a search date/)
+      assert_search_syntax_error([ 'SENTBEFORE', '99-Nov-2013' ], /search date is invalid/)
+      assert_search_syntax_error([ 'SENTBEFORE', [ :group, '08-Nov-2013'] ], /search date string expected as <String> but was/)
     end
 
     def test_parse_senton
@@ -549,9 +557,9 @@ Content-Type: text/html
         assert_search_cond(3, false)
       }
 
-      assert_search_syntax_error([ 'SENTON' ])
-      assert_search_syntax_error([ 'SENTON', '99-Nov-2013' ])
-      assert_search_syntax_error([ 'SENTON', [ :group, '08-Nov-2013'] ])
+      assert_search_syntax_error([ 'SENTON' ], /need for a search date/)
+      assert_search_syntax_error([ 'SENTON', '99-Nov-2013' ], /search date is invalid/)
+      assert_search_syntax_error([ 'SENTON', [ :group, '08-Nov-2013'] ], /search date string expected as <String> but was/)
     end
 
     def test_parse_sentsince
@@ -576,9 +584,9 @@ Content-Type: text/html
         assert_search_cond(3, false)
       }
 
-      assert_search_syntax_error([ 'SENTSINCE' ])
-      assert_search_syntax_error([ 'SENTSINCE', '99-Nov-2013' ])
-      assert_search_syntax_error([ 'SENTSINCE', [ :group, '08-Nov-2013'] ])
+      assert_search_syntax_error([ 'SENTSINCE' ], /need for a search date/)
+      assert_search_syntax_error([ 'SENTSINCE', '99-Nov-2013' ], /search date is invalid/)
+      assert_search_syntax_error([ 'SENTSINCE', [ :group, '08-Nov-2013'] ], /search date string expected as <String> but was/)
     end
 
     def test_parse_since
@@ -595,9 +603,9 @@ Content-Type: text/html
         assert_search_cond(2, true)
       }
 
-      assert_search_syntax_error([ 'SINCE' ])
-      assert_search_syntax_error([ 'SINCE', '99-Nov-2013' ])
-      assert_search_syntax_error([ 'SINCE', [ :group, '08-Nov-2013'] ])
+      assert_search_syntax_error([ 'SINCE' ], /need for a search date/)
+      assert_search_syntax_error([ 'SINCE', '99-Nov-2013' ], /search date is invalid/)
+      assert_search_syntax_error([ 'SINCE', [ :group, '08-Nov-2013'] ], /search date string expected as <String> but was/)
     end
 
     def test_parse_smaller
@@ -614,9 +622,9 @@ Content-Type: text/html
         assert_search_cond(2, false)
       }
 
-      assert_search_syntax_error([ 'SMALLER' ])
-      assert_search_syntax_error([ 'SMALLER', [ :group, '3' ] ])
-      assert_search_syntax_error([ 'SMALLER', 'nonum' ])
+      assert_search_syntax_error([ 'SMALLER' ], /need for a octet size/)
+      assert_search_syntax_error([ 'SMALLER', [ :group, '3' ] ], /octet size is expected as numeric string but was/)
+      assert_search_syntax_error([ 'SMALLER', 'nonum' ], /octet size is expected as numeric string but was/)
     end
 
     def test_parse_subject
@@ -637,8 +645,8 @@ Content-Type: text/html
         assert_search_cond(2, false)
       }
 
-      assert_search_syntax_error([ 'SUBJECT' ])
-      assert_search_syntax_error([ 'SUBJECT', [ :group, 'foo' ] ])
+      assert_search_syntax_error([ 'SUBJECT' ], /need for a search string/)
+      assert_search_syntax_error([ 'SUBJECT', [ :group, 'foo' ] ], /search string expected as <String> but was/)
     end
 
     def test_parse_text
@@ -663,8 +671,8 @@ Content-Type: text/html
         assert_search_cond(0, false)
       }
 
-      assert_search_syntax_error([ 'TEXT' ])
-      assert_search_syntax_error([ 'TEXT', [ :group, 'foo'] ])
+      assert_search_syntax_error([ 'TEXT' ], /need for a search string/)
+      assert_search_syntax_error([ 'TEXT', [ :group, 'foo'] ], /search string expected as <String> but was/)
     end
 
     def test_parse_to
@@ -685,8 +693,8 @@ Content-Type: text/html
         assert_search_cond(2, false)
       }
 
-      assert_search_syntax_error([ 'TO' ])
-      assert_search_syntax_error([ 'TO', [ :group, 'foo' ] ])
+      assert_search_syntax_error([ 'TO' ], /need for a search string/)
+      assert_search_syntax_error([ 'TO', [ :group, 'foo' ] ], /search string expected as <String> but was/)
     end
 
     def test_parse_uid
@@ -789,8 +797,8 @@ Content-Type: text/html
         assert_search_cond(0, true) # always true
       }
 
-      assert_search_syntax_error([ 'UNKEYWORD' ])
-      assert_search_syntax_error([ 'UNKEYWORD', [ :group, 'foo' ] ])
+      assert_search_syntax_error([ 'UNKEYWORD' ], /need for a search string/)
+      assert_search_syntax_error([ 'UNKEYWORD', [ :group, 'foo' ] ], /search string expected as <String> but was/)
     end
 
     def test_parse_unseen
@@ -827,7 +835,7 @@ Content-Type: text/html
         assert_search_cond(2, true)
       }
 
-      assert_search_syntax_error([ 'detarame' ])
+      assert_search_syntax_error([ 'detarame' ], /unknown search key/)
     end
 
     def test_parse_group
@@ -860,7 +868,12 @@ Content-Type: text/html
         assert_search_cond(3, false)
       }
 
-      assert_search_syntax_error([ [ :block, 'ANSWERED', 'FLAGGED' ] ])
+      assert_search_syntax_error([ [ :block, 'ANSWERED', 'FLAGGED' ] ], /unknown search key/)
+    end
+
+    def test_parse_unknown
+      make_search_parser{}
+      assert_search_syntax_error([ :detarame ], /unknown search key/)
     end
 
     def test_parse_charset_body

data/test/test_rfc822.rb

@@ -657,7 +657,7 @@ Content-Type: application/octet-stream
                     'Reply-To' => 'Baz <baz@mail.example.com>',
                     'To' => 'Alice <alice@mail.example.com>',
                     'Cc' => 'Bob <bob@mail.example.com>',
-                    'Bcc' => 'Kate <kate@mail.example.com>')                    
+                    'Bcc' => 'Kate <kate@mail.example.com>')
 
       assert_equal([ [ 'Foo', nil, 'foo', 'mail.example.com' ] ], @msg.from)
       assert_equal([ [ 'Bar', nil, 'bar', 'mail.example.com' ] ], @msg.sender)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rims
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - bin/rims
 - lib/rims.rb
 - lib/rims/auth.rb
+- lib/rims/channel.rb
 - lib/rims/cksum_kvs.rb
 - lib/rims/cmd.rb
 - lib/rims/daemon.rb
@@ -109,6 +110,7 @@ files:
 - load_test/Rakefile
 - rims.gemspec
 - test/test_auth.rb
+- test/test_channel.rb
 - test/test_cksum_kvs.rb
 - test/test_config.rb
 - test/test_daemon_status_file.rb
@@ -153,6 +155,7 @@ specification_version: 4
 summary: RIMS is Ruby IMap Server
 test_files:
 - test/test_auth.rb
+- test/test_channel.rb
 - test/test_cksum_kvs.rb
 - test/test_config.rb
 - test/test_daemon_status_file.rb