moneta 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 535578909c47f29047f67d577e053809a637f77ea8ba2dde7920198f8b08ac49
-  data.tar.gz: 275edd79995139f4918749d01ccdf8129748ea96e1ba4302716dd7cb1ed57bf9
+  metadata.gz: 9aebec0b5bcf8b12d295aff540c30c453e88883e5d5d498f92f3666adcbf4eeb
+  data.tar.gz: f62cbb548556e6d4a36e0465edb468a7421262620469d7329c34cb7d160553bc
 SHA512:
-  metadata.gz: c07c093306f66138db9db041a15103420fdd0e5fef93ca429098de02a732055d441c0968570704ba39dcb08608b7dbfa12b5cd5797e257df1c8be28a7b3b028d
-  data.tar.gz: a654005281162398bf492fd7fa3e3c59ee40f675d6a187579d4cbfcb0bfbd14e0a78a9f9bb3227e5c64c02e4c97e60bb9b39075457803882aeaa3d585b0e9a51
+  metadata.gz: e9544cff0b2b3550776646d83131b8c7db4c3a9e79083ddb56af23a4cffaa9ce5a3de4a8c1db2db3571e768fe00c409692c3a2787ac9e7e8312a3f145d36f270
+  data.tar.gz: 96cf85c80a0dbb86c820351e711470f873139e6544ec450e427a5cba92cf23f615bedd7f2ff5fda7eca8f005631e0dbcb5e79550ef001234b6d231fcaa71c924

data/.gitignore

@@ -11,3 +11,5 @@ Gemfile.lock
 logs
 secure
 .bundle
+.ruby-version
+.byebug_history

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2.2
+  TargetRubyVersion: 2.3.0
   UseCache: true
   Exclude:
     - hbase/**/*

data/.travis.yml

@@ -1,12 +1,12 @@
 dist: xenial
 language: ruby
 rvm:
+  - 2.7
   - 2.6
   - 2.5
   - 2.4
   - 2.3
-  - 2.2
-  - jruby-9.2
+  - jruby-9.2.9.0
   - rbx-3
 services:
   - mysql
@@ -26,7 +26,6 @@ addons:
         key_url: https://packagecloud.io/basho/riak/gpgkey
     packages:
       - cassandra
-      - couchdb
       - libkyotocabinet-dev
       - libleveldb-dev
       - liblzo2-dev
@@ -36,6 +35,7 @@ addons:
       - riak
   postgresql: '9.6'
 before_install:
+  - gem install bundler
   - script/start-services
 cache:
   bundler: true
@@ -47,6 +47,10 @@ before_script:
   - psql -c 'create database moneta1;' -U postgres
   - psql -c 'create extension hstore;' -U postgres moneta1
   - psql -c 'create database moneta2;' -U postgres
+  # FIXME: remove this once moneta no longer generates hundreds of warnings
+  # in Ruby 2.7
+  - if echo $RUBY_VERSION | grep -q 'ruby-2.7'; then export RUBYOPT='-W0'; fi
+  - export
 env:
   matrix:
     - SCRIPT='script/parallel-tests ~unstable --
@@ -120,6 +124,8 @@ matrix:
     - rvm: rbx-3
     - env: SCRIPT='script/parallel-tests unstable'
   exclude:
+    - rvm: 2.6
+      env: SCRIPT='rubocop lib'
     - rvm: 2.5
       env: SCRIPT='rubocop lib'
     - rvm: 2.4
@@ -128,7 +134,7 @@ matrix:
       env: SCRIPT='rubocop lib'
     - rvm: 2.2
       env: SCRIPT='rubocop lib'
-    - rvm: jruby-9.2
+    - rvm: jruby-9.2.9.0
       env: SCRIPT='rubocop lib'
     - rvm: rbx-3
       env: SCRIPT='rubocop lib'

data/CHANGES

@@ -1,3 +1,12 @@
+1.3.0
+
+* Transformer - add :each_key support (#170)
+* Server - add :each_key support, use non-blocking IO (#165)
+* Builder - dup options before passing to adapter/proxy (#174)
+* Adapter::Couch - add HTTP basic auth support
+* Support MRI 2.7.0 (#172)
+* Minimum required MRI version is now 2.3.0 (#172)
+
 1.2.1
 
 * Transformer - fix :escape transformer deserialize implementation (#168)

data/Gemfile

@@ -23,7 +23,7 @@ group :msgpack do
 end
 
 # Compressors used by Transformer
-gem 'rbzip2', '~> 0.3.0', group: :bzip2
+gem 'rbzip2', '>= 0.3.0', group: :bzip2
 gem 'lz4-ruby', platforms: :ruby, group: :lz4
 gem 'ruby-lzma', platforms: :ruby, group: :lzma
 gem 'lzoruby', platforms: :ruby, group: :lzo
@@ -37,8 +37,8 @@ gem 'cityhash', platforms: :ruby, group: :city
 gem 'daybreak', group: :daybreak
 gem 'activerecord', '~> 5.2', group: :activerecord
 gem 'redis', '~> 4.0.0', group: :redis
-gem 'mongo', '~> 2.1.0', group: :mongo_official
-gem 'moped', '>= 2.0.0', group: :mongo_moped
+gem 'mongo', '>= 2', group: :mongo_official
+gem 'moped', '>= 2', group: :mongo_moped
 gem 'sequel', group: :sequel
 gem 'dalli', group: :memcached_dalli
 gem 'riak-client', group: :riak
@@ -50,7 +50,7 @@ gem 'tdb', platforms: :ruby, group: :tdb
 gem 'leveldb-ruby', platforms: :ruby, group: :leveldb
 gem 'lmdb', platforms: :mri, group: :lmdb
 gem 'tokyocabinet', platforms: :ruby, group: :tokyocabinet
-gem 'kyotocabinet-ruby-reanimated', platforms: :ruby, group: :kyotocabinet
+gem 'kyotocabinet-ruby-reanimated', platforms: [:ruby_23, :ruby_24, :ruby_25, :ruby_26], group: :kyotocabinet
 gem 'memcached', platforms: :ruby, group: :memcached_native
 gem 'jruby-memcached', platforms: :jruby, group: :memcached_native
 gem 'activerecord-jdbch2-adapter', platforms: :jruby, group: :h2, github: 'jruby/activerecord-jdbc-adapter', glob: 'activerecord-jdbch2-adapter/*.gemspec', branch: '52-stable'
@@ -94,7 +94,9 @@ end
 
 # Rails integration testing
 group :rails do
-  gem 'actionpack', '~> 5.0'
+  git 'https://github.com/rails/rails.git', branch: '5-2-stable' do
+    gem 'actionpack'
+  end
   gem 'minitest', '~> 5.0'
 end
 

data/README.md

@@ -214,7 +214,7 @@ __NOTE:__ <a name="backend-matrix"></a>The backend matrix is much more readable
 
 <tr><th colspan="2">Network clients</th><th colspan="12"></th></tr>
 
-<tr><td>Client</td><td>-</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td>Moneta client adapter</td></tr>
+<tr><td>Client</td><td>-</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td>Moneta client adapter</td></tr>
 
 <tr><td>RestClient</td><td>-</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td>Moneta REST client adapter</td></tr>
 
@@ -913,12 +913,15 @@ Person.adapter :memory, Moneta.new(:Redis)
 
 ## Testing and Benchmarks
 
-Testing is done using [Travis-CI](http://travis-ci.org/moneta-rb/moneta). Currently we support MRI Ruby >= 2.2.2 and JRuby 9.2.x.
+Testing is done using [Travis-CI](http://travis-ci.org/moneta-rb/moneta).
+Currently we support MRI Ruby >= 2.3.0 and the JRuby >= 9.2.9.0.
 
-Benchmarks for each store are done on [Travis-CI](http://travis-ci.org/moneta-rb/moneta) for each build. Take a look there
-to compare the speed of the different key value stores for different key/value sizes and size distributions.
-Feel free to add your own configurations! The impact of Moneta should be minimal since it is only a thin layer
-on top of the different stores.
+Benchmarks for each store are done on
+[Travis-CI](http://travis-ci.org/moneta-rb/moneta) for each build. Take a look
+there to compare the speed of the different key value stores for different
+key/value sizes and size distributions.  Feel free to add your own
+configurations! The impact of Moneta should be minimal since it is only a thin
+layer on top of the different stores.
 
 
 ------

data/feature_matrix.yaml

@@ -220,13 +220,14 @@ backends:
   - adapter: Client
     platforms: [ MRI, JRuby ]
     features: [multiprocess]
-    unknown: [ increment, create, expires, persist ]
+    unknown: [ increment, create, expires, persist, each_key ]
     description: "Moneta client adapter"
     notes:
       increment: depends on server
       create: depends on server
       expires: depends on server
       persist: depends on server
+      each_key: depends on server
   - adapter: RestClient
     platforms: [ MRI, JRuby ]
     features: [ multiprocess ]

data/lib/moneta/adapters/client.rb

@@ -23,44 +23,44 @@ module Moneta
       # (see Proxy#key?)
       def key?(key, options = {})
         write(:key?, key, options)
-        read
+        read_msg
       end
 
       # (see Proxy#load)
       def load(key, options = {})
         write(:load, key, options)
-        read
+        read_msg
       end
 
       # (see Proxy#store)
       def store(key, value, options = {})
         write(:store, key, value, options)
-        read
+        read_msg
         value
       end
 
       # (see Proxy#delete)
       def delete(key, options = {})
         write(:delete, key, options)
-        read
+        read_msg
       end
 
       # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         write(:increment, key, amount, options)
-        read
+        read_msg
       end
 
       # (see Proxy#create)
       def create(key, value, options = {})
         write(:create, key, value, options)
-        read
+        read_msg
       end
 
       # (see Proxy#clear)
       def clear(options = {})
         write(:clear, options)
-        read
+        read_msg
         self
       end
 
@@ -70,12 +70,43 @@ module Moneta
         nil
       end
 
+      # (see Proxy#each_key)
+      def each_key
+        raise NotImplementedError, 'each_key is not supported' unless supports?(:each_key)
+        return enum_for(:each_key) unless block_given?
+
+        begin
+          write(:each_key)
+          yield_break = false
+
+          loop do
+            write('NEXT')
+
+            # A StopIteration error will be raised by this call if the server
+            # reached the end of the enumeration.  This will stop the loop
+            # automatically.
+            result = read_msg
+
+            # yield_break will be true in the ensure block (below) if anything
+            # happened during the yield to stop further enumeration.
+            yield_break = true
+            yield result
+            yield_break = false
+          end
+        ensure
+          write('BREAK') if yield_break
+          read_msg # nil return from each_key
+        end
+
+        self
+      end
+
       # (see Default#features)
       def features
         @features ||=
           begin
             write(:features)
-            read.freeze
+            read_msg.freeze
           end
       end
 
@@ -86,18 +117,24 @@ module Moneta
         @socket.write([s.bytesize].pack('N') << s)
       end
 
-      def read
-        size = @socket
-          .recv(4).tap do |bytes|
-            raise EOFError, 'failed to read size' unless bytes.bytesize == 4
-          end
-          .unpack('N')
-          .first
-
-        result = Marshal.load(@socket.recv(size).tap do |bytes|
-          raise EOFError, 'Not enough bytes read' unless bytes.bytesize == size
-        end)
+      # JRuby doesn't support socket#recv with flags
+      if defined?(JRUBY_VERSION)
+        def read(bytes)
+          received = @socket.read(bytes)
+          raise EOFError, "Server closed socket" unless received && received.bytesize == bytes
+          received
+        end
+      else
+        def read(bytes)
+          received = @socket.recv(bytes, Socket::MSG_WAITALL)
+          raise EOFError, "Server closed socket" unless received && received.bytesize == bytes
+          received
+        end
+      end
 
+      def read_msg
+        size = read(4).unpack('N').first
+        result = Marshal.load(read(size))
         raise result if Exception === result
         result
       end

data/lib/moneta/adapters/couch.rb

@@ -39,6 +39,8 @@ module Moneta
       # @option options [String] :scheme ('http') HTTP scheme to use
       # @option options [String] :value_field ('value') Document field to store value
       # @option options [String] :type_field ('type') Document field to store value type
+      # @option options [String] :login Login name to use for HTTP basic authentication
+      # @option options [String] :password Password to use for HTTP basic authentication
       # @option options [Symbol] :adapter Adapter to use with Faraday
       # @option options [Faraday::Connecton] :backend Use existing backend instance
       # @option options Other options passed to {Faraday::new} (unless
@@ -46,6 +48,8 @@ module Moneta
       def initialize(options = {})
         @value_field = options.delete(:value_field) || 'value'
         @type_field = options.delete(:type_field) || 'type'
+        login = options.delete(:login)
+        password = options.delete(:password)
         @backend = options.delete(:backend) || begin
           host = options.delete(:host) || '127.0.0.1'
           port = options.delete(:port) || 5984
@@ -56,6 +60,7 @@ module Moneta
                   end
           ::Faraday.new("#{scheme}://#{host}:#{port}/#{db}", options, &block)
         end
+        @backend.basic_auth(login, password) if login && password
         @rev_cache = Moneta.build do
           use :Lock
           adapter :LRUHash

data/lib/moneta/adapters/mongo/moped.rb

@@ -44,7 +44,10 @@ module Moneta
         @backend.use(db)
         @backend.login(user, password) if user && password
         @collection = @backend[collection]
-        if @backend.command(buildinfo: 1)['version'] >= '2.2'
+        if @backend.command(buildinfo: 1)['version'] >= '3.0'
+          # Moped creates indexes in the system.indexes collection which is not writable anymore since Mongo v3
+          warn 'Moneta::Adapters::MongoMoped - You are using the unmaintained Moped gem, expired documents will not be deleted'
+        elsif @backend.command(buildinfo: 1)['version'] >= '2.2'
           @collection.indexes.create({ @expires_field => 1 }, expireAfterSeconds: 0)
         else
           warn 'Moneta::Adapters::Mongo - You are using MongoDB version < 2.2, expired documents will not be deleted'

data/lib/moneta/builder.rb

@@ -17,12 +17,12 @@ module Moneta
       adapter = @proxies.first
       if Array === adapter
         klass, options, block = adapter
-        adapter = new_proxy(klass, options, &block)
+        adapter = new_proxy(klass, options.dup, &block)
         check_arity(klass, adapter, 1)
       end
       @proxies[1..-1].inject([adapter]) do |result, proxy|
         klass, options, block = proxy
-        proxy = new_proxy(klass, result.last, options, &block)
+        proxy = new_proxy(klass, result.last, options.dup, &block)
         check_arity(klass, proxy, 2)
         result << proxy
       end

data/lib/moneta/lock.rb

@@ -15,6 +15,7 @@ module Moneta
     protected
 
     def wrap(name, *args, &block)
+      self.locks ||= Set.new
       if locked?
         yield
       else
@@ -22,8 +23,12 @@ module Moneta
       end
     end
 
+    def locks=(locks)
+      Thread.current.thread_variable_set('Moneta::Lock', locks)
+    end
+
     def locks
-      Thread.current['Moneta::Lock'] ||= Set.new
+      Thread.current.thread_variable_get('Moneta::Lock')
     end
 
     def lock!(&block)

data/lib/moneta/pool.rb

@@ -298,6 +298,18 @@ module Moneta
     # by the manager after the ttl
     def close; end
 
+    def each_key(&block)
+      wrap(:each_key) do
+        raise NotImplementedError, "each_key is not supported on this proxy" \
+          unless supports? :each_key
+
+        return enum_for(:each_key) { adapter ? adapter.each_key.size : check_out! { adapter.each_key.size } } unless block_given?
+
+        adapter.each_key(&block)
+        self
+      end
+    end
+
     # Tells the manager to close all stores.  It will not be possible to use
     # the store after this.
     def stop

data/lib/moneta/proxy.rb

@@ -22,7 +22,7 @@ module Moneta
       raise NotImplementedError, "each_key is not supported on this proxy" \
         unless supports? :each_key
 
-      return enum_for(:each_key) unless block_given?
+      return enum_for(:each_key) { adapter.each_key.size } unless block_given?
       adapter.each_key(&block)
       self
     end

data/lib/moneta/server.rb

@@ -4,6 +4,154 @@ module Moneta
   # Moneta server to be used together with Moneta::Adapters::Client
   # @api public
   class Server
+    TIMEOUT = 1
+    MAXSIZE = 0x100000
+
+    # @api private
+    class Connection
+      def initialize(io, store)
+        @io = io
+        @store = store
+        @fiber = Fiber.new { run }
+      end
+
+      def resume(result = nil)
+        @fiber.resume result
+      end
+
+      private
+
+      # The return value of this function will be sent to the reactor.
+      #
+      # @return [:closed,Exception]
+      def run
+        catch :closed do
+          loop { write_dispatch(read_msg) }
+        end
+        :closed
+      rescue => ex
+        ex
+      ensure
+        @io.close unless @io.closed?
+      end
+
+      def dispatch(method, args)
+        case method
+        when :key?, :load, :delete, :increment, :create, :features
+          @store.public_send(method, *args)
+        when :store, :clear
+          @store.public_send(method, *args)
+          nil
+        when :each_key
+          yield_each(@store.each_key)
+          nil
+        end
+      rescue => ex
+        ex
+      end
+
+      def write_dispatch(msg)
+        method, *args = msg
+        result = dispatch(method, args)
+        write(result)
+      end
+
+      def read_msg
+        size = read(4).unpack('N').first
+        throw :closed, 'Message too big' if size > MAXSIZE
+        Marshal.load(read(size))
+      end
+
+      def read(len)
+        buffer = ''
+        loop do
+          begin
+            case received = @io.recv_nonblock(len)
+            when '', nil
+              throw :closed, 'Closed during read'
+            else
+              buffer << received
+              len -= received.bytesize
+            end
+          rescue IO::WaitReadable, IO::WaitWritable
+            yield_to_reactor(:read)
+          rescue Errno::ECONNRESET
+            throw :closed, 'Closed during read'
+          rescue IOError => ex
+            if ex.message =~ /closed stream/
+              throw :closed, 'Closed during read'
+            else
+              raise
+            end
+          end
+          break if len == 0
+        end
+        buffer
+      end
+
+      def write(obj)
+        buffer = pack(obj)
+        until buffer.empty?
+          begin
+            len = sendmsg(buffer)
+            buffer = buffer.byteslice(len...buffer.length)
+          rescue IO::WaitWritable, Errno::EINTR
+            yield_to_reactor(:write)
+          end
+        end
+        nil
+      end
+
+      # Detect support for socket#sendmsg_nonblock
+      Socket.new(Socket::AF_INET, Socket::SOCK_STREAM).tap do |socket|
+        begin
+          socket.sendmsg_nonblock('probe')
+        rescue Errno::EPIPE, Errno::ENOTCONN
+          def sendmsg(msg)
+            @io.sendmsg_nonblock(msg)
+          end
+        rescue NotImplementedError
+          def sendmsg(msg)
+            @io.write_nonblock(msg)
+          end
+        end
+      end
+
+      def yield_to_reactor(mode = :read)
+        if Fiber.yield(mode) == :close
+          throw :closed, 'Closed by reactor'
+        end
+      end
+
+      def pack(obj)
+        s = Marshal.dump(obj)
+        [s.bytesize].pack('N') << s
+      end
+
+      def yield_each(enumerator)
+        received_break = false
+        loop do
+          case msg = read_msg
+          when %w{NEXT}
+            # This will raise a StopIteration at the end of the enumeration,
+            # which will exit the loop.
+            write(enumerator.next)
+          when %w{BREAK}
+            # This is received when the client wants to stop the enumeration.
+            received_break = true
+            break
+          else
+            # Otherwise, the client is attempting to call another method within
+            # an `each` block.
+            write_dispatch(msg)
+          end
+        end
+      ensure
+        # This tells the client to stop enumerating
+        write(StopIteration.new("Server initiated stop")) unless received_break
+      end
+    end
+
     # @param [Hash] options
     # @option options [Integer] :port (9000) TCP port
     # @option options [String] :socket Alternative Unix socket file name
@@ -11,7 +159,9 @@ module Moneta
       @store = store
       @server = start(options)
       @ios = [@server]
-      @clients = {}
+      @reads = @ios.dup
+      @writes = []
+      @connections = {}
       @running = false
     end
 
@@ -26,94 +176,89 @@ module Moneta
     #
     # @note This method blocks!
     def run
-      raise 'Already running' if @running
+      raise 'Already running' if running?
       @stop = false
       @running = true
       begin
         mainloop until @stop
       ensure
-        File.unlink(@socket) if @socket
-        @ios.each { |io| io.close rescue nil }
+        @running = false
+        @server.close unless @server.closed?
+        @ios
+          .reject { |io| io == @server }
+          .each { |io| close_connection(io) }
+        File.unlink(@socket) if @socket rescue nil
       end
     end
 
     # Stop the server
     def stop
-      raise 'Not running' unless @running
+      raise 'Not running' unless running?
       @stop = true
       @server.close
-      @server = nil
+      nil
     end
 
     private
 
-    TIMEOUT = 1
-    MAXSIZE = 0x100000
-
     def mainloop
-      if ios = IO.select(@ios, nil, @ios, TIMEOUT)
-        ios[2].each do |io|
-          io.close
-          delete_client(io)
-        end
-        ios[0].each do |io|
-          if io == @server
-            if client = @server.accept
-              @ios << client
-              @clients[client] = ''
-            end
-          elsif io.closed? || io.eof?
-            delete_client(io)
-          else
-            handle(io, @clients[io] << io.readpartial(0xFFFF))
-          end
+      if ready = IO.select(@reads, @writes, @ios, TIMEOUT)
+        reads, writes, errors = ready
+        errors.each { |io| close_connection(io) }
+
+        @reads -= reads
+        reads.each do |io|
+          io == @server ? accept_connection : resume(io)
         end
+
+        @writes -= writes
+        writes.each { |io| resume(io) }
       end
-    rescue SignalException => ex
-      warn "Moneta::Server - #{ex.message}"
-      raise if ex.signo == 15 || ex.signo == 2 # SIGTERM or SIGINT
-    rescue => ex
+    rescue SignalException => signal
+      warn "Moneta::Server - received #{signal}"
+      case signal.signo
+      when Signal.list['INT'], Signal.list['TERM']
+        @stop = true # graceful exit
+      end
+    rescue IOError => ex
+      # We get a lot of these "closed stream" errors, which we ignore
+      raise unless ex.message =~ /closed stream/
+    rescue Errno::EBADF => ex
       warn "Moneta::Server - #{ex.message}"
     end
 
-    def delete_client(io)
+    def accept_connection
+      io = @server.accept
+      @connections[io] = Connection.new(io, @store)
+      @ios << io
+      resume(io)
+    ensure
+      @reads << @server
+    end
+
+    def delete_connection(io)
       @ios.delete(io)
-      @clients.delete(io)
+      @reads.delete(io)
+      @writes.delete(io)
     end
 
-    def pack(obj)
-      s = Marshal.dump(obj)
-      [s.bytesize].pack('N') << s
+    def close_connection(io)
+      delete_connection(io)
+      @connections.delete(io).resume(:close)
     end
 
-    def handle(io, buffer)
-      return if buffer.bytesize < 8 # At least 4 bytes for the marshalled array
-      size = buffer[0, 4].unpack('N').first
-      if size > MAXSIZE
-        delete_client(io)
-        return
-      end
-      return if buffer.bytesize < 4 + size
-      buffer.slice!(0, 4)
-      method, *args = Marshal.load(buffer.slice!(0, size))
-      case method
-      when :key?, :load, :delete, :increment, :create
-        io.write(pack(@store.send(method, *args)))
-      when :features
-        # all features except each_key are supported
-        io.write(pack(@store.features - [:each_key]))
-      when :store, :clear
-        @store.send(method, *args)
-        io.write(@nil ||= pack(nil))
-      else
-        raise 'Invalid method call'
+    def resume(io)
+      case result = @connections[io].resume
+      when :closed # graceful exit
+        delete_connection(io)
+      when Exception # messy exit
+        delete_connection(io)
+        raise result
+      when :read
+        @reads << io
+      when :write
+        @writes << io
       end
-    rescue IOError => ex
-      warn "Moneta::Server - #{ex.message}" unless ex.message =~ /closed/
-      delete_client(io)
-    rescue => ex
-      warn "Moneta::Server - #{ex.message}"
-      io.write(pack(Exception.new(ex.message)))
     end
 
     def start(options)
@@ -133,5 +278,14 @@ module Moneta
         TCPServer.open(options[:host] || '127.0.0.1', options[:port] || 9000)
       end
     end
+
+    def stats
+      {
+        connections: @connections.length,
+        reading: @reads.length,
+        writing: @writes.length,
+        total: @ios.length
+      }
+    end
   end
 end