memcached-server 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b24344e4d59a83ed5efc916e5e162c045968e9e54bdac468138d082387cc518a
-  data.tar.gz: fae266a5d5a9cc51c311566fcb6b7632e8f26517cb672213095e443e33695001
+  metadata.gz: 8b9e9bb722d09ab81f8ea0e3b1556d9fa96e2e022022ad719ee2921530e25d58
+  data.tar.gz: cd607bdbbadade18327ae7e797856466ca1baccbb1e3f4f86153c6e4b1c03eda
 SHA512:
-  metadata.gz: 4695cc451824b4ecda4fa3d5b10bf20f3c4d45494f51b49fcdf3a8fe93cacddd4649f84fef49167a1809ac72f5db0debb2474a06bf726692a8fe53ece85d033f
-  data.tar.gz: ba52fb4818a83c87336352157a0cf6c8d02236ab8e11ad818c07a4c78f24f4aeedba3ca30329b1ce0599799de243f53b3669fea461f20c2619f16beda0b08958
+  metadata.gz: 523e091a87a2f2dfa0036331ebcc5cc4fcce61ac25031398419eae55cf6c19dd651f651dd0735134f2155f97dbabae1057eff6777e9d8adc90f158811f8ba655
+  data.tar.gz: 77bc03d72982b8f4a33e8e7c8eb72148f2e1cf7269d5fc78e03222ee7913eb0f46cb6bc4413f1dca1be5173a7b1e5f4d7e89d8f3df4e627e90ee751f4377a4e1

data/bin/memcached-server

@@ -9,6 +9,4 @@ port = ARGV[1]
 server = MemcachedServer::Server.new(hostname, port)
 puts ('Server running on port %d' % server.port)
 
-run = Thread.new {server.run()}
-
-run.join()
+server.run()

data/lib/memcached-server/memcache.rb

@@ -176,8 +176,7 @@ module MemcachedServer
         # @param flags [Integer] Is an arbitrary unsigned integer (written out in decimal)
         # @param exptime [Integer] The exptime of the Item to store
         # @param bytes [Integer] The byte size of <data_block>
-        # @param data_block [String] Is a chunk of arbitrary 8-bit data of length <bytes> 
-        # @return [String] The reply that describes the result of the operation
+        # @param data_block [String] Is a chunk of arbitrary 8-bit data of length <bytes>
         def store_item(key, flags, exptime, bytes, data_block)
 
             item = Item.new(key, flags, exptime, bytes, data_block)

data/lib/memcached-server/server.rb

@@ -42,14 +42,14 @@ module MemcachedServer
 
                         close = false
                         while command = connection.gets()
-                            
+
                             puts("Command: #{command} | Connection: #{connection.to_s}")
 
                             valid_command = validate_command(command)
                             if valid_command
                                 close = run_command(connection, valid_command)
-                            else 
-                                connection.puts(Error::CLIENT_ERROR % [" Undefined command. Please check the command syntax and try again."])
+                            else
+                                connection.puts(Error::ERROR)
                             end
 
                             break if close
@@ -61,19 +61,18 @@ module MemcachedServer
                         puts ("Connection closed to: #{connection}.")
 
                     end
-
                 end
+                
             rescue => exception
                 error = Error::SERVER_ERROR % exception.message
                 connection.puts(error)
             end
         end
 
-        # Runs a valid memcache command
-        # 
+        # Runs a valid memcache command.
         # Depends on MemcachedServer::Memcache method names.
-        # In some cases, to make #send method work the MemcachedServer::Memcache 
-        # corresponding method must be equal to valid_command[:name] 
+        # In some cases, when the #send method is used, the corresponding
+        # MemcachedServer::Memcache method must be equal to valid_command[:name] 
         # 
         # @param connection [TCPSocket] Client's socket
         # @param valid_command [MatchData] It encapsulates all the results of a valid command pattern match
@@ -92,8 +91,8 @@ module MemcachedServer
                 noreply = !valid_command[:noreply].nil?
                 data = self.read_bytes(connection, bytes)
 
-                reply = @mc.send(name.to_sym, key, flags, exptime, bytes, data)
-                connection.puts(reply) unless noreply
+                reply = @mc.send(name.to_sym, key, flags, exptime, bytes, data) unless data.nil?()
+                connection.puts(reply) unless noreply || reply.nil?()
 
                 return false
 
@@ -103,8 +102,8 @@ module MemcachedServer
                 bytes = valid_command[:bytes].to_i
                 data = self.read_bytes(connection, bytes)
 
-                reply = @mc.send(name.to_sym, key, bytes, data)
-                connection.puts(reply) unless noreply
+                reply = @mc.send(name.to_sym, key, bytes, data) unless data.nil?()
+                connection.puts(reply) unless noreply || reply.nil?()
 
                 return false
 
@@ -118,8 +117,8 @@ module MemcachedServer
                 data = self.read_bytes(connection, bytes)
                 cas_id = valid_command[:cas_id].to_i()
 
-                reply = @mc.cas(key, flags, exptime, bytes, cas_id, data)
-                connection.puts(reply) unless noreply
+                reply = @mc.cas(key, flags, exptime, bytes, cas_id, data) unless data.nil?()
+                connection.puts(reply) unless noreply || reply.nil?()
 
                 return false
                 
@@ -158,11 +157,17 @@ module MemcachedServer
         # 
         # @param connection [TCPSocket] Client's socket
         # @param bytes [Integer] The number of bytes to read
-        # @return [String] The message read
+        # @return [String, nil] The message read
         def read_bytes(connection, bytes)
 
-            return connection.read(bytes + 1).chomp()
+            data_chunk = connection.read(bytes + 1).chomp()
 
+            if data_chunk.bytesize() != bytes
+                connection.puts(Error::CLIENT_ERROR % [" bad data chunk"])
+                return nil
+            end
+
+            return data_chunk
         end
 
         # Validates a command.
@@ -184,6 +189,12 @@ module MemcachedServer
             return nil
         end
 
+        # Accepts a connection
+        # @return [TCPSocket] An accepted TCPSocket for the incoming connection.
+        def accept()
+            return @connection.accept()
+        end
+
     end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: memcached-server
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - José Andrés Puglia Laca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec