Changes to Client/Server

.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - 2.4
   - 2.3
   - 2.2
-  - jruby-9.2
+  - jruby-9.2.9.0
   - rbx-3
 services:
   - mysql
@@ -128,7 +128,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'

Gemfile

@@ -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
 

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 ]

lib/moneta/adapters/client.rb

@@ -23,44 +23,44 @@ def initialize(options = {})
       # (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 @@ def close
         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 @@ def write(*args)
         @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

lib/moneta/lock.rb

@@ -15,15 +15,20 @@ def initialize(adapter, options = {})
     protected
 
     def wrap(name, *args, &block)
+      self.locks ||= Set.new
       if locked?
         yield
       else
         lock!(&block)
       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)