rims 0.2.4 → 0.2.5

data/test/test_protocol_request.rb

@@ -194,6 +194,12 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
       assert_equal([ 'A003', 'APPEND', 'saved-messages', "foo\nbody[]\nbar\n" ],
                    @reader.parse([ 'A003', 'APPEND', 'saved-messages', "foo\nbody[]\nbar\n" ]))
 
+      error = assert_raise(RIMS::SyntaxError) { @reader.parse([ '*', 'OK', '['.intern, 'UNSEEN', '12' ]) }
+      assert_match(/not found a terminator/, error.message)
+
+      error = assert_raise(RIMS::SyntaxError) { @reader.parse([ '*', 'LIST', '('.intern, '\Noselect' ]) }
+      assert_match(/not found a terminator/, error.message)
+
       assert_equal('', @output.string)
     end
 

data/test/test_protocol_search.rb

@@ -6,6 +6,8 @@ require 'time'
 
 module RIMS::Test
   class ProtocolSearchParserTest < Test::Unit::TestCase
+    include ProtocolFetchMailSample
+
     def setup
       @kv_store = {}
       @kvs_open = proc{|path| RIMS::Hash_KeyValueStore.new(@kv_store[path] = {}) }
@@ -54,7 +56,7 @@ module RIMS::Test
 
     def make_search_parser(charset: nil)
       yield
-      @folder = @mail_store.select_mbox(@inbox_id).reload
+      @folder = @mail_store.open_folder(@inbox_id, read_only: true).reload
       @parser = RIMS::Protocol::SearchParser.new(@mail_store, @folder)
       @parser.charset = charset if charset
       nil
@@ -675,6 +677,30 @@ Content-Type: text/html
       assert_search_syntax_error([ 'TEXT', [ :group, 'foo'] ], /search string expected as <String> but was/)
     end
 
+    def test_parse_text_multipart
+      make_mail_multipart
+      make_search_parser{
+        add_msg(@mpart_mail.raw_source)
+        assert_msg_uid(1)
+      }
+
+      parse_search_key([ 'TEXT', 'Subject: multipart test' ]) {
+        assert_search_cond(0, true)
+      }
+      parse_search_key([ 'TEXT', 'Subject: inner multipart' ]) {
+        assert_search_cond(0, true)
+      }
+      parse_search_key([ 'TEXT', 'Hello world.' ]) {
+        assert_search_cond(0, true)
+      }
+      parse_search_key([ 'TEXT', 'HALO' ]) {
+        assert_search_cond(0, true)
+      }
+      parse_search_key([ 'TEXT', 'detarame' ]) {
+        assert_search_cond(0, false)
+      }
+    end
+
     def test_parse_to
       make_search_parser{
         add_msg("To: foo\r\n" +

data/test/test_service.rb

@@ -565,6 +565,38 @@ module RIMS::Test
       assert_equal(expected_value, @c.accept_polling_timeout_seconds)
     end
 
+    data('default' => [ 0, {} ],
+         'config'  => [ 4, { server: { process_num: 4 } } ])
+    def test_process_num(data)
+      expected_value, config = data
+      @c.load(config)
+      assert_equal(expected_value, @c.process_num)
+    end
+
+    data('default' => [ 20, {} ],
+         'config'  => [ 30, { server: { process_queue_size: 30 } } ])
+    def test_process_queue_size(data)
+      expected_value, config = data
+      @c.load(config)
+      assert_equal(expected_value, @c.process_queue_size)
+    end
+
+    data('default' => [ 0.1, {} ],
+         'config'  => [ 1,   { server: { process_queue_polling_timeout_seconds: 1 } } ])
+    def test_process_queue_polling_timeout_seconds(data)
+      expected_value, config = data
+      @c.load(config)
+      assert_equal(expected_value, @c.process_queue_polling_timeout_seconds)
+    end
+
+    data('default' => [ 0.1, {} ],
+         'config'  => [ 1,   { server: { process_send_io_polling_timeout_seconds: 1 } } ])
+    def test_process_send_io_polling_timeout_seconds(data)
+      expected_value, config = data
+      @c.load(config)
+      assert_equal(expected_value, @c.process_send_io_polling_timeout_seconds)
+    end
+
     data('default' => [ 20, {} ],
          'config'  => [ 30, { server: { thread_num: 30 } } ])
     def test_thread_num(data)
@@ -677,11 +709,50 @@ module RIMS::Test
       assert_equal(expected_values, limits.to_h)
     end
 
+    data('default' => [ 0, {} ],
+         'config'  => [ 4,
+                        { drb_services: {
+                            process_num: 4
+                          }
+                        }
+                      ])
+    def test_drb_process_num(data)
+      expected_value, config = data
+      @c.load(config)
+      assert_equal(expected_value, @c.drb_process_num)
+    end
+
+    data('default' => [ 100, {} ],
+         'config'  => [ 1024,
+                        { drb_services: {
+                            engine: {
+                              bulk_response_count: 1024
+                            }
+                          }
+                        }
+                      ])
+    def test_bulk_response_count(data)
+      expected_value, config = data
+      @c.load(config)
+      assert_equal(expected_value, @c.bulk_response_count)
+    end
+
     data('default'  => [ 30, {} ],
-         'config'   => [ 15, { lock: { read_lock_timeout_seconds: 15 } } ],
+         'config'   => [ 15,
+                         { drb_services: {
+                             engine: {
+                               read_lock_timeout_seconds: 15
+                             }
+                           }
+                         }
+                       ],
          'compat'   => [ 15, { read_lock_timeout_seconds: 15 } ],
          'priority' => [ 15,
-                         { lock: { read_lock_timeout_seconds: 15 },
+                         { drb_services: {
+                             engine: {
+                               read_lock_timeout_seconds: 15
+                             }
+                           },
                            read_lock_timeout_seconds: 20
                          }
                        ])
@@ -692,10 +763,21 @@ module RIMS::Test
     end
 
     data('default'  => [ 30, {} ],
-         'config'   => [ 15, { lock: { write_lock_timeout_seconds: 15 } } ],
+         'config'   => [ 15,
+                         { drb_services: {
+                             engine: {
+                               write_lock_timeout_seconds: 15
+                             }
+                           }
+                         }
+                       ],
          'compat'   => [ 15, { write_lock_timeout_seconds: 15 } ],
          'priority' => [ 15,
-                         { lock: { write_lock_timeout_seconds: 15 },
+                         { drb_services: {
+                             engine: {
+                               write_lock_timeout_seconds: 15
+                             }
+                           },
                            write_lock_timeout_seconds: 20,
                          }
                        ])
@@ -706,10 +788,21 @@ module RIMS::Test
     end
 
     data('default'  => [ 1, {} ],
-         'config'   => [ 3, { lock: { cleanup_write_lock_timeout_seconds: 3 } } ],
+         'config'   => [ 3,
+                         { drb_services: {
+                             engine: {
+                               cleanup_write_lock_timeout_seconds: 3
+                             }
+                           }
+                         }
+                       ],
          'compat'   => [ 3, { cleanup_write_lock_timeout_seconds: 3 } ],
          'priority' => [ 3,
-                         { lock: { cleanup_write_lock_timeout_seconds: 3 },
+                         { drb_services: {
+                             engine: {
+                               cleanup_write_lock_timeout_seconds: 3
+                             }
+                           },
                            cleanup_write_lock_timeout_seconds: 5
                          }
                        ])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rims
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riser
@@ -126,7 +126,6 @@ files:
 - lib/rims/lock.rb
 - lib/rims/mail_store.rb
 - lib/rims/passwd.rb
-- lib/rims/pool.rb
 - lib/rims/protocol.rb
 - lib/rims/protocol/connection.rb
 - lib/rims/protocol/decoder.rb

data/lib/rims/pool.rb

@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module RIMS
-  class ObjectPool
-    class ObjectHolder
-      def initialize(object_pool, object_key)
-        @object_pool = object_pool
-        @object_key = object_key
-      end
-
-      attr_reader :object_key
-
-      def object_destroy
-      end
-
-      # optional block is called when a mail store is closed.
-      def return_pool(&block) # yields:
-        @object_pool.put(self, &block)
-        nil
-      end
-    end
-
-    class ReferenceCount
-      def initialize(count, object_holder)
-        @count = count
-        @object_holder = object_holder
-      end
-
-      attr_accessor :count
-      attr_reader :object_holder
-
-      def object_destroy
-        @object_holder.object_destroy
-      end
-    end
-
-    def initialize(&object_factory)      # yields: object_pool, object_key, object_lock
-      @mutex = Thread::Mutex.new
-      @object_factory = object_factory
-      @pool = {}
-    end
-
-    def empty?
-      @mutex.synchronize{ @pool.empty? }
-    end
-
-    # optional block is called when a new object is added to an object pool.
-    def get(object_key)         # yields:
-      @mutex.synchronize{
-        if (@pool.key? object_key) then
-          ref_count = @pool[object_key]
-        else
-          yield if block_given?
-          object_holder = @object_factory.call(self, object_key)
-          ref_count = ReferenceCount.new(0, object_holder)
-          @pool[object_key] = ref_count
-        end
-        ref_count.count >= 0 or raise 'internal error'
-        ref_count.count += 1
-        ref_count.object_holder
-      }
-    end
-
-    # optional block is called when an object is deleted from an object pool.
-    def put(object_holder) # yields:
-      @mutex.synchronize{
-        ref_count = @pool[object_holder.object_key] or raise 'internal error'
-        ref_count.object_holder.equal? object_holder or raise 'internal error'
-        ref_count.count > 0 or raise 'internal error'
-        ref_count.count -= 1
-        if (ref_count.count == 0) then
-          @pool.delete(object_holder.object_key)
-          ref_count.object_destroy
-          yield if block_given?
-        end
-      }
-      nil
-    end
-  end
-end
-
-# Local Variables:
-# mode: Ruby
-# indent-tabs-mode: nil
-# End: